Reject elliptic curve lists of odd lengths.

[openssl.git] / apps / ciphers.c

diff --git a/apps/ciphers.c b/apps/ciphers.c
index 5f2b739700804a2f0e40a55de3ce29092abfda59..7de7dd3b3817b733d62e011769792338ccd2354d 100644 (file)
--- a/apps/ciphers.c
+++ b/apps/ciphers.c
@@ -73,7 +73,6 @@ static const char *ciphers_usage[]={
 "usage: ciphers args\n",
 " -v          - verbose mode, a textual listing of the SSL/TLS ciphers in OpenSSL\n",
 " -V          - even more verbose\n",
-" -ssl2       - SSL2 mode\n",
 " -ssl3       - SSL3 mode\n",
 " -tls1       - TLS1 mode\n",
 NULL
@@ -85,6 +84,10 @@ int MAIN(int argc, char **argv)
        {
        int ret=1,i;
        int verbose=0,Verbose=0;
+       int use_supported = 0;
+#ifndef OPENSSL_NO_SSL_TRACE
+       int stdname = 0;
+#endif
        const char **pp;
        const char *p;
        int badops=0;
@@ -92,17 +95,11 @@ int MAIN(int argc, char **argv)
        SSL *ssl=NULL;
        char *ciphers=NULL;
        const SSL_METHOD *meth=NULL;
-       STACK_OF(SSL_CIPHER) *sk;
+       STACK_OF(SSL_CIPHER) *sk=NULL;
        char buf[512];
        BIO *STDout=NULL;
 
-#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
        meth=SSLv23_server_method();
-#elif !defined(OPENSSL_NO_SSL3)
-       meth=SSLv3_server_method();
-#elif !defined(OPENSSL_NO_SSL2)
-       meth=SSLv2_server_method();
-#endif
 
        apps_startup();
 
@@ -126,9 +123,11 @@ int MAIN(int argc, char **argv)
                        verbose=1;
                else if (strcmp(*argv,"-V") == 0)
                        verbose=Verbose=1;
-#ifndef OPENSSL_NO_SSL2
-               else if (strcmp(*argv,"-ssl2") == 0)
-                       meth=SSLv2_client_method();
+               else if (strcmp(*argv,"-s") == 0)
+                       use_supported = 1;
+#ifndef OPENSSL_NO_SSL_TRACE
+               else if (strcmp(*argv,"-stdname") == 0)
+                       stdname=verbose=1;
 #endif
 #ifndef OPENSSL_NO_SSL3
                else if (strcmp(*argv,"-ssl3") == 0)
@@ -172,12 +171,17 @@ int MAIN(int argc, char **argv)
        ssl=SSL_new(ctx);
        if (ssl == NULL) goto err;
 
+       if (use_supported)
+               sk=SSL_get1_supported_ciphers(ssl);
+       else
+               sk=SSL_get_ciphers(ssl);
 
        if (!verbose)
                {
-               for (i=0; ; i++)
+               for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
                        {
-                       p=SSL_get_cipher_list(ssl,i);
+                       SSL_CIPHER *c = sk_SSL_CIPHER_value(sk,i);
+                       p = SSL_CIPHER_get_name(c);
                        if (p == NULL) break;
                        if (i != 0) BIO_printf(STDout,":");
                        BIO_printf(STDout,"%s",p);
@@ -186,7 +190,6 @@ int MAIN(int argc, char **argv)
                }
        else /* verbose */
                {
-               sk=SSL_get_ciphers(ssl);
 
                for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
                        {
@@ -202,14 +205,20 @@ int MAIN(int argc, char **argv)
                                int id2 = (int)((id >> 8) & 0xffL);
                                int id3 = (int)(id & 0xffL);
                                
-                               if ((id & 0xff000000L) == 0x02000000L)
-                                       BIO_printf(STDout, "     0x%02X,0x%02X,0x%02X - ", id1, id2, id3); /* SSL2 cipher */
-                               else if ((id & 0xff000000L) == 0x03000000L)
+                               if ((id & 0xff000000L) == 0x03000000L)
                                        BIO_printf(STDout, "          0x%02X,0x%02X - ", id2, id3); /* SSL3 cipher */
                                else
                                        BIO_printf(STDout, "0x%02X,0x%02X,0x%02X,0x%02X - ", id0, id1, id2, id3); /* whatever */
                                }
-
+#ifndef OPENSSL_NO_SSL_TRACE
+                       if (stdname)
+                               {
+                               const char *nm = SSL_CIPHER_standard_name(c);
+                               if (nm == NULL)
+                                       nm = "UNKNOWN";
+                               BIO_printf(STDout, "%s - ", nm);
+                               }
+#endif
                        BIO_puts(STDout,SSL_CIPHER_description(c,buf,sizeof buf));
                        }
                }
@@ -222,6 +231,8 @@ err:
                ERR_print_errors(bio_err);
                }
 end:
+       if (use_supported && sk)
+               sk_SSL_CIPHER_free(sk);
        if (ctx != NULL) SSL_CTX_free(ctx);
        if (ssl != NULL) SSL_free(ssl);
        if (STDout != NULL) BIO_free_all(STDout);