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-fips/patches/303-hmac-ctx.patch
author Misaki Miyashita <misaki.miyashita@oracle.com>
Thu, 17 Nov 2016 13:20:16 -0800
changeset 7342 3291c8473ecd
permissions -rw-r--r--
25067463 The 'test4/5/6' in hmactest.c dumped core in FIPS mode
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7342
3291c8473ecd 25067463 The 'test4/5/6' in hmactest.c dumped core in FIPS mode
Misaki Miyashita <misaki.miyashita@oracle.com>
parents:
diff changeset 
     1
 
# Developed in house: Solaris specific
3291c8473ecd 25067463 The 'test4/5/6' in hmactest.c dumped core in FIPS mode
Misaki Miyashita <misaki.miyashita@oracle.com>
parents:
diff changeset 
     2
 
# It checks the validity of the context.
3291c8473ecd 25067463 The 'test4/5/6' in hmactest.c dumped core in FIPS mode
Misaki Miyashita <misaki.miyashita@oracle.com>
parents:
diff changeset 
     3
 
# This change is inside the FIPS canister; thus, not applicable to
3291c8473ecd 25067463 The 'test4/5/6' in hmactest.c dumped core in FIPS mode
Misaki Miyashita <misaki.miyashita@oracle.com>
parents:
diff changeset 
     4
 
# the upstream.
3291c8473ecd 25067463 The 'test4/5/6' in hmactest.c dumped core in FIPS mode
Misaki Miyashita <misaki.miyashita@oracle.com>
parents:
diff changeset 
     5
 
--- a/crypto/hmac/hmac.c	2016-11-09 14:41:31.820245175 -0800
3291c8473ecd 25067463 The 'test4/5/6' in hmactest.c dumped core in FIPS mode
Misaki Miyashita <misaki.miyashita@oracle.com>
parents:
diff changeset 
     6
 
+++ b/crypto/hmac/hmac.c	2016-11-09 14:42:13.816500695 -0800
3291c8473ecd 25067463 The 'test4/5/6' in hmactest.c dumped core in FIPS mode
Misaki Miyashita <misaki.miyashita@oracle.com>
parents:
diff changeset 
     7
 
@@ -75,8 +75,10 @@
3291c8473ecd 25067463 The 'test4/5/6' in hmactest.c dumped core in FIPS mode
Misaki Miyashita <misaki.miyashita@oracle.com>
parents:
diff changeset 
     8
 
 		reset=1;
3291c8473ecd 25067463 The 'test4/5/6' in hmactest.c dumped core in FIPS mode
Misaki Miyashita <misaki.miyashita@oracle.com>
parents:
diff changeset 
     9
 
 		ctx->md=md;
3291c8473ecd 25067463 The 'test4/5/6' in hmactest.c dumped core in FIPS mode
Misaki Miyashita <misaki.miyashita@oracle.com>
parents:
diff changeset 
    10
 
 		}
3291c8473ecd 25067463 The 'test4/5/6' in hmactest.c dumped core in FIPS mode
Misaki Miyashita <misaki.miyashita@oracle.com>
parents:
diff changeset 
    11
 
-	else
3291c8473ecd 25067463 The 'test4/5/6' in hmactest.c dumped core in FIPS mode
Misaki Miyashita <misaki.miyashita@oracle.com>
parents:
diff changeset 
    12
 
+	else if (ctx->md != NULL)
3291c8473ecd 25067463 The 'test4/5/6' in hmactest.c dumped core in FIPS mode
Misaki Miyashita <misaki.miyashita@oracle.com>
parents:
diff changeset 
    13
 
 		md=ctx->md;
3291c8473ecd 25067463 The 'test4/5/6' in hmactest.c dumped core in FIPS mode
Misaki Miyashita <misaki.miyashita@oracle.com>
parents:
diff changeset 
    14
 
+	else
3291c8473ecd 25067463 The 'test4/5/6' in hmactest.c dumped core in FIPS mode
Misaki Miyashita <misaki.miyashita@oracle.com>
parents:
diff changeset 
    15
 
+		goto err;
3291c8473ecd 25067463 The 'test4/5/6' in hmactest.c dumped core in FIPS mode
Misaki Miyashita <misaki.miyashita@oracle.com>
parents:
diff changeset 
    16
3291c8473ecd 25067463 The 'test4/5/6' in hmactest.c dumped core in FIPS mode
Misaki Miyashita <misaki.miyashita@oracle.com>
parents:
diff changeset 
    17
 
 	if (key != NULL)
3291c8473ecd 25067463 The 'test4/5/6' in hmactest.c dumped core in FIPS mode
Misaki Miyashita <misaki.miyashita@oracle.com>
parents:
diff changeset 
    18
 
 		{
upstream/oracle/userland-gate