summaryrefslogtreecommitdiffstats
path: root/crypto/openssl/apps/ciphers.c
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/openssl/apps/ciphers.c')
-rw-r--r--crypto/openssl/apps/ciphers.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/crypto/openssl/apps/ciphers.c b/crypto/openssl/apps/ciphers.c
index 08e47be..f8e9e7b 100644
--- a/crypto/openssl/apps/ciphers.c
+++ b/crypto/openssl/apps/ciphers.c
@@ -66,10 +66,6 @@
#include <openssl/err.h>
#include <openssl/ssl.h>
-#if defined(NO_RSA) && !defined(NO_SSL2)
-#define NO_SSL2
-#endif
-
#undef PROG
#define PROG ciphers_main
@@ -81,6 +77,8 @@ static char *ciphers_usage[]={
NULL
};
+int MAIN(int, char **);
+
int MAIN(int argc, char **argv)
{
int ret=1,i;
@@ -145,12 +143,16 @@ int MAIN(int argc, char **argv)
goto end;
}
- SSLeay_add_ssl_algorithms();
+ OpenSSL_add_ssl_algorithms();
ctx=SSL_CTX_new(meth);
if (ctx == NULL) goto err;
- if (ciphers != NULL)
- SSL_CTX_set_cipher_list(ctx,ciphers);
+ if (ciphers != NULL) {
+ if(!SSL_CTX_set_cipher_list(ctx,ciphers)) {
+ BIO_printf(bio_err, "Error in cipher list\n");
+ goto err;
+ }
+ }
ssl=SSL_new(ctx);
if (ssl == NULL) goto err;
OpenPOWER on IntegriCloud