author | Ronald Jordan <ron.jordan@oracle.com> |
Wed, 26 Oct 2016 13:19:33 -0700 | |
branch | s11u3-sru |
changeset 7163 | ee09edbd5876 |
parent 4461 | components/openssl/openssl-1.0.1/patches/41_uninitialized_ctx.patch@68eb2fdf9b3a |
permissions | -rw-r--r-- |
4461
68eb2fdf9b3a
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
1 |
# |
7163
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
4461
diff
changeset
|
2 |
# This was developed in house. Upstreadm notified (PR#277). |
4461
68eb2fdf9b3a
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
3 |
# |
7163
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
4461
diff
changeset
|
4 |
diff -ru openssl-1.0.1m/crypto/evp/evp_enc.c openssl-1.0.1m/crypto/evp/evp_enc.c.new |
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
4461
diff
changeset
|
5 |
--- openssl-1.0.1m/crypto/evp/evp_enc.c Thu May 7 09:46:32 2015 |
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
4461
diff
changeset
|
6 |
+++ openssl-1.0.1m/crypto/evp/evp_enc.c.new Thu May 7 09:46:23 2015 |
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
4461
diff
changeset
|
7 |
@@ -185,6 +185,7 @@ |
4461
68eb2fdf9b3a
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
8 |
EVPerr(EVP_F_EVP_CIPHERINIT_EX, ERR_R_MALLOC_FAILURE); |
68eb2fdf9b3a
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
9 |
return 0; |
68eb2fdf9b3a
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
10 |
} |
7163
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
4461
diff
changeset
|
11 |
+ (void) memset(ctx->cipher_data, 0, ctx->cipher->ctx_size); |
4461
68eb2fdf9b3a
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
12 |
} else { |
68eb2fdf9b3a
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
13 |
ctx->cipher_data = NULL; |
68eb2fdf9b3a
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
14 |
} |