diff options
author | Bodo Möller <bodo@openssl.org> | 2001-09-03 13:40:07 +0000 |
---|---|---|
committer | Bodo Möller <bodo@openssl.org> | 2001-09-03 13:40:07 +0000 |
commit | 6ac4e8bd6ecff6d11ff3cd08e88356e7a2239329 (patch) | |
tree | 1514825fe21c96f6c0d471402059f549eadec7ee /crypto | |
parent | 983495c4b215b7418dc3470fa8bc9c919c09c683 (diff) | |
download | openssl-6ac4e8bd6ecff6d11ff3cd08e88356e7a2239329.tar.gz |
Rename recently introduced functions for improved code clarity:
[DR]SA_up => [DR]SA_up_ref
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/dsa/dsa.h | 2 | ||||
-rw-r--r-- | crypto/dsa/dsa_lib.c | 4 | ||||
-rw-r--r-- | crypto/evp/p_lib.c | 8 | ||||
-rw-r--r-- | crypto/rsa/rsa.h | 2 | ||||
-rw-r--r-- | crypto/rsa/rsa_lib.c | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/crypto/dsa/dsa.h b/crypto/dsa/dsa.h index 7fc8fd303b..e12cee0b75 100644 --- a/crypto/dsa/dsa.h +++ b/crypto/dsa/dsa.h @@ -179,7 +179,7 @@ DSA * DSA_new_method(struct engine_st *engine); #endif void DSA_free (DSA *r); /* "up" the DSA object's reference count */ -int DSA_up(DSA *r); +int DSA_up_ref(DSA *r); int DSA_size(const DSA *); /* next 4 return -1 on error */ int DSA_sign_setup( DSA *dsa,BN_CTX *ctx_in,BIGNUM **kinvp,BIGNUM **rp); diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c index bae39c20d4..365145a96b 100644 --- a/crypto/dsa/dsa_lib.c +++ b/crypto/dsa/dsa_lib.c @@ -226,7 +226,7 @@ void DSA_free(DSA *r) OPENSSL_free(r); } -int DSA_up(DSA *r) +int DSA_up_ref(DSA *r) { int i = CRYPTO_add(&r->references, 1, CRYPTO_LOCK_DSA); #ifdef REF_PRINT @@ -235,7 +235,7 @@ int DSA_up(DSA *r) #ifdef REF_CHECK if (i < 2) { - fprintf(stderr, "DSA_up, bad reference count\n"); + fprintf(stderr, "DSA_up_ref, bad reference count\n"); abort(); } #endif diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c index 86178f1db3..04f75a5a24 100644 --- a/crypto/evp/p_lib.c +++ b/crypto/evp/p_lib.c @@ -211,7 +211,7 @@ int EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key) { int ret = EVP_PKEY_assign_RSA(pkey, key); if(ret) - RSA_up(key); + RSA_up_ref(key); return ret; } @@ -221,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; } - RSA_up(pkey->pkey.rsa); + RSA_up_ref(pkey->pkey.rsa); return pkey->pkey.rsa; } #endif @@ -231,7 +231,7 @@ int EVP_PKEY_set1_DSA(EVP_PKEY *pkey, DSA *key) { int ret = EVP_PKEY_assign_DSA(pkey, key); if(ret) - DSA_up(key); + DSA_up_ref(key); return ret; } @@ -241,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; } - DSA_up(pkey->pkey.dsa); + DSA_up_ref(pkey->pkey.dsa); return pkey->pkey.dsa; } #endif diff --git a/crypto/rsa/rsa.h b/crypto/rsa/rsa.h index 9116a6e567..993b539b7a 100644 --- a/crypto/rsa/rsa.h +++ b/crypto/rsa/rsa.h @@ -200,7 +200,7 @@ int RSA_private_decrypt(int flen, const unsigned char *from, unsigned char *to, RSA *rsa,int padding); void RSA_free (RSA *r); /* "up" the RSA object's reference count */ -int RSA_up(RSA *r); +int RSA_up_ref(RSA *r); int RSA_flags(const RSA *r); diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c index e3368c1ee5..ef9f924ab4 100644 --- a/crypto/rsa/rsa_lib.c +++ b/crypto/rsa/rsa_lib.c @@ -246,7 +246,7 @@ void RSA_free(RSA *r) OPENSSL_free(r); } -int RSA_up(RSA *r) +int RSA_up_ref(RSA *r) { int i = CRYPTO_add(&r->references, 1, CRYPTO_LOCK_RSA); #ifdef REF_PRINT @@ -255,7 +255,7 @@ int RSA_up(RSA *r) #ifdef REF_CHECK if (i < 2) { - fprintf(stderr, "RSA_up, bad reference count\n"); + fprintf(stderr, "RSA_up_ref, bad reference count\n"); abort(); } #endif |