Commit 33af4421 authored by Nils Larsch's avatar Nils Larsch
Browse files

remove unnecessary code

parent 95e362c6

crypto/dsa/dsa_ossl.c

+0 −1
Original line number Diff line number Diff line
@@ -285,7 +285,6 @@ err: 
			BN_clear_free(r);

		}

	if (ctx_in == NULL) BN_CTX_free(ctx);

	if (kinv != NULL) BN_clear_free(kinv);

	BN_clear_free(&k);

	BN_clear_free(&kq);

	return(ret);

crypto/evp/evp_pkey.c

+1 −5
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ EVP_PKEY *EVP_PKCS82PKEY(PKCS8_PRIV_KEY_INFO *p8) 
				goto ecerr;

			}

			priv_key = EC_KEY_get0_private_key(eckey);

			if (!EC_POINT_mul(group, pub_key, priv_key, NULL, NULL, ctx))

			if (!EC_POINT_mul(group, pub_key, priv_key, NULL, NULL, NULL))

			{

				EC_POINT_free(pub_key);

				EVPerr(EVP_F_EVP_PKCS82PKEY, ERR_R_EC_LIB);
@@ -321,12 +321,8 @@ EVP_PKEY *EVP_PKCS82PKEY(PKCS8_PRIV_KEY_INFO *p8) 
		}



		EVP_PKEY_assign_EC_KEY(pkey, eckey);

		if (ctx)

			BN_CTX_free(ctx);

		break;

ecerr:

		if (ctx)

			BN_CTX_free(ctx);

		if (eckey)

			EC_KEY_free(eckey);

		if (pkey)

engines/e_4758cca.c

+0 −4
Original line number Diff line number Diff line
@@ -482,8 +482,6 @@ static EVP_PKEY *ibm_4758_load_privkey(ENGINE* e, const char* key_id, 
err:

	if (keyToken)

		OPENSSL_free(keyToken);

	if (rtmp)

		RSA_free(rtmp);

	return NULL;

	}
@@ -558,8 +556,6 @@ static EVP_PKEY *ibm_4758_load_pubkey(ENGINE* e, const char* key_id, 
err:

	if (keyToken)

		OPENSSL_free(keyToken);

	if (rtmp)

		RSA_free(rtmp);

	return NULL;

	}

engines/e_chil.c

+0 −2
Original line number Diff line number Diff line
@@ -852,8 +852,6 @@ static EVP_PKEY *hwcrhk_load_privkey(ENGINE *eng, const char *key_id, 


	return res;

 err:

	if (res)

		EVP_PKEY_free(res);

#ifndef OPENSSL_NO_RSA

	if (rtmp)

		RSA_free(rtmp);

engines/e_sureware.c

+0 −2
Original line number Diff line number Diff line
@@ -758,8 +758,6 @@ static EVP_PKEY* sureware_load_public(ENGINE *e,const char *key_id,char *hptr,un 
	}

	return res;

 err:

	if (res)

		EVP_PKEY_free(res);

#ifndef OPENSSL_NO_RSA

	if (rsatmp)

		RSA_free(rsatmp);