author | April Chin <april.chin@oracle.com> |
Tue, 01 Sep 2015 09:29:08 -0700 | |
changeset 4833 | b9009ad1e605 |
parent 4822 | 1fb8a14c6702 |
permissions | -rw-r--r-- |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
1 |
# |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
2 |
# This was developed in house. Upstreadm notified (PR#277). |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
3 |
# |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
4 |
diff -ru openssl-1.0.1m/crypto/evp/evp_enc.c openssl-1.0.1m/crypto/evp/evp_enc.c.new |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
5 |
--- openssl-1.0.1m/crypto/evp/evp_enc.c Thu May 7 09:46:32 2015 |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
6 |
+++ openssl-1.0.1m/crypto/evp/evp_enc.c.new Thu May 7 09:46:23 2015 |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4370
diff
changeset
|
7 |
@@ -185,6 +185,7 @@ |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
8 |
EVPerr(EVP_F_EVP_CIPHERINIT_EX, ERR_R_MALLOC_FAILURE); |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
9 |
return 0; |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
10 |
} |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
11 |
+ (void) memset(ctx->cipher_data, 0, ctx->cipher->ctx_size); |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
12 |
} else { |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
13 |
ctx->cipher_data = NULL; |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
14 |
} |