QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-14 10:29:42 +00:00
Code Issues Projects Releases Wiki Activity

a ssl object needs it's own instance of a ecdh key; remove obsolete comment

Browse Source
This commit is contained in:
Nils Larsch 2005-08-08 20:02:18 +00:00
parent 01a9792f05
commit eba63ef58b
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ssl/s3_lib.c
View File

@ -1797,12 +1797,12 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
SSLerr(SSL_F_SSL3_CTX_CTRL,ERR_R_ECDH_LIB); SSLerr(SSL_F_SSL3_CTX_CTRL,ERR_R_ECDH_LIB);
return 0; return 0;
} }
if (!EC_KEY_up_ref((EC_KEY *)parg)) ecdh = EC_KEY_dup((EC_KEY *)parg);
if (ecdh == NULL)
{ {
SSLerr(SSL_F_SSL3_CTX_CTRL,ERR_R_ECDH_LIB); SSLerr(SSL_F_SSL3_CTX_CTRL,ERR_R_EC_LIB);
return 0; return 0;
} }
ecdh = (EC_KEY *)parg;
if (!(ctx->options & SSL_OP_SINGLE_ECDH_USE)) if (!(ctx->options & SSL_OP_SINGLE_ECDH_USE))
{ {
if (!EC_KEY_generate_key(ecdh)) if (!EC_KEY_generate_key(ecdh))

9
ssl/ssl_cert.c
View File

@ -200,7 +200,6 @@ CERT *ssl_cert_dup(CERT *cert)
#ifndef OPENSSL_NO_DH #ifndef OPENSSL_NO_DH
if (cert->dh_tmp != NULL) if (cert->dh_tmp != NULL)
{ {
/* DH parameters don't have a reference count */
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)
{ {
@ -234,8 +233,12 @@ CERT *ssl_cert_dup(CERT *cert)
#ifndef OPENSSL_NO_ECDH #ifndef OPENSSL_NO_ECDH
if (cert->ecdh_tmp) if (cert->ecdh_tmp)
{ {
EC_KEY_up_ref(cert->ecdh_tmp); ret->ecdh_tmp = EC_KEY_dup(cert->ecdh_tmp);
ret->ecdh_tmp = cert->ecdh_tmp; if (ret->ecdh_tmp == NULL)
{
SSLerr(SSL_F_SSL_CERT_DUP, ERR_R_EC_LIB);
goto err;
}
} }
ret->ecdh_tmp_cb = cert->ecdh_tmp_cb; ret->ecdh_tmp_cb = cert->ecdh_tmp_cb;
#endif #endif