Rename recently introduced functions for improved code clarity:
[DR]SA_up => [DR]SA_up_ref
diff --git a/crypto/dsa/dsa.h b/crypto/dsa/dsa.h
index 7fc8fd3..e12cee0 100644
--- a/crypto/dsa/dsa.h
+++ b/crypto/dsa/dsa.h
@@ -179,7 +179,7 @@
#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 bae39c2..365145a 100644
--- a/crypto/dsa/dsa_lib.c
+++ b/crypto/dsa/dsa_lib.c
@@ -226,7 +226,7 @@
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 @@
#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 86178f1..04f75a5 100644
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -211,7 +211,7 @@
{
int ret = EVP_PKEY_assign_RSA(pkey, key);
if(ret)
- RSA_up(key);
+ RSA_up_ref(key);
return ret;
}
@@ -221,7 +221,7 @@
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 ret = EVP_PKEY_assign_DSA(pkey, key);
if(ret)
- DSA_up(key);
+ DSA_up_ref(key);
return ret;
}
@@ -241,7 +241,7 @@
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 9116a6e..993b539 100644
--- a/crypto/rsa/rsa.h
+++ b/crypto/rsa/rsa.h
@@ -200,7 +200,7 @@
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 e3368c1..ef9f924 100644
--- a/crypto/rsa/rsa_lib.c
+++ b/crypto/rsa/rsa_lib.c
@@ -246,7 +246,7 @@
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 @@
#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