Keep cipher lists sorted in the source instead of sorting them at

[openssl.git] / ssl / ssltest.c

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index f8e86c3ceb614945085a701ce3781cf8a914a45b..3818bf3edd75ffa3ac98df823ad3ad0da8014af9 100644 (file)
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -128,7 +128,7 @@
 #define USE_SOCKETS
 #include "e_os.h"
 
-#define _XOPEN_SOURCE 1                /* Or isascii won't be declared properly on
+#define _XOPEN_SOURCE 500      /* Or isascii won't be declared properly on
                                   VMS (at least with DECompHP C).  */
 #include <ctype.h>
 
@@ -143,9 +143,15 @@
 #endif
 #include <openssl/err.h>
 #include <openssl/rand.h>
+#ifndef OPENSSL_NO_RSA
 #include <openssl/rsa.h>
+#endif
+#ifndef OPENSSL_NO_DSA
 #include <openssl/dsa.h>
+#endif
+#ifndef OPENSSL_NO_DH
 #include <openssl/dh.h>
+#endif
 #include <openssl/bn.h>
 
 #define _XOPEN_SOURCE_EXTENDED 1 /* Or gethostname won't be declared properly
@@ -218,6 +224,7 @@ static const char rnd_seed[] = "string to make the random number generator think
 
 int doit_biopair(SSL *s_ssl,SSL *c_ssl,long bytes,clock_t *s_time,clock_t *c_time);
 int doit(SSL *s_ssl,SSL *c_ssl,long bytes);
+static int do_test_cipherlist(void);
 static void sv_usage(void)
        {
        fprintf(stderr,"usage: ssltest [args ...]\n");
@@ -266,6 +273,7 @@ static void sv_usage(void)
                       "                 Use \"openssl ecparam -list_curves\" for all names\n"  \
                       "                 (default is sect163r2).\n");
 #endif
+       fprintf(stderr," -test_cipherlist - verifies the order of the ssl cipher lists\n");
        }
 
 static void print_details(SSL *c_ssl, const char *prefix)
@@ -375,6 +383,7 @@ static void lock_dbg_cb(int mode, int type, const char *file, int line)
                }
        }
 
+
 int main(int argc, char *argv[])
        {
        char *CApath=NULL,*CAfile=NULL;
@@ -390,10 +399,12 @@ int main(int argc, char *argv[])
        char *server_key=NULL;
        char *client_cert=TEST_CLIENT_CERT;
        char *client_key=NULL;
+#ifndef OPENSSL_NO_ECDH
        char *named_curve = NULL;
+#endif
        SSL_CTX *s_ctx=NULL;
        SSL_CTX *c_ctx=NULL;
-       SSL_METHOD *meth=NULL;
+       const SSL_METHOD *meth=NULL;
        SSL *c_ssl,*s_ssl;
        int number=1,reuse=0;
        long bytes=256L;
@@ -411,6 +422,7 @@ int main(int argc, char *argv[])
        int comp = 0;
        COMP_METHOD *cm = NULL;
        STACK_OF(SSL_COMP) *ssl_comp_methods = NULL;
+       int test_cipherlist = 0;
 
        verbose = 0;
        debug = 0;
@@ -586,6 +598,10 @@ int main(int argc, char *argv[])
                        {
                        app_verify_arg.allow_proxy_certs = 1;
                        }
+               else if (strcmp(*argv,"-test_cipherlist") == 0)
+                       {
+                       test_cipherlist = 1;
+                       }
                else
                        {
                        fprintf(stderr,"unknown option %s\n",*argv);
@@ -602,6 +618,15 @@ bad:
                goto end;
                }
 
+       if (test_cipherlist == 1)
+               {
+               /* ensure that the cipher list are correctly sorted and exit */
+               if (do_test_cipherlist() == 0)
+                       EXIT(1);
+               ret = 0;
+               goto end;
+               }
+
        if (!ssl2 && !ssl3 && !tls1 && number > 1 && !reuse && !force)
                {
                fprintf(stderr, "This case cannot work.  Use -f to perform "
@@ -885,6 +910,7 @@ end:
        CRYPTO_mem_leaks(bio_err);
        if (bio_err != NULL) BIO_free(bio_err);
        EXIT(ret);
+       return ret;
        }
 
 int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
@@ -1694,7 +1720,7 @@ static int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx)
                                        fprintf(stderr, "  Certificate proxy rights = %*.*s", i, i, s);
                                        while(i-- > 0)
                                                {
-                                               char c = *s++;
+                                               int c = *s++;
                                                if (isascii(c) && isalpha(c))
                                                        {
                                                        if (islower(c))
@@ -1755,11 +1781,11 @@ static int process_proxy_cond_adders(unsigned int letters[26],
 static int process_proxy_cond_val(unsigned int letters[26],
        const char *cond, const char **cond_end, int *pos, int indent)
        {
-       char c;
+       int c;
        int ok = 1;
        int negate = 0;
 
-       while(isspace(*cond))
+       while(isspace((int)*cond))
                {
                cond++; (*pos)++;
                }
@@ -1774,7 +1800,7 @@ static int process_proxy_cond_val(unsigned int letters[26],
                {
                negate = !negate;
                cond++; (*pos)++;
-               while(isspace(*cond))
+               while(isspace((int)*cond))
                        {
                        cond++; (*pos)++;
                        }
@@ -1789,7 +1815,7 @@ static int process_proxy_cond_val(unsigned int letters[26],
                cond = *cond_end;
                if (ok < 0)
                        goto end;
-               while(isspace(*cond))
+               while(isspace((int)*cond))
                        {
                        cond++; (*pos)++;
                        }
@@ -1849,7 +1875,7 @@ static int process_proxy_cond_multipliers(unsigned int letters[26],
 
        while(ok >= 0)
                {
-               while(isspace(*cond))
+               while(isspace((int)*cond))
                        {
                        cond++; (*pos)++;
                        }
@@ -1916,7 +1942,7 @@ static int process_proxy_cond_adders(unsigned int letters[26],
 
        while(ok >= 0)
                {
-               while(isspace(*cond))
+               while(isspace((int)*cond))
                        {
                        cond++; (*pos)++;
                        }
@@ -1999,7 +2025,7 @@ static int MS_CALLBACK app_verify_callback(X509_STORE_CTX *ctx, void *arg)
                        letters[i] = 0;
                for(sp = cb_arg->proxy_auth; *sp; sp++)
                        {
-                       char c = *sp;
+                       int c = *sp;
                        if (isascii(c) && isalpha(c))
                                {
                                if (islower(c))
@@ -2204,4 +2230,57 @@ static DH *get_dh1024dsa()
        dh->length = 160;
        return(dh);
        }
+
+static int do_test_cipherlist(void)
+       {
+       int i = 0;
+       const SSL_METHOD *meth;
+       SSL_CIPHER *ci, *tci = NULL;
+
+       fprintf(stderr, "testing SSLv2 cipher list order: ");
+       meth = SSLv2_method();
+       while ((ci = meth->get_cipher(i++)) != NULL)
+               {
+               if (tci != NULL)
+                       if (ci->id >= tci->id)
+                               {
+                               fprintf(stderr, "failed %lx vs. %lx\n", ci->id, tci->id);
+                               return 0;
+                               }
+               tci = ci;
+               }
+       fprintf(stderr, "ok\n");
+
+       fprintf(stderr, "testing SSLv3 cipher list order: ");
+       meth = SSLv3_method();
+       tci = NULL;
+       while ((ci = meth->get_cipher(i++)) != NULL)
+               {
+               if (tci != NULL)
+                       if (ci->id >= tci->id)
+                               {
+                               fprintf(stderr, "failed %lx vs. %lx\n", ci->id, tci->id);
+                               return 0;
+                               }
+               tci = ci;
+               }
+       fprintf(stderr, "ok\n");
+
+       fprintf(stderr, "testing TLSv1 cipher list order: ");
+       meth = TLSv1_method();
+       tci = NULL;
+       while ((ci = meth->get_cipher(i++)) != NULL)
+               {
+               if (tci != NULL)
+                       if (ci->id >= tci->id)
+                               {
+                               fprintf(stderr, "failed %lx vs. %lx\n", ci->id, tci->id);
+                               return 0;
+                               }
+               tci = ci;
+               }
+       fprintf(stderr, "ok\n");
+
+       return 1;
+       }
 #endif