Revision of custom extension code.

[openssl.git] / ssl / s23_clnt.c

diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c
index af4fffe67d1c814b37278ec586a81125888d3272..903f1282ddd44f57e284a466d773752998faf220 100644 (file)
--- a/ssl/s23_clnt.c
+++ b/ssl/s23_clnt.c
@@ -259,10 +259,13 @@ static int ssl23_no_ssl2_ciphers(SSL *s)
        SSL_CIPHER *cipher;
        STACK_OF(SSL_CIPHER) *ciphers;
        int i;
+       ssl_set_client_disabled(s);
        ciphers = SSL_get_ciphers(s);
        for (i = 0; i < sk_SSL_CIPHER_num(ciphers); i++)
                {
                cipher = sk_SSL_CIPHER_value(ciphers, i);
+               if (ssl_cipher_disabled(s, cipher, SSL_SECOP_CIPHER_SUPPORTED))
+                       continue;
                if (cipher->algorithm_ssl == SSL_SSLV2)
                        return 0;
                }
@@ -282,7 +285,7 @@ int ssl_fill_hello_random(SSL *s, int server, unsigned char *result, int len)
                        send_time = (s->mode & SSL_MODE_SEND_CLIENTHELLO_TIME) != 0;
                if (send_time)
                        {
-                       unsigned long Time = time(NULL);
+                       unsigned long Time = (unsigned long)time(NULL);
                        unsigned char *p = result;
                        l2n(Time, p);
                        return RAND_pseudo_bytes(p, len-4);
@@ -296,9 +299,10 @@ static int ssl23_client_hello(SSL *s)
        unsigned char *buf;
        unsigned char *p,*d;
        int i,ch_len;
-       unsigned long Time,l;
+       unsigned long l;
        int ssl2_compat;
        int version = 0, version_major, version_minor;
+       int al = 0;
 #ifndef OPENSSL_NO_COMP
        int j;
        SSL_COMP *comp;
@@ -308,6 +312,8 @@ static int ssl23_client_hello(SSL *s)
 
        ssl2_compat = (options & SSL_OP_NO_SSLv2) ? 0 : 1;
 
+       if (ssl2_compat && !ssl_security(s, SSL_SECOP_SSL2_COMPAT, 0, 0, NULL))
+               ssl2_compat = 0;
        if (ssl2_compat && ssl23_no_ssl2_ciphers(s))
                ssl2_compat = 0;
 
@@ -362,9 +368,7 @@ static int ssl23_client_hello(SSL *s)
                if (s->ctx->tlsext_opaque_prf_input_callback != 0 || s->tlsext_opaque_prf_input != NULL)
                        ssl2_compat = 0;
 #endif
-               if (s->ctx->custom_cli_ext_records_count != 0)
-                       ssl2_compat = 0;
-               if (s->ctx->cli_supp_data_records_count != 0)
+               if (s->cert->custom_cli_ext_records_count != 0)
                        ssl2_compat = 0;
                }
 #endif
@@ -532,8 +536,7 @@ static int ssl23_client_hello(SSL *s)
 #ifdef OPENSSL_NO_COMP
                        *(p++)=1;
 #else
-                       if ((s->options & SSL_OP_NO_COMPRESSION)
-                                               || !s->ctx->comp_methods)
+                       if (!ssl_allow_compression(s) || !s->ctx->comp_methods)
                                j=0;
                        else
                                j=sk_SSL_COMP_num(s->ctx->comp_methods);
@@ -553,8 +556,9 @@ static int ssl23_client_hello(SSL *s)
                                SSLerr(SSL_F_SSL23_CLIENT_HELLO,SSL_R_CLIENTHELLO_TLSEXT);
                                return -1;
                                }
-                       if ((p = ssl_add_clienthello_tlsext(s, p, buf+SSL3_RT_MAX_PLAIN_LENGTH)) == NULL)
+                       if ((p = ssl_add_clienthello_tlsext(s, p, buf+SSL3_RT_MAX_PLAIN_LENGTH, &al)) == NULL)
                                {
+                               ssl3_send_alert(s,SSL3_AL_FATAL,al);
                                SSLerr(SSL_F_SSL23_CLIENT_HELLO,ERR_R_INTERNAL_ERROR);
                                return -1;
                                }
@@ -748,6 +752,12 @@ static int ssl23_get_server_hello(SSL *s)
                        goto err;
                        }
 
+               if (!ssl_security(s, SSL_SECOP_VERSION, 0, s->version, NULL))
+                       {
+                       SSLerr(SSL_F_SSL23_GET_SERVER_HELLO,SSL_R_VERSION_TOO_LOW);
+                       goto err;
+                       }
+
                if (p[0] == SSL3_RT_ALERT && p[5] != SSL3_AL_WARNING)
                        {
                        /* fatal alert */