| author | Misaki Miyashita <Misaki.Miyashita@Oracle.COM> |
| Fri, 20 Mar 2015 15:31:27 -0700 | |
| changeset 4002 | 95b8f35fcdd5 |
| parent 3621 | 3e00113c3743 |
| permissions | -rw-r--r-- |
|
1858
90719b88d5f8
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. |
|
90719b88d5f8
17283726 memory leak with EVP_CipherInit_ex
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
2 |
|
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
3 |
--- openssl-1.0.1f/crypto/evp/evp_enc.c.orig Mon Feb 11 07:26:04 2013 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
4 |
+++ openssl-1.0.1f/crypto/evp/evp_enc.c Mon Feb 3 16:40:48 2014 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
5 |
@@ -379,11 +379,13 @@ |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
6 |
|
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
7 |
if (ctx->cipher->flags & EVP_CIPH_FLAG_CUSTOM_CIPHER) {
|
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
8 |
ret = M_do_cipher(ctx, out, NULL, 0); |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
9 |
- if (ret < 0) |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
10 |
- return 0; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
11 |
- else |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
12 |
+ if (ret < 0) {
|
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
13 |
+ ret = 0; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
14 |
+ goto cleanup; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
15 |
+ } else |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
16 |
*outl = ret; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
17 |
- return 1; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
18 |
+ ret = 1; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
19 |
+ goto cleanup; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
20 |
} |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
21 |
|
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
22 |
b = ctx->cipher->block_size; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
23 |
@@ -390,7 +392,8 @@ |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
24 |
OPENSSL_assert(b <= sizeof ctx->buf); |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
25 |
if (b == 1) {
|
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
26 |
*outl = 0; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
27 |
- return 1; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
28 |
+ ret = 1; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
29 |
+ goto cleanup; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
30 |
} |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
31 |
bl = ctx->buf_len; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
32 |
if (ctx->flags & EVP_CIPH_NO_PADDING) {
|
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
33 |
@@ -397,10 +400,12 @@ |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
34 |
if (bl) {
|
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
35 |
EVPerr(EVP_F_EVP_ENCRYPTFINAL_EX, |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
36 |
EVP_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH); |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
37 |
- return 0; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
38 |
+ ret = 0; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
39 |
+ goto cleanup; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
40 |
} |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
41 |
*outl = 0; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
42 |
- return 1; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
43 |
+ ret = 1; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
44 |
+ goto cleanup; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
45 |
} |
|
1858
90719b88d5f8
17283726 memory leak with EVP_CipherInit_ex
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
46 |
|
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
47 |
n = b - bl; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
48 |
@@ -411,6 +416,11 @@ |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
49 |
if (ret) |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
50 |
*outl = b; |
|
1858
90719b88d5f8
17283726 memory leak with EVP_CipherInit_ex
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
51 |
|
|
90719b88d5f8
17283726 memory leak with EVP_CipherInit_ex
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
52 |
+cleanup: |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
53 |
+ if (ctx->cipher->cleanup) {
|
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
54 |
+ ctx->cipher->cleanup(ctx); |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
55 |
+ } |
|
1858
90719b88d5f8
17283726 memory leak with EVP_CipherInit_ex
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
56 |
+ |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
57 |
return ret; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
58 |
} |
|
1858
90719b88d5f8
17283726 memory leak with EVP_CipherInit_ex
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
59 |
|
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
60 |
@@ -478,6 +488,7 @@ |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
61 |
int EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
62 |
{
|
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
63 |
int i, n; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
64 |
+ int err = 1; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
65 |
unsigned int b; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
66 |
*outl = 0; |
|
1858
90719b88d5f8
17283726 memory leak with EVP_CipherInit_ex
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
67 |
|
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
68 |
@@ -483,11 +494,13 @@ |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
69 |
|
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
70 |
if (ctx->cipher->flags & EVP_CIPH_FLAG_CUSTOM_CIPHER) {
|
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
71 |
i = M_do_cipher(ctx, out, NULL, 0); |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
72 |
- if (i < 0) |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
73 |
- return 0; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
74 |
- else |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
75 |
+ if (i < 0) {
|
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
76 |
+ err = 0; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
77 |
+ goto cleanup; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
78 |
+ } else |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
79 |
*outl = i; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
80 |
- return 1; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
81 |
+ err = 1; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
82 |
+ goto cleanup; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
83 |
} |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
84 |
|
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
85 |
b = ctx->cipher->block_size; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
86 |
@@ -495,10 +508,12 @@ |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
87 |
if (ctx->buf_len) {
|
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
88 |
EVPerr(EVP_F_EVP_DECRYPTFINAL_EX, |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
89 |
EVP_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH); |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
90 |
- return 0; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
91 |
+ err = 0; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
92 |
+ goto cleanup; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
93 |
} |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
94 |
*outl = 0; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
95 |
- return 1; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
96 |
+ err = 1; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
97 |
+ goto cleanup; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
98 |
} |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
99 |
if (b > 1) {
|
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
100 |
if (ctx->buf_len || !ctx->final_used) {
|
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
101 |
@@ -503,7 +518,8 @@ |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
102 |
if (b > 1) {
|
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
103 |
if (ctx->buf_len || !ctx->final_used) {
|
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
104 |
EVPerr(EVP_F_EVP_DECRYPTFINAL_EX, EVP_R_WRONG_FINAL_BLOCK_LENGTH); |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
105 |
- return (0); |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
106 |
+ err = 0; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
107 |
+ goto cleanup; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
108 |
} |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
109 |
OPENSSL_assert(b <= sizeof ctx->final); |
|
3621
3e00113c3743
20325338 Upgrade OpenSSL version to 1.0.1k
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
110 |
|
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
111 |
@@ -514,7 +530,8 @@ |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
112 |
n = ctx->final[b - 1]; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
113 |
if (n == 0 || n > (int)b) {
|
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
114 |
EVPerr(EVP_F_EVP_DECRYPTFINAL_EX, EVP_R_BAD_DECRYPT); |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
115 |
- return (0); |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
116 |
+ err = 0; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
117 |
+ goto cleanup; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
118 |
} |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
119 |
for (i = 0; i < n; i++) {
|
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
120 |
if (ctx->final[--b] != n) {
|
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
121 |
@@ -519,7 +536,8 @@ |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
122 |
for (i = 0; i < n; i++) {
|
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
123 |
if (ctx->final[--b] != n) {
|
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
124 |
EVPerr(EVP_F_EVP_DECRYPTFINAL_EX, EVP_R_BAD_DECRYPT); |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
125 |
- return (0); |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
126 |
+ err = 0; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
127 |
+ goto cleanup; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
128 |
} |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
129 |
} |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
130 |
n = ctx->cipher->block_size - n; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
131 |
@@ -528,7 +546,12 @@ |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
132 |
*outl = n; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
133 |
} else |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
134 |
*outl = 0; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
135 |
- return (1); |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
136 |
+ err = 1; |
|
1858
90719b88d5f8
17283726 memory leak with EVP_CipherInit_ex
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
137 |
+cleanup: |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
138 |
+ if (ctx->cipher->cleanup) {
|
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
139 |
+ ctx->cipher->cleanup(ctx); |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
140 |
+ } |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
141 |
+ return err; |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
3621
diff
changeset
|
142 |
} |
|
1858
90719b88d5f8
17283726 memory leak with EVP_CipherInit_ex
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
143 |
|
|
90719b88d5f8
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) |