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

symbol info.
This commit is contained in:
Dr. Stephen Henson 2005-05-16 17:52:32 +00:00
parent ecb1445ce2
commit 63453c025f
4 changed files with 7 additions and 7 deletions

View file

@ -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",
};

View file

@ -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;

View file

@ -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:

View file

@ -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",