upstream/oracle/userland-gate: components/openssl/openssl-1.0.1/patches/36_evp

3217 6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	1	Patch developed in-house. Solaris-specific; not suitable for upstream.
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	2
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	3	--- openssl-1.0.1f/crypto/evp/evp_enc.c.orig Mon Feb 11 07:26:04 2013
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	4	+++ openssl-1.0.1f/crypto/evp/evp_enc.c Mon Feb 3 16:40:48 2014
3402 110b254c69b8 19823263 Upgrade OpenSSL to 1.0.1j Ronald Jordan <ron.jordan@oracle.com> parents: 3217 diff changeset	5	@@ -394,10 +394,14 @@
3217 6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	6	{
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	7	ret = M_do_cipher(ctx, out, NULL, 0);
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	8	if (ret < 0)
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	9	- return 0;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	10	+ {
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	11	+ ret = 0;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	12	+ goto cleanup;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	13	+ }
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	14	else
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	15	*outl = ret;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	16	- return 1;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	17	+ ret = 1;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	18	+ goto cleanup;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	19	}
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	20
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	21	b=ctx->cipher->block_size;
3402 110b254c69b8 19823263 Upgrade OpenSSL to 1.0.1j Ronald Jordan <ron.jordan@oracle.com> parents: 3217 diff changeset	22	@@ -405,7 +409,8 @@
3217 6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	23	if (b == 1)
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	24	{
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	25	*outl=0;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	26	- return 1;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	27	+ ret = 1;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	28	+ goto cleanup;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	29	}
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	30	bl=ctx->buf_len;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	31	if (ctx->flags & EVP_CIPH_NO_PADDING)
3402 110b254c69b8 19823263 Upgrade OpenSSL to 1.0.1j Ronald Jordan <ron.jordan@oracle.com> parents: 3217 diff changeset	32	@@ -413,10 +418,12 @@
3217 6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	33	if(bl)
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	34	{
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	35	EVPerr(EVP_F_EVP_ENCRYPTFINAL_EX,EVP_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH);
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	36	- return 0;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	37	+ ret = 0;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	38	+ goto cleanup;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	39	}
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	40	*outl = 0;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	41	- return 1;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	42	+ ret = 1;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	43	+ goto cleanup;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	44	}
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	45
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	46	n=b-bl;
3402 110b254c69b8 19823263 Upgrade OpenSSL to 1.0.1j Ronald Jordan <ron.jordan@oracle.com> parents: 3217 diff changeset	47	@@ -428,6 +435,12 @@
3217 6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	48	if(ret)
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	49	*outl=b;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	50
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	51	+cleanup:
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	52	+ if (ctx->cipher->cleanup)
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	53	+ {
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	54	+ ctx->cipher->cleanup(ctx);
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	55	+ }
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	56	+
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	57	return ret;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	58	}
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	59
3709 4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	60	@@ -501,6 +501,7 @@
3217 6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	61	int EVP_DecryptFinal_ex(EVP_CIPHER_CTX ctx, unsigned char out, int *outl)
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	62	{
3709 4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	63	int i,n;
3402 110b254c69b8 19823263 Upgrade OpenSSL to 1.0.1j Ronald Jordan <ron.jordan@oracle.com> parents: 3217 diff changeset	64	+ int err = 1;
3709 4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	65	unsigned int b;
3217 6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	66	*outl=0;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	67
3709 4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	68	@@ -508,10 +509,14 @@
3217 6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	69	{
3709 4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	70	i = M_do_cipher(ctx, out, NULL, 0);
4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	71	if (i < 0)
3217 6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	72	- return 0;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	73	+ {
3402 110b254c69b8 19823263 Upgrade OpenSSL to 1.0.1j Ronald Jordan <ron.jordan@oracle.com> parents: 3217 diff changeset	74	+ err = 0;
3217 6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	75	+ goto cleanup;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	76	+ }
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	77	else
3709 4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	78	*outl = i;
3217 6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	79	- return 1;
3402 110b254c69b8 19823263 Upgrade OpenSSL to 1.0.1j Ronald Jordan <ron.jordan@oracle.com> parents: 3217 diff changeset	80	+ err = 1;
3217 6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	81	+ goto cleanup;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	82	}
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	83
3709 4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	84	b=ctx->cipher->block_size;
4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	85	@@ -520,10 +525,12 @@
3217 6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	86	if(ctx->buf_len)
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	87	{
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	88	EVPerr(EVP_F_EVP_DECRYPTFINAL_EX,EVP_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH);
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	89	- return 0;
3402 110b254c69b8 19823263 Upgrade OpenSSL to 1.0.1j Ronald Jordan <ron.jordan@oracle.com> parents: 3217 diff changeset	90	+ err = 0;
3217 6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	91	+ goto cleanup;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	92	}
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	93	*outl = 0;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	94	- return 1;
3402 110b254c69b8 19823263 Upgrade OpenSSL to 1.0.1j Ronald Jordan <ron.jordan@oracle.com> parents: 3217 diff changeset	95	+ err = 1;
3217 6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	96	+ goto cleanup;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	97	}
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	98	if (b > 1)
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	99	{
3709 4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	100	@@ -530,7 +537,8 @@
3217 6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	101	if (ctx->buf_len \|\| !ctx->final_used)
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	102	{
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	103	EVPerr(EVP_F_EVP_DECRYPTFINAL_EX,EVP_R_WRONG_FINAL_BLOCK_LENGTH);
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	104	- return(0);
3402 110b254c69b8 19823263 Upgrade OpenSSL to 1.0.1j Ronald Jordan <ron.jordan@oracle.com> parents: 3217 diff changeset	105	+ err = 0;
3217 6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	106	+ goto cleanup;
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	107	}
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	108	OPENSSL_assert(b <= sizeof ctx->final);
3709 4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	109
4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	110	@@ -542,7 +550,8 @@
4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	111	if (n == 0 \|\| n > (int)b)
4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	112	{
4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	113	EVPerr(EVP_F_EVP_DECRYPTFINAL_EX,EVP_R_BAD_DECRYPT);
4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	114	- return(0);
4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	115	+ err = 0;
4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	116	+ goto cleanup;
4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	117	}
4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	118	for (i=0; i<n; i++)
4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	119	{
4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	120	@@ -549,7 +558,8 @@
4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	121	if (ctx->final[--b] != n)
4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	122	{
4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	123	EVPerr(EVP_F_EVP_DECRYPTFINAL_EX,EVP_R_BAD_DECRYPT);
4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	124	- return(0);
4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	125	+ err = 0;
4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	126	+ goto cleanup;
4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	127	}
4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	128	}
4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	129	n=ctx->cipher->block_size-n;
4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	130	@@ -559,7 +569,13 @@
3217 6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	131	}
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	132	else
3709 4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	133	*outl=0;
4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	134	- return(1);
4f62f67d71dd 20325338 Upgrade OpenSSL version to 1.0.1k Ron Jordan <ron.jordan@oracle.com> parents: 3402 diff changeset	135	+ err = 1;
3217 6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	136	+cleanup:
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	137	+ if (ctx->cipher->cleanup)
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	138	+ {
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	139	+ ctx->cipher->cleanup(ctx);
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	140	+ }
3402 110b254c69b8 19823263 Upgrade OpenSSL to 1.0.1j Ronald Jordan <ron.jordan@oracle.com> parents: 3217 diff changeset	141	+ return err;
3217 6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	142	}
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	143
6c32d6df504a 17283726 memory leak with EVP_CipherInit_ex Ronald Jordan <ron.jordan@oracle.com> parents: diff changeset	144	void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx)

author	Ron Jordan <ron.jordan@oracle.com>
	Tue, 13 Jan 2015 07:39:33 -0800
branch	s11u2-sru6-backport
changeset 3709	4f62f67d71dd
parent 3402	110b254c69b8
child 4002	95b8f35fcdd5
permissions	-rw-r--r--