Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/openssl/openssl-1.0.1-fips-140/patches/41_uninitialized_ctx.patch
author jenny.yung@oracle.com <jenny.yung@oracle.com>
Wed, 10 Jun 2015 11:25:02 -0700
branchs11-update
changeset 4461 68eb2fdf9b3a
permissions -rw-r--r--
PSARC/2015/043 Further OpenSSL Thread and Fork Safety 19579036 proftpd child process segfaults after failed login attempt 21149030 SegFault when a cleanup callback is called before the cipher initialization
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
 
         }
upstream/oracle/userland-gate