author | jenny.yung@oracle.com <jenny.yung@oracle.com> |
Wed, 10 Jun 2015 11:25:02 -0700 | |
branch | s11-update |
changeset 4461 | 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 |
# |
68eb2fdf9b3a
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
2 |
# This was developed in house. Upstream notified. |
68eb2fdf9b3a
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
3 |
# |
68eb2fdf9b3a
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
4 |
--- openssl-1.0.1m/crypto/evp/evp_enc.c.orig Tue Jun 2 13:18:15 2015 |
68eb2fdf9b3a
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
5 |
+++ openssl-1.0.1m/crypto/evp/evp_enc.c Tue Jun 2 13:19:19 2015 |
68eb2fdf9b3a
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
6 |
@@ -179,6 +179,7 @@ |
68eb2fdf9b3a
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
7 |
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
|
8 |
return 0; |
68eb2fdf9b3a
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
9 |
} |
68eb2fdf9b3a
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
10 |
+ (void) memset(ctx->cipher_data, 0, ctx->cipher->ctx_size); |
68eb2fdf9b3a
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
11 |
} else { |
68eb2fdf9b3a
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
12 |
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
|
13 |
} |