Use correct function names in SSLerr macros.

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 892ff753fcddd0f13d550a7b5b3c8f2ea3067569..7ada26cbb693b3a8f5807f06d5e27d3795689fb4 100644 (file)
--- 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 fd4e08e02234d2dfa9a668d56a497965d1848621..bb846f491c46e2cd1d72ce2a6649cdb7dd89fe40 100644 (file)
--- 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 a054e0aa44643221f123e106424722cb2f6ba8ab..0596b7c5b8652ca7e8dd87af8520c53657e66abd 100644 (file)
--- 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 1ffee87522e553a857fadbe957cdc15827fbd2fd..642c3f93e7bcb9e9f38ff780b428fe95166a5854 100644 (file)
--- 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"},