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 Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
Wed, 27 May 2015 16:32:47 -0700
changeset 4366 8e8f535e48a5
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:
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
8e8f535e48a5 PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
     7
 
@@ -179,6 +179,7 @@
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
 
         }
upstream/oracle/userland-gate