From 448e2f9ba7dc045314b186b859b441a1a0a3b55f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bodo=20M=C3=B6ller?= <bodo@openssl.org>
Date: Tue, 14 Mar 2000 14:10:56 +0000
Subject: [PATCH] Use correct function names in SSLerr macros.

---
 ssl/s3_lib.c   | 2 +-
 ssl/ssl.h      | 1 +
 ssl/ssl_cert.c | 6 +++---
 ssl/ssl_err.c  | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 892ff753f..7ada26cbb 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -852,7 +852,7 @@ long ssl3_callback_ctrl(SSL *s, int cmd, void (*fp)())
 		{
 		if (!ssl_cert_inst(&s->cert))
 			{
-			SSLerr(SSL_F_SSL3_CTRL, ERR_R_MALLOC_FAILURE);
+			SSLerr(SSL_F_SSL3_CALLBACK_CTRL, ERR_R_MALLOC_FAILURE);
 			return(0);
 			}
 		}
diff --git a/ssl/ssl.h b/ssl/ssl.h
index fd4e08e02..bb846f491 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -1214,6 +1214,7 @@ int SSL_COMP_add_compression_method(int id,char *cm);
 #define SSL_F_SSL2_SET_CERTIFICATE			 126
 #define SSL_F_SSL2_WRITE				 127
 #define SSL_F_SSL3_ACCEPT				 128
+#define SSL_F_SSL3_CALLBACK_CTRL			 233
 #define SSL_F_SSL3_CHANGE_CIPHER_STATE			 129
 #define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM		 130
 #define SSL_F_SSL3_CLIENT_HELLO				 131
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index a054e0aa4..0596b7c5b 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -195,7 +195,7 @@ CERT *ssl_cert_dup(CERT *cert)
 		ret->dh_tmp = DHparams_dup(cert->dh_tmp);
 		if (ret->dh_tmp == NULL)
 			{
-			SSLerr(SSL_F_SSL_CERT_NEW, ERR_R_DH_LIB);
+			SSLerr(SSL_F_SSL_CERT_DUP, ERR_R_DH_LIB);
 			goto err;
 			}
 		if (cert->dh_tmp->priv_key)
@@ -203,7 +203,7 @@ CERT *ssl_cert_dup(CERT *cert)
 			BIGNUM *b = BN_dup(cert->dh_tmp->priv_key);
 			if (!b)
 				{
-				SSLerr(SSL_F_SSL_CERT_NEW, ERR_R_BN_LIB);
+				SSLerr(SSL_F_SSL_CERT_DUP, ERR_R_BN_LIB);
 				goto err;
 				}
 			ret->dh_tmp->priv_key = b;
@@ -213,7 +213,7 @@ CERT *ssl_cert_dup(CERT *cert)
 			BIGNUM *b = BN_dup(cert->dh_tmp->pub_key);
 			if (!b)
 				{
-				SSLerr(SSL_F_SSL_CERT_NEW, ERR_R_BN_LIB);
+				SSLerr(SSL_F_SSL_CERT_DUP, ERR_R_BN_LIB);
 				goto err;
 				}
 			ret->dh_tmp->pub_key = b;
diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index 1ffee8752..642c3f93e 100644
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -95,6 +95,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
 {ERR_PACK(0,SSL_F_SSL2_SET_CERTIFICATE,0),	"SSL2_SET_CERTIFICATE"},
 {ERR_PACK(0,SSL_F_SSL2_WRITE,0),	"SSL2_WRITE"},
 {ERR_PACK(0,SSL_F_SSL3_ACCEPT,0),	"SSL3_ACCEPT"},
+{ERR_PACK(0,SSL_F_SSL3_CALLBACK_CTRL,0),	"SSL3_CALLBACK_CTRL"},
 {ERR_PACK(0,SSL_F_SSL3_CHANGE_CIPHER_STATE,0),	"SSL3_CHANGE_CIPHER_STATE"},
 {ERR_PACK(0,SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,0),	"SSL3_CHECK_CERT_AND_ALGORITHM"},
 {ERR_PACK(0,SSL_F_SSL3_CLIENT_HELLO,0),	"SSL3_CLIENT_HELLO"},