diff options
| author | Andy Polyakov <appro@openssl.org> | 2005-06-07 18:08:54 +0400 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2005-06-07 18:08:54 +0400 |
| commit | 3da3c85a3f02b244dfaeadfeb7d8d0554f9d0f45 (patch) | |
| tree | 1aad2e43e5545efb5b107ae168d3ce65e0b8cc51 | |
| parent | d58d546e2d64f85ba7ac409bcb7f7ef73048672a (diff) | |
Fix typos and add missing lines in Makefile.FIPS_TEST_9
| -rw-r--r-- | Makefile.org | 3 | ||||
| -rw-r--r-- | crypto/dso/dso_dl.c | 2 | ||||
| -rw-r--r-- | fips/fips_err.h | 2 | ||||
| -rw-r--r-- | fips/fipshashes.c | 2 | ||||
| -rw-r--r-- | fips/rsa/Makefile | 6 |
5 files changed, 10 insertions, 5 deletions
diff --git a/Makefile.org b/Makefile.org index 676e0aa23b..98cb2e98bd 100644 --- a/Makefile.org +++ b/Makefile.org @@ -258,6 +258,9 @@ sub_target: libcrypto$(SHLIB_EXT): libcrypto.a @if [ "$(SHLIB_TARGET)" != "" ]; then \ $(MAKE) SHLIBDIRS=crypto build-shared; \ + if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \ + fips/sha/fips_standalone_sha1 -binary $@ > $@.$${HMAC_EXT:-sha1}; \ + fi; \ else \ echo "There's no support for shared libraries on this platform" >&2; \ fi diff --git a/crypto/dso/dso_dl.c b/crypto/dso/dso_dl.c index 15862cb0f7..82daa0b85e 100644 --- a/crypto/dso/dso_dl.c +++ b/crypto/dso/dso_dl.c @@ -289,7 +289,7 @@ int DSO_pathbyaddr(void *addr,char *path,int sz) struct shl_descriptor inf; int i,len; - if (addr == NULL) addr = dl_ref_porint; + if (addr == NULL) addr = dl_ref_point; for (i=-1;shl_get_r(i,&inf)==0;i++) { diff --git a/fips/fips_err.h b/fips/fips_err.h index c40cc5fbeb..d6cfb8321f 100644 --- a/fips/fips_err.h +++ b/fips/fips_err.h @@ -90,7 +90,7 @@ static ERR_STRING_DATA FIPS_str_functs[]= {ERR_FUNC(FIPS_F_RSA_GENERATE_KEY), "RSA_generate_key"}, {ERR_FUNC(FIPS_F_RSA_X931_GENERATE_KEY), "RSA_X931_generate_key"}, {ERR_FUNC(FIPS_F_SSLEAY_RAND_BYTES), "SSLEAY_RAND_BYTES"}, -{ERR_FINC(FIPS_F_FIPS_CHECK_DSO), "FIPS_check_dso"}, +{ERR_FUNC(FIPS_F_FIPS_CHECK_DSO), "FIPS_check_dso"}, {0,NULL} }; diff --git a/fips/fipshashes.c b/fips/fipshashes.c index e0dcdca2e1..079100858a 100644 --- a/fips/fipshashes.c +++ b/fips/fipshashes.c @@ -2,7 +2,7 @@ const char * const FIPS_source_hashes[] = { "HMAC-SHA1(fips.c)= c5116c8f381d5981d840d240f66c8303b866f5f6", "HMAC-SHA1(fips_err_wrapper.c)= d3e2be316062510312269e98f964cb87e7577898", "HMAC-SHA1(fips.h)= 23151c26e0c735c09b0f229a16a31235150b4ca4", -"HMAC-SHA1(fips_err.h)= b9cd3383335a4db7663dd3b7a4851e2d60998597", +"HMAC-SHA1(fips_err.h)= 11cc657a0c7989efdeb28dd7c6b3941b1ad08c39", "HMAC-SHA1(aes/fips_aes_core.c)= b70bbbd675efe0613da0d57055310926a0104d55", "HMAC-SHA1(aes/asm/fips-ax86-elf.s)= f797b524a79196e7f59458a5b223432fcfd4a868", "HMAC-SHA1(aes/fips_aes_selftest.c)= 98b01502221e7fe529fd981222f2cbb52eb4cbe0", diff --git a/fips/rsa/Makefile b/fips/rsa/Makefile index ab236df8de..c8ff0bc92b 100644 --- a/fips/rsa/Makefile +++ b/fips/rsa/Makefile @@ -64,10 +64,12 @@ tests: Q=../testvectors/rsa/req A=../testvectors/rsa/rsp +Q62=../testvectors/rsa_salt_62/req +A62=../testvectors/rsa_salt_62/rsp fips_test: - -rm -rf $(A) - mkdir $(A) + -rm -rf $(A) $(A62) + mkdir $(A) $(A62) if [ -f $(Q)/SigGen15.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_rsastest < $(Q)/SigGen15.req > $(A)/SigGen15.rsp; fi if [ -f $(Q)/SigVer15.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_rsavtest < $(Q)/SigVer15.req > $(A)/SigVer15.rsp; fi if [ -f $(Q)/SigGenPSS.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_rsastest -saltlen 0 < $(Q)/SigGenPSS.req > $(A)/SigGenPSS.rsp; fi |