Commit 544648a8 authored Sep 05, 2018 by Nicola Tuveri

Harmonize the error handling codepath



Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7121)

parent 0c5d725e

crypto/dh/dh_lib.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -83,12 +83,14 @@ DH DH_new_method(ENGINE engine)

		if ((ret->meth->init != NULL) && !ret->meth->init(ret)) {
		DHerr(DH_F_DH_NEW_METHOD, ERR_R_INIT_FAIL);
		err:
		DH_free(ret);
		ret = NULL;
		goto err;
		}

		return ret;

		err:
		DH_free(ret);
		return NULL;
		}

		void DH_free(DH *r)

crypto/dsa/dsa_lib.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -90,12 +90,14 @@ DSA DSA_new_method(ENGINE engine)

		if ((ret->meth->init != NULL) && !ret->meth->init(ret)) {
		DSAerr(DSA_F_DSA_NEW_METHOD, ERR_R_INIT_FAIL);
		err:
		DSA_free(ret);
		ret = NULL;
		goto err;
		}

		return ret;

		err:
		DSA_free(ret);
		return NULL;
		}

		void DSA_free(DSA *r)

crypto/ec/ec_kmeth.c

+1 −1

File changed.

Contains only whitespace changes.

crypto/rsa/rsa_lib.c

+1 −1

File changed.

Contains only whitespace changes.