Commit af13c50d authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix wrong function codes and duplicate codes

parent 65c2397f

ssl/ssl.h

+7 −6
Original line number Diff line number Diff line
@@ -1695,8 +1695,6 @@ void ERR_load_SSL_strings(void); 
#define SSL_F_GET_SERVER_HELLO				 109

#define SSL_F_GET_SERVER_VERIFY				 110

#define SSL_F_I2D_SSL_SESSION				 111

#define SSL_F_PARSE_CLIENT_HELLO_RENEGOTIATE_EXT	 280

#define SSL_F_PARSE_SERVER_HELLO_RENEGOTIATE_EXT	 281

#define SSL_F_READ_N					 112

#define SSL_F_REQUEST_CERTIFICATE			 113

#define SSL_F_SERVER_FINISH				 239
@@ -1761,10 +1759,11 @@ void ERR_load_SSL_strings(void); 
#define SSL_F_SSL3_SETUP_KEY_BLOCK			 157

#define SSL_F_SSL3_WRITE_BYTES				 158

#define SSL_F_SSL3_WRITE_PENDING			 159

#define SSL_F_SSL_ADD_CLIENTHELLO_RENEGOTIATE_EXT	 282

#define SSL_F_SSL_ADD_CLIENTHELLO_RENEGOTIATE_EXT	 285

#define SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT		 272

#define SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK	 215

#define SSL_F_SSL_ADD_FILE_CERT_SUBJECTS_TO_STACK	 216

#define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT	 286

#define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT		 273

#define SSL_F_SSL_BAD_METHOD				 160

#define SSL_F_SSL_BYTES_TO_CIPHER_LIST			 161
@@ -1806,6 +1805,8 @@ void ERR_load_SSL_strings(void); 
#define SSL_F_SSL_INIT_WBIO_BUFFER			 184

#define SSL_F_SSL_LOAD_CLIENT_CA_FILE			 185

#define SSL_F_SSL_NEW					 186

#define SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT	 287

#define SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT	 289

#define SSL_F_SSL_PEEK					 270

#define SSL_F_SSL_PREPARE_CLIENTHELLO_TLSEXT		 275

#define SSL_F_SSL_PREPARE_SERVERHELLO_TLSEXT		 276
@@ -2001,9 +2002,9 @@ void ERR_load_SSL_strings(void); 
#define SSL_R_RECORD_LENGTH_MISMATCH			 213

#define SSL_R_RECORD_TOO_LARGE				 214

#define SSL_R_RECORD_TOO_SMALL				 298

#define SSL_R_RENEGOTIATE_EXT_TOO_LONG			 318

#define SSL_R_RENEGOTIATION_ENCODING_ERR		 320

#define SSL_R_RENEGOTIATION_MISMATCH			 319

#define SSL_R_RENEGOTIATE_EXT_TOO_LONG			 320

#define SSL_R_RENEGOTIATION_ENCODING_ERR		 321

#define SSL_R_RENEGOTIATION_MISMATCH			 322

#define SSL_R_REQUIRED_CIPHER_MISSING			 215

#define SSL_R_REUSE_CERT_LENGTH_NOT_ZERO		 216

#define SSL_R_REUSE_CERT_TYPE_NOT_ZERO			 217

ssl/ssl_err.c

+4 −2
Original line number Diff line number Diff line
@@ -110,8 +110,6 @@ static ERR_STRING_DATA SSL_str_functs[]= 
{ERR_FUNC(SSL_F_GET_SERVER_HELLO),	"GET_SERVER_HELLO"},

{ERR_FUNC(SSL_F_GET_SERVER_VERIFY),	"GET_SERVER_VERIFY"},

{ERR_FUNC(SSL_F_I2D_SSL_SESSION),	"i2d_SSL_SESSION"},

{ERR_FUNC(SSL_F_PARSE_CLIENT_HELLO_RENEGOTIATE_EXT),	"PARSE_CLIENT_HELLO_RENEGOTIATE_EXT"},

{ERR_FUNC(SSL_F_PARSE_SERVER_HELLO_RENEGOTIATE_EXT),	"PARSE_SERVER_HELLO_RENEGOTIATE_EXT"},

{ERR_FUNC(SSL_F_READ_N),	"READ_N"},

{ERR_FUNC(SSL_F_REQUEST_CERTIFICATE),	"REQUEST_CERTIFICATE"},

{ERR_FUNC(SSL_F_SERVER_FINISH),	"SERVER_FINISH"},
@@ -180,6 +178,7 @@ static ERR_STRING_DATA SSL_str_functs[]= 
{ERR_FUNC(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT),	"SSL_ADD_CLIENTHELLO_TLSEXT"},

{ERR_FUNC(SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK),	"SSL_add_dir_cert_subjects_to_stack"},

{ERR_FUNC(SSL_F_SSL_ADD_FILE_CERT_SUBJECTS_TO_STACK),	"SSL_add_file_cert_subjects_to_stack"},

{ERR_FUNC(SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT),	"SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT"},

{ERR_FUNC(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT),	"SSL_ADD_SERVERHELLO_TLSEXT"},

{ERR_FUNC(SSL_F_SSL_BAD_METHOD),	"SSL_BAD_METHOD"},

{ERR_FUNC(SSL_F_SSL_BYTES_TO_CIPHER_LIST),	"SSL_BYTES_TO_CIPHER_LIST"},
@@ -221,6 +220,8 @@ static ERR_STRING_DATA SSL_str_functs[]= 
{ERR_FUNC(SSL_F_SSL_INIT_WBIO_BUFFER),	"SSL_INIT_WBIO_BUFFER"},

{ERR_FUNC(SSL_F_SSL_LOAD_CLIENT_CA_FILE),	"SSL_load_client_CA_file"},

{ERR_FUNC(SSL_F_SSL_NEW),	"SSL_new"},

{ERR_FUNC(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT),	"SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT"},

{ERR_FUNC(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT),	"SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT"},

{ERR_FUNC(SSL_F_SSL_PEEK),	"SSL_peek"},

{ERR_FUNC(SSL_F_SSL_PREPARE_CLIENTHELLO_TLSEXT),	"SSL_PREPARE_CLIENTHELLO_TLSEXT"},

{ERR_FUNC(SSL_F_SSL_PREPARE_SERVERHELLO_TLSEXT),	"SSL_PREPARE_SERVERHELLO_TLSEXT"},
@@ -391,6 +392,7 @@ static ERR_STRING_DATA SSL_str_reasons[]= 
{ERR_REASON(SSL_R_NO_PRIVATE_KEY_ASSIGNED),"no private key assigned"},

{ERR_REASON(SSL_R_NO_PROTOCOLS_AVAILABLE),"no protocols available"},

{ERR_REASON(SSL_R_NO_PUBLICKEY)          ,"no publickey"},

{ERR_REASON(SSL_R_NO_RENEGOTIATION)      ,"no renegotiation"},

{ERR_REASON(SSL_R_NO_SHARED_CIPHER)      ,"no shared cipher"},

{ERR_REASON(SSL_R_NO_VERIFY_CALLBACK)    ,"no verify callback"},

{ERR_REASON(SSL_R_NULL_SSL_CTX)          ,"null ssl ctx"},

ssl/t1_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned cha 
          

          if(!ssl_add_serverhello_renegotiate_ext(s, 0, &el, 0))

              {

              SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);

              SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);

              return NULL;

              }
@@ -312,7 +312,7 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned cha 


          if(!ssl_add_serverhello_renegotiate_ext(s, ret, &el, el))

              {

              SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);

              SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);

              return NULL;

              }

ssl/t1_reneg.c

+10 −10
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ int ssl_parse_clienthello_renegotiate_ext(SSL *s, unsigned char *d, int len, 
    /* Parse the length byte */

    if(len < 1)

        {

        SSLerr(SSL_F_PARSE_SERVER_HELLO_RENEGOTIATE_EXT,SSL_R_RENEGOTIATION_ENCODING_ERR);

        SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT,SSL_R_RENEGOTIATION_ENCODING_ERR);

        *al=SSL_AD_ILLEGAL_PARAMETER;

        return 0;

        }
@@ -157,7 +157,7 @@ int ssl_parse_clienthello_renegotiate_ext(SSL *s, unsigned char *d, int len, 
    /* Consistency check */

    if((ilen+1) != len)

        {

        SSLerr(SSL_F_PARSE_SERVER_HELLO_RENEGOTIATE_EXT,SSL_R_RENEGOTIATION_ENCODING_ERR);

        SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT,SSL_R_RENEGOTIATION_ENCODING_ERR);

        *al=SSL_AD_ILLEGAL_PARAMETER;

        return 0;

        }
@@ -165,7 +165,7 @@ int ssl_parse_clienthello_renegotiate_ext(SSL *s, unsigned char *d, int len, 
    /* Check that the extension matches */

    if(ilen != s->s3->previous_client_finished_len)

        {

        SSLerr(SSL_F_PARSE_CLIENT_HELLO_RENEGOTIATE_EXT,SSL_R_RENEGOTIATION_MISMATCH);

        SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT,SSL_R_RENEGOTIATION_MISMATCH);

        *al=SSL_AD_ILLEGAL_PARAMETER;

        return 0;

        }
@@ -173,7 +173,7 @@ int ssl_parse_clienthello_renegotiate_ext(SSL *s, unsigned char *d, int len, 
    if(memcmp(d, s->s3->previous_client_finished,

	      s->s3->previous_client_finished_len))

        {

        SSLerr(SSL_F_PARSE_CLIENT_HELLO_RENEGOTIATE_EXT,SSL_R_RENEGOTIATION_MISMATCH);

        SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT,SSL_R_RENEGOTIATION_MISMATCH);

        *al=SSL_AD_ILLEGAL_PARAMETER;

        return 0;

        }
@@ -192,7 +192,7 @@ int ssl_add_serverhello_renegotiate_ext(SSL *s, unsigned char *p, int *len, 
        if((s->s3->previous_client_finished_len +

            s->s3->previous_server_finished_len + 1) > maxlen)

            {

            SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_RENEGOTIATE_EXT,SSL_R_RENEGOTIATE_EXT_TOO_LONG);

            SSLerr(SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT,SSL_R_RENEGOTIATE_EXT_TOO_LONG);

            return 0;

            }
@@ -230,7 +230,7 @@ int ssl_parse_serverhello_renegotiate_ext(SSL *s, unsigned char *d, int len, 
    /* Parse the length byte */

    if(len < 1)

        {

        SSLerr(SSL_F_PARSE_SERVER_HELLO_RENEGOTIATE_EXT,SSL_R_RENEGOTIATION_ENCODING_ERR);

        SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT,SSL_R_RENEGOTIATION_ENCODING_ERR);

        *al=SSL_AD_ILLEGAL_PARAMETER;

        return 0;

        }
@@ -240,7 +240,7 @@ int ssl_parse_serverhello_renegotiate_ext(SSL *s, unsigned char *d, int len, 
    /* Consistency check */

    if(ilen+1 != len)

        {

        SSLerr(SSL_F_PARSE_SERVER_HELLO_RENEGOTIATE_EXT,SSL_R_RENEGOTIATION_ENCODING_ERR);

        SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT,SSL_R_RENEGOTIATION_ENCODING_ERR);

        *al=SSL_AD_ILLEGAL_PARAMETER;

        return 0;

        }
@@ -248,7 +248,7 @@ int ssl_parse_serverhello_renegotiate_ext(SSL *s, unsigned char *d, int len, 
    /* Check that the extension matches */

    if(ilen != expected_len)

        {

        SSLerr(SSL_F_PARSE_SERVER_HELLO_RENEGOTIATE_EXT,SSL_R_RENEGOTIATION_MISMATCH);

        SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT,SSL_R_RENEGOTIATION_MISMATCH);

        *al=SSL_AD_ILLEGAL_PARAMETER;

        return 0;

        }
@@ -256,7 +256,7 @@ int ssl_parse_serverhello_renegotiate_ext(SSL *s, unsigned char *d, int len, 
    if(memcmp(d, s->s3->previous_client_finished,

	      s->s3->previous_client_finished_len))

        {

        SSLerr(SSL_F_PARSE_CLIENT_HELLO_RENEGOTIATE_EXT,SSL_R_RENEGOTIATION_MISMATCH);

        SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT,SSL_R_RENEGOTIATION_MISMATCH);

        *al=SSL_AD_ILLEGAL_PARAMETER;

        return 0;

        }
@@ -265,7 +265,7 @@ int ssl_parse_serverhello_renegotiate_ext(SSL *s, unsigned char *d, int len, 
    if(memcmp(d, s->s3->previous_server_finished,

	      s->s3->previous_server_finished_len))

        {

        SSLerr(SSL_F_PARSE_SERVER_HELLO_RENEGOTIATE_EXT,SSL_R_RENEGOTIATION_MISMATCH);

        SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT,SSL_R_RENEGOTIATION_MISMATCH);

        *al=SSL_AD_ILLEGAL_PARAMETER;

        return 0;

        }