update FAQ
[openssl.git] / apps / ciphers.c
index aa76ae2..c9abf1a 100644 (file)
@@ -85,6 +85,9 @@ int MAIN(int argc, char **argv)
        {
        int ret=1,i;
        int verbose=0,Verbose=0;
        {
        int ret=1,i;
        int verbose=0,Verbose=0;
+#ifndef OPENSSL_NO_SSL_TRACE
+       int stdname = 0;
+#endif
        const char **pp;
        const char *p;
        int badops=0;
        const char **pp;
        const char *p;
        int badops=0;
@@ -115,6 +118,8 @@ int MAIN(int argc, char **argv)
        STDout = BIO_push(tmpbio, STDout);
        }
 #endif
        STDout = BIO_push(tmpbio, STDout);
        }
 #endif
+       if (!load_config(bio_err, NULL))
+               goto end;
 
        argc--;
        argv++;
 
        argc--;
        argv++;
@@ -124,6 +129,10 @@ int MAIN(int argc, char **argv)
                        verbose=1;
                else if (strcmp(*argv,"-V") == 0)
                        verbose=Verbose=1;
                        verbose=1;
                else if (strcmp(*argv,"-V") == 0)
                        verbose=Verbose=1;
+#ifndef OPENSSL_NO_SSL_TRACE
+               else if (strcmp(*argv,"-stdname") == 0)
+                       stdname=verbose=1;
+#endif
 #ifndef OPENSSL_NO_SSL2
                else if (strcmp(*argv,"-ssl2") == 0)
                        meth=SSLv2_client_method();
 #ifndef OPENSSL_NO_SSL2
                else if (strcmp(*argv,"-ssl2") == 0)
                        meth=SSLv2_client_method();
@@ -194,11 +203,11 @@ int MAIN(int argc, char **argv)
                        
                        if (Verbose)
                                {
                        
                        if (Verbose)
                                {
-                               unsigned long id = c->id;
+                               unsigned long id = SSL_CIPHER_get_id(c);
                                int id0 = (int)(id >> 24);
                                int id1 = (int)((id >> 16) & 0xffL);
                                int id2 = (int)((id >> 8) & 0xffL);
                                int id0 = (int)(id >> 24);
                                int id1 = (int)((id >> 16) & 0xffL);
                                int id2 = (int)((id >> 8) & 0xffL);
-                               int id3 = (int)(i & 0xffL);
+                               int id3 = (int)(id & 0xffL);
                                
                                if ((id & 0xff000000L) == 0x02000000L)
                                        BIO_printf(STDout, "     0x%02X,0x%02X,0x%02X - ", id1, id2, id3); /* SSL2 cipher */
                                
                                if ((id & 0xff000000L) == 0x02000000L)
                                        BIO_printf(STDout, "     0x%02X,0x%02X,0x%02X - ", id1, id2, id3); /* SSL2 cipher */
@@ -207,7 +216,15 @@ int MAIN(int argc, char **argv)
                                else
                                        BIO_printf(STDout, "0x%02X,0x%02X,0x%02X,0x%02X - ", id0, id1, id2, id3); /* whatever */
                                }
                                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));
                        }
                }
                        BIO_puts(STDout,SSL_CIPHER_description(c,buf,sizeof buf));
                        }
                }