From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 4 Feb 2013 21:13:18 +0000 (+0000)
Subject: Fix error codes.
X-Git-Tag: OpenSSL_0_9_8y~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ca3b81c8580a609edac1f13a3f62d4348d66c3a8;p=oweals%2Fopenssl.git

Fix error codes.
(cherry picked from commit 35d732fc2e1badce13be22a044187ebd4d769552)
---

diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index 72c5d9d294..3f0f983698 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -405,7 +405,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 9f5abd516d..6d0a2ee0ca 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -361,7 +361,7 @@ again:
 	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;
 		}
 
diff --git a/ssl/ssl.h b/ssl/ssl.h
index eb50e14efd..d6bbc449dd 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -1820,6 +1820,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 20895ee903..60e7e9d16c 100644
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -218,6 +218,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 5980b852e0..8b6b601cab 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1993,7 +1993,7 @@ CERT_PKEY *ssl_get_server_send_pkey(const SSL *s)
 		}
 	else /* if (kalg & 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);
 		}