diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-11-09 18:21:57 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-11-09 18:21:57 +0000 |
| commit | af13c50d514e4d8c315f4342289644cc6dd77abf (patch) | |
| tree | d305d388fc656dde60bef44f7c9d62862325f209 /ssl/t1_reneg.c | |
| parent | 65c2397fcebb31ef528e1bb3fbeb7f56fed16b40 (diff) | |
Fix wrong function codes and duplicate codes
Diffstat (limited to 'ssl/t1_reneg.c')
| -rw-r--r-- | ssl/t1_reneg.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ssl/t1_reneg.c b/ssl/t1_reneg.c index b8ba80219a..5222094f28 100644 --- a/ssl/t1_reneg.c +++ b/ssl/t1_reneg.c @@ -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; } |