projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change DH_up() -> DH_up_ref()
[openssl.git]
/
crypto
/
evp
/
p_lib.c
diff --git
a/crypto/evp/p_lib.c
b/crypto/evp/p_lib.c
index 53780726f3666e2c68f8122b026be01063c2dbba..215b94292aae4428aeb3cda5a97c7aaa59aecf1a 100644
(file)
--- a/
crypto/evp/p_lib.c
+++ b/
crypto/evp/p_lib.c
@@
-81,6
+81,8
@@
int EVP_PKEY_bits(EVP_PKEY *pkey)
int EVP_PKEY_size(EVP_PKEY *pkey)
{
int EVP_PKEY_size(EVP_PKEY *pkey)
{
+ if (pkey == NULL)
+ return(0);
#ifndef OPENSSL_NO_RSA
if (pkey->type == EVP_PKEY_RSA)
return(RSA_size(pkey->pkey.rsa));
#ifndef OPENSSL_NO_RSA
if (pkey->type == EVP_PKEY_RSA)
return(RSA_size(pkey->pkey.rsa));
@@
-208,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);
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_ref(key);
return ret;
}
return ret;
}
@@
-218,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;
}
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_ref(pkey->pkey.rsa
);
return pkey->pkey.rsa;
}
#endif
return pkey->pkey.rsa;
}
#endif
@@
-227,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);
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_ref(key);
return ret;
}
return ret;
}
@@
-237,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;
}
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_ref(pkey->pkey.dsa
);
return pkey->pkey.dsa;
}
#endif
return pkey->pkey.dsa;
}
#endif
@@
-247,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);
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_ref(key);
return ret;
}
return ret;
}
@@
-257,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;
}
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_ref(pkey->pkey.dh
);
return pkey->pkey.dh;
}
#endif
return pkey->pkey.dh;
}
#endif