Commit 6ac4e8bd authored by Bodo Möller's avatar Bodo Möller
Browse files

Rename recently introduced functions for improved code clarity: 

      [DR]SA_up  =>  [DR]SA_up_ref
parent 983495c4

crypto/dsa/dsa.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

crypto/dsa/dsa_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -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

crypto/evp/p_lib.c

+4 −4
Original line number Diff line number Diff line
@@ -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

crypto/rsa/rsa.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

crypto/rsa/rsa_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -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