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/patches/34_tls_segfault.patch
author Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
Tue, 17 Dec 2013 16:11:49 -0800
changeset 1606 3c7c8020eda1
child 1641 2fc479afcf70
permissions -rw-r--r--
17836054 EVP_DigestUpdate crashes because of a NULL pointer 17952352 FIPS OpenSSL needs same patches as non-FIPS OpenSSL
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1606
3c7c8020eda1 17836054 EVP_DigestUpdate crashes because of a NULL pointer
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
     1
 
Index: openssl/ssl/t1_enc.c
3c7c8020eda1 17836054 EVP_DigestUpdate crashes because of a NULL pointer
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
     2
 
============================================================================
3c7c8020eda1 17836054 EVP_DigestUpdate crashes because of a NULL pointer
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
     3
 
$ diff -ru ssl/t1_enc.c ssl/t1_enc.c
3c7c8020eda1 17836054 EVP_DigestUpdate crashes because of a NULL pointer
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
     4
 
--- t1_enc.c.orig       Tue Dec 10 15:36:05 2013
3c7c8020eda1 17836054 EVP_DigestUpdate crashes because of a NULL pointer
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
     5
 
+++ t1_enc.c    Wed Dec 11 09:29:02 2013
3c7c8020eda1 17836054 EVP_DigestUpdate crashes because of a NULL pointer
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
     6
 
@@ -980,7 +980,10 @@
3c7c8020eda1 17836054 EVP_DigestUpdate crashes because of a NULL pointer
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
     7
 
 		}
3c7c8020eda1 17836054 EVP_DigestUpdate crashes because of a NULL pointer
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
     8
 
 		else
3c7c8020eda1 17836054 EVP_DigestUpdate crashes because of a NULL pointer
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
     9
 
 		{
3c7c8020eda1 17836054 EVP_DigestUpdate crashes because of a NULL pointer
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
    10
 
-			EVP_MD_CTX_copy(&hmac,hash);
3c7c8020eda1 17836054 EVP_DigestUpdate crashes because of a NULL pointer
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
    11
 
+			if (EVP_MD_CTX_copy(&hmac,hash) != 1)
3c7c8020eda1 17836054 EVP_DigestUpdate crashes because of a NULL pointer
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
    12
 
+				{
3c7c8020eda1 17836054 EVP_DigestUpdate crashes because of a NULL pointer
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
    13
 
+				return (0);
3c7c8020eda1 17836054 EVP_DigestUpdate crashes because of a NULL pointer
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
    14
 
+				}
3c7c8020eda1 17836054 EVP_DigestUpdate crashes because of a NULL pointer
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
    15
 
 			mac_ctx = &hmac;
3c7c8020eda1 17836054 EVP_DigestUpdate crashes because of a NULL pointer
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
    16
 
 		}
3c7c8020eda1 17836054 EVP_DigestUpdate crashes because of a NULL pointer
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
    17
upstream/oracle/userland-gate