Add new experimental ciphersuites. Bring naming into line with RFC.

[openssl.git] / ssl / s3_lib.c

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index c32b71604112b6d801e505df8ac9b12151fc8e2a..ab0d012b380650cb453bc2c59f8f76d0e5e76e4b 100644 (file)
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -60,7 +60,7 @@
 #include "objects.h"
 #include "ssl_locl.h"
 
-char *ssl3_version_str="SSLv3 part of OpenSSL 0.9.2 31-Dec-1998";
+char *ssl3_version_str="SSLv3" OPENSSL_VERSION_PTEXT;
 
 #define SSL3_NUM_CIPHERS       (sizeof(ssl3_ciphers)/sizeof(SSL_CIPHER))
 
@@ -355,12 +355,13 @@ SSL_CIPHER ssl3_ciphers[]={
        SSL_ALL_CIPHERS,
        },
 
+#if TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES
        /* New TLS Export CipherSuites */
        /* Cipher 60 */
            {
            1,
-           TLS1_TXT_RSA_EXPORT56_WITH_RC4_56_MD5,
-           TLS1_CK_RSA_EXPORT56_WITH_RC4_56_MD5,
+           TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_MD5,
+           TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_MD5,
            SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_MD5|SSL_EXP56|SSL_TLSV1,
            0,
            SSL_ALL_CIPHERS
@@ -368,8 +369,8 @@ SSL_CIPHER ssl3_ciphers[]={
        /* Cipher 61 */
            {
            1,
-           TLS1_TXT_RSA_EXPORT56_WITH_RC2_CBC_56_MD5,
-           TLS1_CK_RSA_EXPORT56_WITH_RC2_CBC_56_MD5,
+           TLS1_TXT_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5,
+           TLS1_CK_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5,
            SSL_kRSA|SSL_aRSA|SSL_RC2|SSL_MD5|SSL_EXP56|SSL_TLSV1,
            0,
            SSL_ALL_CIPHERS
@@ -377,12 +378,49 @@ SSL_CIPHER ssl3_ciphers[]={
        /* Cipher 62 */
            {
            1,
-           TLS1_TXT_RSA_EXPORT56_WITH_DES_CBC_SHA,
-           TLS1_CK_RSA_EXPORT56_WITH_DES_CBC_SHA,
+           TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA,
+           TLS1_CK_RSA_EXPORT1024_WITH_DES_CBC_SHA,
            SSL_kRSA|SSL_aRSA|SSL_DES|SSL_SHA|SSL_EXP56|SSL_TLSV1,
            0,
            SSL_ALL_CIPHERS
            },
+       /* Cipher 63 */
+           {
+           1,
+           TLS1_TXT_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA,
+           TLS1_CK_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA,
+           SSL_kEDH|SSL_aDSS|SSL_DES|SSL_SHA|SSL_EXP56|SSL_TLSV1,
+           0,
+           SSL_ALL_CIPHERS
+           },
+       /* Cipher 64 */
+           {
+           1,
+           TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_SHA,
+           TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_SHA,
+           SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_SHA|SSL_EXP56|SSL_TLSV1,
+           0,
+           SSL_ALL_CIPHERS
+           },
+       /* Cipher 65 */
+           {
+           1,
+           TLS1_TXT_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA,
+           TLS1_CK_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA,
+           SSL_kEDH|SSL_aDSS|SSL_RC4|SSL_SHA|SSL_EXP56|SSL_TLSV1,
+           0,
+           SSL_ALL_CIPHERS
+           },
+       /* Cipher 66 */
+           {
+           1,
+           TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA,
+           TLS1_CK_DHE_DSS_WITH_RC4_128_SHA,
+           SSL_kEDH|SSL_aDSS|SSL_RC4|SSL_SHA|SSL_TLSV1,
+           0,
+           SSL_ALL_CIPHERS
+           },
+#endif
 
 /* end of list */
        };
@@ -500,7 +538,7 @@ SSL *s;
                DH_free(s->s3->tmp.dh);
 #endif
        if (s->s3->tmp.ca_names != NULL)
-               sk_pop_free(s->s3->tmp.ca_names,X509_NAME_free);
+               sk_X509_NAME_pop_free(s->s3->tmp.ca_names,X509_NAME_free);
        memset(s->s3,0,sizeof(SSL3_CTX));
        Free(s->s3);
        s->s3=NULL;
@@ -513,7 +551,7 @@ SSL *s;
 
        ssl3_cleanup_key_block(s);
        if (s->s3->tmp.ca_names != NULL)
-               sk_pop_free(s->s3->tmp.ca_names,X509_NAME_free);
+               sk_X509_NAME_pop_free(s->s3->tmp.ca_names,X509_NAME_free);
 
        if (s->s3->rrec.comp != NULL)
                {
@@ -748,10 +786,10 @@ char *parg;
        case SSL_CTRL_EXTRA_CHAIN_CERT:
                if (ctx->extra_certs == NULL)
                        {
-                       if ((ctx->extra_certs=sk_new_null()) == NULL)
+                       if ((ctx->extra_certs=sk_X509_new_null()) == NULL)
                                return(0);
                        }
-               sk_push(ctx->extra_certs,(char *)parg);
+               sk_X509_push(ctx->extra_certs,(X509 *)parg);
                break;
 
        default:
@@ -830,7 +868,8 @@ int i;
 
 SSL_CIPHER *ssl3_choose_cipher(s,have,pref)
 SSL *s;
-STACK *have,*pref;
+STACK_OF(SSL_CIPHER) *have;
+STACK_OF(SSL_CIPHER) *pref;
        {
        SSL_CIPHER *c,*ret=NULL;
        int i,j,ok;
@@ -843,7 +882,7 @@ STACK *have,*pref;
        else
                cert=s->ctx->default_cert;
 
-       sk_set_cmp_func(pref,ssl_cipher_ptr_id_cmp);
+       sk_SSL_CIPHER_set_cmp_func(pref,ssl_cipher_ptr_id_cmp);
 
 #ifdef CIPHER_DEBUG
        printf("Have:\n");
@@ -854,9 +893,9 @@ STACK *have,*pref;
            }
 #endif
 
-       for (i=0; i<sk_num(have); i++)
+       for (i=0; i<sk_SSL_CIPHER_num(have); i++)
                {
-               c=(SSL_CIPHER *)sk_value(have,i);
+               c=sk_SSL_CIPHER_value(have,i);
 
                ssl_set_cert_masks(cert,s->ctx->default_cert,c);
                mask=cert->mask;
@@ -882,10 +921,10 @@ STACK *have,*pref;
 
                if (!ok) continue;
        
-               j=sk_find(pref,(char *)c);
+               j=sk_SSL_CIPHER_find(pref,c);
                if (j >= 0)
                        {
-                       ret=(SSL_CIPHER *)sk_value(pref,j);
+                       ret=sk_SSL_CIPHER_value(pref,j);
                        break;
                        }
                }