Tree - rpms/openssl - src.fedoraproject.org

Blob History Raw

		729d2d0	`diff -up openssl-1.0.1k/crypto/ec/ec_asn1.c.use-after-free openssl-1.0.1k/crypto/ec/ec_asn1.c`
		729d2d0	`--- openssl-1.0.1k/crypto/ec/ec_asn1.c.use-after-free 2014-10-15 15:49:54.000000000 +0200`
		729d2d0	`+++ openssl-1.0.1k/crypto/ec/ec_asn1.c 2015-03-19 17:28:03.349627040 +0100`
		729d2d0	`@@ -1142,8 +1142,6 @@ EC_KEY d2i_ECPrivateKey(EC_KEY *a, con`
		729d2d0	`ERR_R_MALLOC_FAILURE);`
		729d2d0	`goto err;`
		729d2d0	`}`
		729d2d0	`- if (a)`
		729d2d0	`- *a = ret;`
		729d2d0	`}`
		729d2d0	`else`
		729d2d0	`ret = *a;`
		729d2d0	`@@ -1225,11 +1223,13 @@ EC_KEY d2i_ECPrivateKey(EC_KEY *a, con`
		729d2d0	`ret->enc_flag \|= EC_PKEY_NO_PUBKEY;`
		729d2d0	`}`
		729d2d0
		729d2d0	`+ if (a)`
		729d2d0	`+ *a = ret;`
		729d2d0	`ok = 1;`
		729d2d0	`err:`
		729d2d0	`if (!ok)`
		729d2d0	`{`
		729d2d0	`- if (ret)`
		729d2d0	`+ if (ret && (a == NULL \|\| *a != ret))`
		729d2d0	`EC_KEY_free(ret);`
		729d2d0	`ret = NULL;`
		729d2d0	`}`