Remove redundant test. Add new SHAXXX algorithms to mkdef.pl, update

symbol info.

diff --git a/fips/fipshashes.c b/fips/fipshashes.c
index 8676a479933dba7c78c339799f428dca98002cc5..e2793115eb8ffdcbcdba6d2ff972d0f84d64df13 100644 (file)
--- a/fips/fipshashes.c
+++ b/fips/fipshashes.c
@@ -34,5 +34,5 @@ const char * const FIPS_source_hashes[] = {
 "HMAC-SHA1(sha1/fips_sha256.c)= 826e768677e67b7c87dfc9e084245b619804d01c",
 "HMAC-SHA1(sha1/fips_sha512.c)= 27e16912ff196982425c00fe266fa84ef4f48fcd",
 "HMAC-SHA1(hmac/fips_hmac.c)= a477cec1da76c0092979c4a875b6469339bff7ef",
-"HMAC-SHA1(hmac/fips_hmac_selftest.c)= 09a27945cafdeb5978109e90278c981464dba324",
+"HMAC-SHA1(hmac/fips_hmac_selftest.c)= ebb32b205babf4300017de767fd6e3f1879765c9",
 };

diff --git a/fips/hmac/fips_hmac_selftest.c b/fips/hmac/fips_hmac_selftest.c
index 773468245ed5e0a11e0f2bed93374fca18155233..fc599b75efc84eb42769a912f34b11e9508ebdb2 100644 (file)
--- a/fips/hmac/fips_hmac_selftest.c
+++ b/fips/hmac/fips_hmac_selftest.c
@@ -124,7 +124,7 @@ int FIPS_selftest_hmac()
                (const unsigned char *)t->iv,strlen(t->iv),
                out,&outlen);
 
-       if(outlen<md->md_size || memcmp(out,t->kaval,md->md_size))
+       if(memcmp(out,t->kaval,outlen))
            {
            FIPSerr(FIPS_F_FIPS_SELFTEST_SHA,FIPS_R_SELFTEST_FAILED);
            return 0;

diff --git a/util/libeay.num b/util/libeay.num
index fb25c0c5c98b8860e0c18aa0c06a6232c2a37575..f845d7b576e895984d13cb74bf12029f6fa0fef4 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -2869,10 +2869,10 @@ PROXY_POLICY_free                       3308    EXIST::FUNCTION:
 PROXY_POLICY_new                        3309   EXIST::FUNCTION:
 BN_MONT_CTX_set_locked                  3310   EXIST::FUNCTION:
 FIPS_selftest_rng                       3311   EXIST:OPENSSL_FIPS:FUNCTION:
-EVP_sha384                              3312   EXIST::FUNCTION:SHA
-EVP_sha512                              3313   EXIST::FUNCTION:SHA
-EVP_sha224                              3314   EXIST::FUNCTION:SHA
-EVP_sha256                              3315   EXIST::FUNCTION:SHA
+EVP_sha384                              3312   EXIST::FUNCTION:SHA,SHA512
+EVP_sha512                              3313   EXIST::FUNCTION:SHA,SHA512
+EVP_sha224                              3314   EXIST::FUNCTION:SHA,SHA256
+EVP_sha256                              3315   EXIST::FUNCTION:SHA,SHA256
 FIPS_selftest_hmac                      3316   EXIST:OPENSSL_FIPS:FUNCTION:
 FIPS_corrupt_rng                        3317   EXIST:OPENSSL_FIPS:FUNCTION:
 BN_mod_exp_mont_consttime               3318   EXIST::FUNCTION:

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 831291e2873d4d7a34a3a75021346e5d3aa53642..c4f995fb76e0b0c6cc3cdbbd8f863522d7507cc8 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -83,7 +83,7 @@ my @known_platforms = ( "__FreeBSD__", "PERL5", "NeXT",
 my @known_ossl_platforms = ( "VMS", "WIN16", "WIN32", "WINNT", "OS2" );
 my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
                         "CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1",
-                        "RIPEMD",
+                        "SHA256", "SHA512", "RIPEMD",
                         "MDC2", "RSA", "DSA", "DH", "EC", "HMAC", "AES",
                         # Envelope "algorithms"
                         "EVP", "X509", "ASN1_TYPEDEFS",