diff options
| author | Bodo Möller <bodo@openssl.org> | 2000-03-14 14:10:56 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2000-03-14 14:10:56 +0000 |
| commit | 448e2f9ba7dc045314b186b859b441a1a0a3b55f (patch) | |
| tree | 6b053a1196583710ef99a29b0aca7b34b9eb189c /ssl | |
| parent | 24aaff588a5c72128aa30dedf12d6938586ddaf2 (diff) | |
Use correct function names in SSLerr macros.
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s3_lib.c | 2 | ||||
| -rw-r--r-- | ssl/ssl.h | 1 | ||||
| -rw-r--r-- | ssl/ssl_cert.c | 6 | ||||
| -rw-r--r-- | 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 892ff753fc..7ada26cbb6 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); } } @@ -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 a054e0aa44..0596b7c5b8 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 1ffee87522..642c3f93e7 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"}, |