Use sk_*_new_null() instead of sk_*_new(NULL), since that takes care

[openssl.git] / apps / ciphers.c

diff --git a/apps/ciphers.c b/apps/ciphers.c
index a62c5b0e8ae199531b1c42857abf1e4c071c7afa..72b2009e1874e70d33223bb836888e54e4ec8212 100644 (file)
--- a/apps/ciphers.c
+++ b/apps/ciphers.c
@@ -63,8 +63,8 @@
 #define APPS_WIN16
 #endif
 #include "apps.h"
-#include "err.h"
-#include "ssl.h"
+#include <openssl/err.h>
+#include <openssl/ssl.h>
 
 #undef PROG
 #define PROG   ciphers_main
@@ -74,16 +74,18 @@ static char *ciphers_usage[]={
 " -v          - verbose mode, a textual listing of the ciphers in SSLeay\n",
 " -ssl2       - SSL2 mode\n",
 " -ssl3       - SSL3 mode\n",
+" -tls1       - TLS1 mode\n",
 NULL
 };
 
-int MAIN(argc, argv)
-int argc;
-char **argv;
+int MAIN(int, char **);
+
+int MAIN(int argc, char **argv)
        {
        int ret=1,i;
        int verbose=0;
-       char **pp,*p;
+       char **pp;
+       const char *p;
        int badops=0;
        SSL_CTX *ctx=NULL;
        SSL *ssl=NULL;
@@ -120,6 +122,10 @@ char **argv;
 #ifndef NO_SSL3
                else if (strcmp(*argv,"-ssl3") == 0)
                        meth=SSLv3_client_method();
+#endif
+#ifndef NO_TLS1
+               else if (strcmp(*argv,"-tls1") == 0)
+                       meth=TLSv1_client_method();
 #endif
                else if ((strncmp(*argv,"-h",2) == 0) ||
                         (strcmp(*argv,"-?") == 0))
@@ -142,12 +148,16 @@ 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;