diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2013-02-04 21:13:18 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2013-02-05 16:46:19 +0000 |
| commit | 25590043d1c9094c26bdf1d0350fbd75bdc23a2c (patch) | |
| tree | 7d98297004dcc29c5a7677fadad936f2c380028a | |
| parent | 8a5d624d5b76c0c3cfdcf4f7fa35c22af7ccbbaa (diff) | |
Fix error codes.
(cherry picked from commit 35d732fc2e1badce13be22a044187ebd4d769552)
| -rw-r--r-- | ssl/d1_pkt.c | 2 | ||||
| -rw-r--r-- | ssl/s3_pkt.c | 2 | ||||
| -rw-r--r-- | ssl/ssl.h | 1 | ||||
| -rw-r--r-- | ssl/ssl_err.c | 1 | ||||
| -rw-r--r-- | ssl/ssl_lib.c | 2 |
5 files changed, 5 insertions, 3 deletions
diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c index cbbf1d413c..3c81786154 100644 --- a/ssl/d1_pkt.c +++ b/ssl/d1_pkt.c @@ -445,7 +445,7 @@ printf("\n"); rr->orig_len < mac_size+1)) { al=SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_LENGTH_TOO_SHORT); + SSLerr(SSL_F_DTLS1_PROCESS_RECORD,SSL_R_LENGTH_TOO_SHORT); goto f_err; } diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c index 4730c6b894..7d8fc53ff4 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c @@ -407,7 +407,7 @@ fprintf(stderr, "Record type=%d, Length=%d\n", rr->type, rr->length); if (enc_err == 0) { al=SSL_AD_DECRYPTION_FAILED; - SSLerr(SSL_F_TLS1_ENC,SSL_R_BLOCK_CIPHER_PAD_IS_WRONG); + SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_BLOCK_CIPHER_PAD_IS_WRONG); goto f_err; } @@ -1968,6 +1968,7 @@ void ERR_load_SSL_strings(void); #define SSL_F_SSL_GET_NEW_SESSION 181 #define SSL_F_SSL_GET_PREV_SESSION 217 #define SSL_F_SSL_GET_SERVER_SEND_CERT 182 +#define SSL_F_SSL_GET_SERVER_SEND_PKEY 317 #define SSL_F_SSL_GET_SIGN_PKEY 183 #define SSL_F_SSL_INIT_WBIO_BUFFER 184 #define SSL_F_SSL_LOAD_CLIENT_CA_FILE 185 diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c index 3f79c74ad6..32d9af1fcb 100644 --- a/ssl/ssl_err.c +++ b/ssl/ssl_err.c @@ -223,6 +223,7 @@ static ERR_STRING_DATA SSL_str_functs[]= {ERR_FUNC(SSL_F_SSL_GET_NEW_SESSION), "SSL_GET_NEW_SESSION"}, {ERR_FUNC(SSL_F_SSL_GET_PREV_SESSION), "SSL_GET_PREV_SESSION"}, {ERR_FUNC(SSL_F_SSL_GET_SERVER_SEND_CERT), "SSL_GET_SERVER_SEND_CERT"}, +{ERR_FUNC(SSL_F_SSL_GET_SERVER_SEND_PKEY), "SSL_GET_SERVER_SEND_PKEY"}, {ERR_FUNC(SSL_F_SSL_GET_SIGN_PKEY), "SSL_GET_SIGN_PKEY"}, {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"}, diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index f7ed6e3426..25573e43e2 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -2162,7 +2162,7 @@ CERT_PKEY *ssl_get_server_send_pkey(const SSL *s) i=SSL_PKEY_GOST01; else /* if (alg_a & SSL_aNULL) */ { - SSLerr(SSL_F_SSL_GET_SERVER_SEND_CERT,ERR_R_INTERNAL_ERROR); + SSLerr(SSL_F_SSL_GET_SERVER_SEND_PKEY,ERR_R_INTERNAL_ERROR); return(NULL); } |