generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use correct function names in SSLerr macros.

Browse Source
This commit is contained in:
Bodo Möller 2000-03-14 14:10:56 +00:00
parent 24aaff588a
commit 448e2f9ba7
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ssl/s3_lib.c
View File

@ -852,7 +852,7 @@ long ssl3_callback_ctrl(SSL *s, int cmd, void (*fp)())
{ {
if (!ssl_cert_inst(&s->cert)) 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); return(0);
} }
} }

1
ssl/ssl.h
View File

@ -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_SET_CERTIFICATE 126
#define SSL_F_SSL2_WRITE 127 #define SSL_F_SSL2_WRITE 127
#define SSL_F_SSL3_ACCEPT 128 #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_CHANGE_CIPHER_STATE 129
#define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM 130 #define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM 130
#define SSL_F_SSL3_CLIENT_HELLO 131 #define SSL_F_SSL3_CLIENT_HELLO 131

6
ssl/ssl_cert.c
View File

@ -195,7 +195,7 @@ CERT *ssl_cert_dup(CERT *cert)
ret->dh_tmp = DHparams_dup(cert->dh_tmp); ret->dh_tmp = DHparams_dup(cert->dh_tmp);
if (ret->dh_tmp == NULL) 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; goto err;
} }
if (cert->dh_tmp->priv_key) 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); BIGNUM *b = BN_dup(cert->dh_tmp->priv_key);
if (!b) if (!b)
{ {
SSLerr(SSL_F_SSL_CERT_NEW, ERR_R_BN_LIB); SSLerr(SSL_F_SSL_CERT_DUP, ERR_R_BN_LIB);
goto err; goto err;
} }
ret->dh_tmp->priv_key = b; 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); BIGNUM *b = BN_dup(cert->dh_tmp->pub_key);
if (!b) if (!b)
{ {
SSLerr(SSL_F_SSL_CERT_NEW, ERR_R_BN_LIB); SSLerr(SSL_F_SSL_CERT_DUP, ERR_R_BN_LIB);
goto err; goto err;
} }
ret->dh_tmp->pub_key = b; ret->dh_tmp->pub_key = b;

1
ssl/ssl_err.c
View File

@ -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_SET_CERTIFICATE,0), "SSL2_SET_CERTIFICATE"},
{ERR_PACK(0,SSL_F_SSL2_WRITE,0), "SSL2_WRITE"}, {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_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_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_CHECK_CERT_AND_ALGORITHM,0), "SSL3_CHECK_CERT_AND_ALGORITHM"},
{ERR_PACK(0,SSL_F_SSL3_CLIENT_HELLO,0), "SSL3_CLIENT_HELLO"}, {ERR_PACK(0,SSL_F_SSL3_CLIENT_HELLO,0), "SSL3_CLIENT_HELLO"},