Add missing tests

[openssl.git] / apps / ciphers.c

diff --git a/apps/ciphers.c b/apps/ciphers.c
index 3d4c60db9e11124e7e2c9accbbaa20d1f299abc5..93dce1c40b4a3e11750725d6bbf3d8f774dd7560 100644 (file)
--- a/apps/ciphers.c
+++ b/apps/ciphers.c
@@ -96,13 +96,7 @@ int MAIN(int argc, char **argv)
        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();
 
@@ -196,7 +190,7 @@ int MAIN(int argc, char **argv)
                        
                        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);