Remove SSLv2 support
[openssl.git] / ssl / s23_clnt.c
index 42c3d6861f9a4eeb285fc402cd3c74d3e3254066..37b3e23784facf989614818652c720a0642c1c90 100644 (file)
@@ -121,10 +121,6 @@ static int ssl23_client_hello(SSL *s);
 static int ssl23_get_server_hello(SSL *s);
 static const SSL_METHOD *ssl23_get_client_method(int ver)
        {
-#ifndef OPENSSL_NO_SSL2
-       if (ver == SSL2_VERSION)
-               return(SSLv2_client_method());
-#endif
 #ifndef OPENSSL_NO_SSL3
        if (ver == SSL3_VERSION)
                return(SSLv3_client_method());
@@ -256,24 +252,6 @@ end:
        return(ret);
        }
 
-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;
-               }
-       return 1;
-       }
-
 /* Fill a ClientRandom or ServerRandom field of length len. Returns <= 0
  * on failure, 1 on success. */
 int ssl_fill_hello_random(SSL *s, int server, unsigned char *result, int len)
@@ -300,9 +278,8 @@ static int ssl23_client_hello(SSL *s)
        {
        unsigned char *buf;
        unsigned char *p,*d;
-       int i,ch_len;
+       int i;
        unsigned long l;
-       int ssl2_compat;
        int version = 0, version_major, version_minor;
        int al = 0;
 #ifndef OPENSSL_NO_COMP
@@ -312,13 +289,6 @@ static int ssl23_client_hello(SSL *s)
        int ret;
        unsigned long mask, options = s->options;
 
-       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;
-
        /*
         * SSL_OP_NO_X disables all protocols above X *if* there are
         * some protocols below X enabled. This is required in order
@@ -330,9 +300,6 @@ static int ssl23_client_hello(SSL *s)
        mask =  SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1
 #if !defined(OPENSSL_NO_SSL3)
                |SSL_OP_NO_SSLv3
-#endif
-#if !defined(OPENSSL_NO_SSL2)
-               |(ssl2_compat?SSL_OP_NO_SSLv2:0)
 #endif
                ;
 #if !defined(OPENSSL_NO_TLS1_2_CLIENT)
@@ -352,28 +319,6 @@ static int ssl23_client_hello(SSL *s)
                version = SSL3_VERSION;
        mask &= ~SSL_OP_NO_SSLv3;
 #endif
-#if !defined(OPENSSL_NO_SSL2)
-       if ((options & SSL_OP_NO_SSLv3) && (options & mask) != mask)
-               version = SSL2_VERSION;
-#endif
-
-#ifndef OPENSSL_NO_TLSEXT
-       if (version != SSL2_VERSION)
-               {
-               /* have to disable SSL 2.0 compatibility if we need TLS extensions */
-
-               if (s->tlsext_hostname != NULL)
-                       ssl2_compat = 0;
-               if (s->tlsext_status_type != -1)
-                       ssl2_compat = 0;
-#ifdef TLSEXT_TYPE_opaque_prf_input
-               if (s->ctx->tlsext_opaque_prf_input_callback != 0 || s->tlsext_opaque_prf_input != NULL)
-                       ssl2_compat = 0;
-#endif
-               if (s->cert->cli_ext.meths_count != 0)
-                       ssl2_compat = 0;
-               }
-#endif
 
        buf=(unsigned char *)s->init_buf->data;
        if (s->state == SSL23_ST_CW_CLNT_HELLO_A)
@@ -424,11 +369,6 @@ static int ssl23_client_hello(SSL *s)
                        version_major = SSL3_VERSION_MAJOR;
                        version_minor = SSL3_VERSION_MINOR;
                        }
-               else if (version == SSL2_VERSION)
-                       {
-                       version_major = SSL2_VERSION_MAJOR;
-                       version_minor = SSL2_VERSION_MINOR;
-                       }
                else
                        {
                        SSLerr(SSL_F_SSL23_CLIENT_HELLO,SSL_R_NO_PROTOCOLS_AVAILABLE);
@@ -437,169 +377,105 @@ static int ssl23_client_hello(SSL *s)
 
                s->client_version = version;
 
-               if (ssl2_compat)
-                       {
-                       /* create SSL 2.0 compatible Client Hello */
+               /* create Client Hello in SSL 3.0/TLS 1.0 format */
 
-                       /* two byte record header will be written last */
-                       d = &(buf[2]);
-                       p = d + 9; /* leave space for message type, version, individual length fields */
+               /* do the record header (5 bytes) and handshake message header (4 bytes) last */
+               d = p = &(buf[9]);
+               
+               *(p++) = version_major;
+               *(p++) = version_minor;
 
-                       *(d++) = SSL2_MT_CLIENT_HELLO;
-                       *(d++) = version_major;
-                       *(d++) = version_minor;
-                       
-                       /* Ciphers supported */
-                       i=ssl_cipher_list_to_bytes(s,SSL_get_ciphers(s),p,0);
-                       if (i == 0)
-                               {
-                               /* no ciphers */
-                               SSLerr(SSL_F_SSL23_CLIENT_HELLO,SSL_R_NO_CIPHERS_AVAILABLE);
-                               return -1;
-                               }
-                       s2n(i,d);
-                       p+=i;
-                       
-                       /* put in the session-id length (zero since there is no reuse) */
-#if 0
-                       s->session->session_id_length=0;
-#endif
-                       s2n(0,d);
-
-                       if (s->options & SSL_OP_NETSCAPE_CHALLENGE_BUG)
-                               ch_len=SSL2_CHALLENGE_LENGTH;
-                       else
-                               ch_len=SSL2_MAX_CHALLENGE_LENGTH;
-
-                       /* write out sslv2 challenge */
-                       /* Note that ch_len must be <= SSL3_RANDOM_SIZE (32),
-                          because it is one of SSL2_MAX_CHALLENGE_LENGTH (32)
-                          or SSL2_MAX_CHALLENGE_LENGTH (16), but leave the
-                          check in for futurproofing */
-                       if (SSL3_RANDOM_SIZE < ch_len)
-                               i=SSL3_RANDOM_SIZE;
-                       else
-                               i=ch_len;
-                       s2n(i,d);
-                       memset(&(s->s3->client_random[0]),0,SSL3_RANDOM_SIZE);
-                       if (RAND_pseudo_bytes(&(s->s3->client_random[SSL3_RANDOM_SIZE-i]),i) <= 0)
-                               return -1;
-
-                       memcpy(p,&(s->s3->client_random[SSL3_RANDOM_SIZE-i]),i);
-                       p+=i;
-
-                       i= p- &(buf[2]);
-                       buf[0]=((i>>8)&0xff)|0x80;
-                       buf[1]=(i&0xff);
-
-                       /* number of bytes to write */
-                       s->init_num=i+2;
-                       s->init_off=0;
-
-                       ssl3_finish_mac(s,&(buf[2]),i);
-                       }
-               else
-                       {
-                       /* create Client Hello in SSL 3.0/TLS 1.0 format */
-
-                       /* do the record header (5 bytes) and handshake message header (4 bytes) last */
-                       d = p = &(buf[9]);
-                       
-                       *(p++) = version_major;
-                       *(p++) = version_minor;
+               /* Random stuff */
+               memcpy(p, s->s3->client_random, SSL3_RANDOM_SIZE);
+               p += SSL3_RANDOM_SIZE;
 
-                       /* Random stuff */
-                       memcpy(p, s->s3->client_random, SSL3_RANDOM_SIZE);
-                       p += SSL3_RANDOM_SIZE;
+               /* Session ID (zero since there is no reuse) */
+               *(p++) = 0;
 
-                       /* Session ID (zero since there is no reuse) */
-                       *(p++) = 0;
-
-                       /* Ciphers supported (using SSL 3.0/TLS 1.0 format) */
-                       i=ssl_cipher_list_to_bytes(s,SSL_get_ciphers(s),&(p[2]),ssl3_put_cipher_by_char);
-                       if (i == 0)
-                               {
-                               SSLerr(SSL_F_SSL23_CLIENT_HELLO,SSL_R_NO_CIPHERS_AVAILABLE);
-                               return -1;
-                               }
+               /* Ciphers supported (using SSL 3.0/TLS 1.0 format) */
+               i=ssl_cipher_list_to_bytes(s,SSL_get_ciphers(s),&(p[2]),ssl3_put_cipher_by_char);
+               if (i == 0)
+                       {
+                       SSLerr(SSL_F_SSL23_CLIENT_HELLO,SSL_R_NO_CIPHERS_AVAILABLE);
+                       return -1;
+                       }
 #ifdef OPENSSL_MAX_TLS1_2_CIPHER_LENGTH
-                       /* Some servers hang if client hello > 256 bytes
-                        * as hack workaround chop number of supported ciphers
-                        * to keep it well below this if we use TLS v1.2
-                        */
-                       if (TLS1_get_version(s) >= TLS1_2_VERSION
-                               && i > OPENSSL_MAX_TLS1_2_CIPHER_LENGTH)
-                               i = OPENSSL_MAX_TLS1_2_CIPHER_LENGTH & ~1;
+               /* Some servers hang if client hello > 256 bytes
+                * as hack workaround chop number of supported ciphers
+                * to keep it well below this if we use TLS v1.2
+                */
+               if (TLS1_get_version(s) >= TLS1_2_VERSION
+                       && i > OPENSSL_MAX_TLS1_2_CIPHER_LENGTH)
+                       i = OPENSSL_MAX_TLS1_2_CIPHER_LENGTH & ~1;
 #endif
-                       s2n(i,p);
-                       p+=i;
+               s2n(i,p);
+               p+=i;
 
-                       /* COMPRESSION */
+               /* COMPRESSION */
 #ifdef OPENSSL_NO_COMP
-                       *(p++)=1;
+               *(p++)=1;
 #else
-                       if (!ssl_allow_compression(s) || !s->ctx->comp_methods)
-                               j=0;
-                       else
-                               j=sk_SSL_COMP_num(s->ctx->comp_methods);
-                       *(p++)=1+j;
-                       for (i=0; i<j; i++)
-                               {
-                               comp=sk_SSL_COMP_value(s->ctx->comp_methods,i);
-                               *(p++)=comp->id;
-                               }
+               if (!ssl_allow_compression(s) || !s->ctx->comp_methods)
+                       j=0;
+               else
+                       j=sk_SSL_COMP_num(s->ctx->comp_methods);
+               *(p++)=1+j;
+               for (i=0; i<j; i++)
+                       {
+                       comp=sk_SSL_COMP_value(s->ctx->comp_methods,i);
+                       *(p++)=comp->id;
+                       }
 #endif
-                       *(p++)=0; /* Add the NULL method */
+               *(p++)=0; /* Add the NULL method */
 
 #ifndef OPENSSL_NO_TLSEXT
-                       /* TLS extensions*/
-                       if (ssl_prepare_clienthello_tlsext(s) <= 0)
-                               {
-                               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, &al)) == NULL)
-                               {
-                               ssl3_send_alert(s,SSL3_AL_FATAL,al);
-                               SSLerr(SSL_F_SSL23_CLIENT_HELLO,ERR_R_INTERNAL_ERROR);
-                               return -1;
-                               }
+               /* TLS extensions*/
+               if (ssl_prepare_clienthello_tlsext(s) <= 0)
+                       {
+                       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, &al)) == NULL)
+                       {
+                       ssl3_send_alert(s,SSL3_AL_FATAL,al);
+                       SSLerr(SSL_F_SSL23_CLIENT_HELLO,ERR_R_INTERNAL_ERROR);
+                       return -1;
+                       }
 #endif
-                       
-                       l = p-d;
+               
+               l = p-d;
 
-                       /* fill in 4-byte handshake header */
-                       d=&(buf[5]);
-                       *(d++)=SSL3_MT_CLIENT_HELLO;
-                       l2n3(l,d);
+               /* fill in 4-byte handshake header */
+               d=&(buf[5]);
+               *(d++)=SSL3_MT_CLIENT_HELLO;
+               l2n3(l,d);
 
-                       l += 4;
+               l += 4;
 
-                       if (l > SSL3_RT_MAX_PLAIN_LENGTH)
-                               {
-                               SSLerr(SSL_F_SSL23_CLIENT_HELLO,ERR_R_INTERNAL_ERROR);
-                               return -1;
-                               }
-                       
-                       /* fill in 5-byte record header */
-                       d=buf;
-                       *(d++) = SSL3_RT_HANDSHAKE;
-                       *(d++) = version_major;
-                       /* Some servers hang if we use long client hellos
-                        * and a record number > TLS 1.0.
-                        */
-                       if (TLS1_get_client_version(s) > TLS1_VERSION)
-                               *(d++) = 1;
-                       else
-                               *(d++) = version_minor;
-                       s2n((int)l,d);
-
-                       /* number of bytes to write */
-                       s->init_num=p-buf;
-                       s->init_off=0;
-
-                       ssl3_finish_mac(s,&(buf[5]), s->init_num - 5);
+               if (l > SSL3_RT_MAX_PLAIN_LENGTH)
+                       {
+                       SSLerr(SSL_F_SSL23_CLIENT_HELLO,ERR_R_INTERNAL_ERROR);
+                       return -1;
                        }
+               
+               /* fill in 5-byte record header */
+               d=buf;
+               *(d++) = SSL3_RT_HANDSHAKE;
+               *(d++) = version_major;
+               /* Some servers hang if we use long client hellos
+                * and a record number > TLS 1.0.
+                */
+               if (TLS1_get_client_version(s) > TLS1_VERSION)
+                       *(d++) = 1;
+               else
+                       *(d++) = version_minor;
+               s2n((int)l,d);
+
+               /* number of bytes to write */
+               s->init_num=p-buf;
+               s->init_off=0;
+
+               ssl3_finish_mac(s,&(buf[5]), s->init_num - 5);
 
                s->state=SSL23_ST_CW_CLNT_HELLO_B;
                s->init_off=0;
@@ -611,14 +487,8 @@ static int ssl23_client_hello(SSL *s)
        if ((ret >= 2) && s->msg_callback)
                {
                /* Client Hello has been sent; tell msg_callback */
-
-               if (ssl2_compat)
-                       s->msg_callback(1, SSL2_VERSION, 0, s->init_buf->data+2, ret-2, s, s->msg_callback_arg);
-               else
-                       {
-                       s->msg_callback(1, version, SSL3_RT_HEADER, s->init_buf->data, 5, s, s->msg_callback_arg);
-                       s->msg_callback(1, version, SSL3_RT_HANDSHAKE, s->init_buf->data+5, ret-5, s, s->msg_callback_arg);
-                       }
+               s->msg_callback(1, version, SSL3_RT_HEADER, s->init_buf->data, 5, s, s->msg_callback_arg);
+               s->msg_callback(1, version, SSL3_RT_HANDSHAKE, s->init_buf->data+5, ret-5, s, s->msg_callback_arg);
                }
 
        return ret;
@@ -638,78 +508,7 @@ static int ssl23_get_server_hello(SSL *s)
 
        memcpy(buf,p,n);
 
-       if ((p[0] & 0x80) && (p[2] == SSL2_MT_SERVER_HELLO) &&
-               (p[5] == 0x00) && (p[6] == 0x02))
-               {
-#ifdef OPENSSL_NO_SSL2
-               SSLerr(SSL_F_SSL23_GET_SERVER_HELLO,SSL_R_UNSUPPORTED_PROTOCOL);
-               goto err;
-#else
-               /* we are talking sslv2 */
-               /* we need to clean up the SSLv3 setup and put in the
-                * sslv2 stuff. */
-               int ch_len;
-
-               if (s->options & SSL_OP_NO_SSLv2)
-                       {
-                       SSLerr(SSL_F_SSL23_GET_SERVER_HELLO,SSL_R_UNSUPPORTED_PROTOCOL);
-                       goto err;
-                       }
-               if (s->s2 == NULL)
-                       {
-                       if (!ssl2_new(s))
-                               goto err;
-                       }
-               else
-                       ssl2_clear(s);
-
-               if (s->options & SSL_OP_NETSCAPE_CHALLENGE_BUG)
-                       ch_len=SSL2_CHALLENGE_LENGTH;
-               else
-                       ch_len=SSL2_MAX_CHALLENGE_LENGTH;
-
-               /* write out sslv2 challenge */
-               /* Note that ch_len must be <= SSL3_RANDOM_SIZE (32), because
-                  it is one of SSL2_MAX_CHALLENGE_LENGTH (32) or
-                  SSL2_MAX_CHALLENGE_LENGTH (16), but leave the check in for
-                  futurproofing */
-               i=(SSL3_RANDOM_SIZE < ch_len)
-                       ?SSL3_RANDOM_SIZE:ch_len;
-               s->s2->challenge_length=i;
-               memcpy(s->s2->challenge,
-                       &(s->s3->client_random[SSL3_RANDOM_SIZE-i]),i);
-
-               if (s->s3 != NULL) ssl3_free(s);
-
-               if (!BUF_MEM_grow_clean(s->init_buf,
-                       SSL2_MAX_RECORD_LENGTH_3_BYTE_HEADER))
-                       {
-                       SSLerr(SSL_F_SSL23_GET_SERVER_HELLO,ERR_R_BUF_LIB);
-                       goto err;
-                       }
-
-               s->state=SSL2_ST_GET_SERVER_HELLO_A;
-               if (!(s->client_version == SSL2_VERSION))
-                       /* use special padding (SSL 3.0 draft/RFC 2246, App. E.2) */
-                       s->s2->ssl2_rollback=1;
-
-               /* setup the 7 bytes we have read so we get them from
-                * the sslv2 buffer */
-               s->rstate=SSL_ST_READ_HEADER;
-               s->packet_length=n;
-               s->packet= &(s->s2->rbuf[0]);
-               memcpy(s->packet,buf,n);
-               s->s2->rbuf_left=n;
-               s->s2->rbuf_offs=0;
-
-               /* we have already written one */
-               s->s2->write_sequence=1;
-
-               s->method=SSLv2_client_method();
-               s->handshake_func=s->method->ssl_connect;
-#endif
-               }
-       else if (p[1] == SSL3_VERSION_MAJOR &&
+       if (p[1] == SSL3_VERSION_MAJOR &&
                 p[2] <= TLS1_2_VERSION_MINOR &&
                 ((p[0] == SSL3_RT_HANDSHAKE && p[5] == SSL3_MT_SERVER_HELLO) ||
                  (p[0] == SSL3_RT_ALERT && p[3] == 0 && p[4] == 2)))