wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changes crypto/evp/ and ssl/ code from directly incrementing reference

Browse source 
counts in DH, DSA, and RSA structures. Instead they use the new "***_up()"
functions that handle this.
This commit is contained in:
Geoff Thorpe 2001-08-25 17:28:23 +00:00
parent 5cbc2e8bc1
commit 78435364ec
4 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
crypto/evp/p_lib.c
View file

@ -210,7 +210,8 @@ int EVP_PKEY_assign(EVP_PKEY *pkey, int type, char *key)
int EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key)
{
int ret = EVP_PKEY_assign_RSA(pkey, key);
if(ret) CRYPTO_add(&key->references, 1, CRYPTO_LOCK_RSA);
if(ret)
RSA_up(key);
return ret;
}
@ -220,7 +221,7 @@ RSA *EVP_PKEY_get1_RSA(EVP_PKEY *pkey)
EVPerr(EVP_F_EVP_PKEY_GET1_RSA, EVP_R_EXPECTING_AN_RSA_KEY);
return NULL;
}
CRYPTO_add(&pkey->pkey.rsa->references, 1, CRYPTO_LOCK_RSA);
RSA_up(pkey->pkey.rsa);
return pkey->pkey.rsa;
}
#endif
@ -229,7 +230,8 @@ RSA *EVP_PKEY_get1_RSA(EVP_PKEY *pkey)
int EVP_PKEY_set1_DSA(EVP_PKEY *pkey, DSA *key)
{
int ret = EVP_PKEY_assign_DSA(pkey, key);
if(ret) CRYPTO_add(&key->references, 1, CRYPTO_LOCK_DSA);
if(ret)
DSA_up(key);
return ret;
}
@ -239,7 +241,7 @@ DSA *EVP_PKEY_get1_DSA(EVP_PKEY *pkey)
EVPerr(EVP_F_EVP_PKEY_GET1_DSA, EVP_R_EXPECTING_A_DSA_KEY);
return NULL;
}
CRYPTO_add(&pkey->pkey.dsa->references, 1, CRYPTO_LOCK_DSA);
DSA_up(pkey->pkey.dsa);
return pkey->pkey.dsa;
}
#endif
@ -249,7 +251,8 @@ DSA *EVP_PKEY_get1_DSA(EVP_PKEY *pkey)
int EVP_PKEY_set1_DH(EVP_PKEY *pkey, DH *key)
{
int ret = EVP_PKEY_assign_DH(pkey, key);
if(ret) CRYPTO_add(&key->references, 1, CRYPTO_LOCK_DH);
if(ret)
DH_up(key);
return ret;
}
@ -259,7 +262,7 @@ DH *EVP_PKEY_get1_DH(EVP_PKEY *pkey)
EVPerr(EVP_F_EVP_PKEY_GET1_DH, EVP_R_EXPECTING_A_DH_KEY);
return NULL;
}
CRYPTO_add(&pkey->pkey.dh->references, 1, CRYPTO_LOCK_DH);
DH_up(pkey->pkey.dh);
return pkey->pkey.dh;
}
#endif

2
ssl/s3_srvr.c
View file

@ -982,7 +982,7 @@ static int ssl3_send_server_key_exchange(SSL *s)
SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_ERROR_GENERATING_TMP_RSA_KEY);
goto f_err;
}
CRYPTO_add(&rsa->references,1,CRYPTO_LOCK_RSA);
RSA_up(rsa);
cert->rsa_tmp=rsa;
}
if (rsa == NULL)

2
ssl/ssl_cert.c
View file

@ -190,8 +190,8 @@ CERT *ssl_cert_dup(CERT *cert)
#ifndef OPENSSL_NO_RSA
if (cert->rsa_tmp != NULL)
{
RSA_up(cert->rsa_tmp);
ret->rsa_tmp = cert->rsa_tmp;
CRYPTO_add(&ret->rsa_tmp->references, 1, CRYPTO_LOCK_RSA);
}
ret->rsa_tmp_cb = cert->rsa_tmp_cb;
#endif

4
ssl/ssl_rsa.c
View file

@ -170,7 +170,7 @@ int SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa)
return(0);
}
CRYPTO_add(&rsa->references,1,CRYPTO_LOCK_RSA);
RSA_up(rsa);
EVP_PKEY_assign_RSA(pkey,rsa);
ret=ssl_set_pkey(ssl->cert,pkey);
@ -582,7 +582,7 @@ int SSL_CTX_use_RSAPrivateKey(SSL_CTX *ctx, RSA *rsa)
return(0);
}
CRYPTO_add(&rsa->references,1,CRYPTO_LOCK_RSA);
RSA_up(rsa);
EVP_PKEY_assign_RSA(pkey,rsa);
ret=ssl_set_pkey(ctx->cert, pkey);