TLS/SSL and crypto library
Révision | 3da3c85a3f02b244dfaeadfeb7d8d0554f9d0f45 (tree) |
---|---|
l'heure | 2005-06-07 23:08:54 |
Auteur | Andy Polyakov <appro@open...> |
Commiter | Andy Polyakov |
Fix typos and add missing lines in Makefile.
@@ -258,6 +258,9 @@ sub_target: | ||
258 | 258 | libcrypto$(SHLIB_EXT): libcrypto.a |
259 | 259 | @if [ "$(SHLIB_TARGET)" != "" ]; then \ |
260 | 260 | $(MAKE) SHLIBDIRS=crypto build-shared; \ |
261 | + if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \ | |
262 | + fips/sha/fips_standalone_sha1 -binary $@ > $@.$${HMAC_EXT:-sha1}; \ | |
263 | + fi; \ | |
261 | 264 | else \ |
262 | 265 | echo "There's no support for shared libraries on this platform" >&2; \ |
263 | 266 | fi |
@@ -289,7 +289,7 @@ int DSO_pathbyaddr(void *addr,char *path,int sz) | ||
289 | 289 | struct shl_descriptor inf; |
290 | 290 | int i,len; |
291 | 291 | |
292 | - if (addr == NULL) addr = dl_ref_porint; | |
292 | + if (addr == NULL) addr = dl_ref_point; | |
293 | 293 | |
294 | 294 | for (i=-1;shl_get_r(i,&inf)==0;i++) |
295 | 295 | { |
@@ -90,7 +90,7 @@ static ERR_STRING_DATA FIPS_str_functs[]= | ||
90 | 90 | {ERR_FUNC(FIPS_F_RSA_GENERATE_KEY), "RSA_generate_key"}, |
91 | 91 | {ERR_FUNC(FIPS_F_RSA_X931_GENERATE_KEY), "RSA_X931_generate_key"}, |
92 | 92 | {ERR_FUNC(FIPS_F_SSLEAY_RAND_BYTES), "SSLEAY_RAND_BYTES"}, |
93 | -{ERR_FINC(FIPS_F_FIPS_CHECK_DSO), "FIPS_check_dso"}, | |
93 | +{ERR_FUNC(FIPS_F_FIPS_CHECK_DSO), "FIPS_check_dso"}, | |
94 | 94 | {0,NULL} |
95 | 95 | }; |
96 | 96 |
@@ -2,7 +2,7 @@ const char * const FIPS_source_hashes[] = { | ||
2 | 2 | "HMAC-SHA1(fips.c)= c5116c8f381d5981d840d240f66c8303b866f5f6", |
3 | 3 | "HMAC-SHA1(fips_err_wrapper.c)= d3e2be316062510312269e98f964cb87e7577898", |
4 | 4 | "HMAC-SHA1(fips.h)= 23151c26e0c735c09b0f229a16a31235150b4ca4", |
5 | -"HMAC-SHA1(fips_err.h)= b9cd3383335a4db7663dd3b7a4851e2d60998597", | |
5 | +"HMAC-SHA1(fips_err.h)= 11cc657a0c7989efdeb28dd7c6b3941b1ad08c39", | |
6 | 6 | "HMAC-SHA1(aes/fips_aes_core.c)= b70bbbd675efe0613da0d57055310926a0104d55", |
7 | 7 | "HMAC-SHA1(aes/asm/fips-ax86-elf.s)= f797b524a79196e7f59458a5b223432fcfd4a868", |
8 | 8 | "HMAC-SHA1(aes/fips_aes_selftest.c)= 98b01502221e7fe529fd981222f2cbb52eb4cbe0", |
@@ -64,10 +64,12 @@ tests: | ||
64 | 64 | |
65 | 65 | Q=../testvectors/rsa/req |
66 | 66 | A=../testvectors/rsa/rsp |
67 | +Q62=../testvectors/rsa_salt_62/req | |
68 | +A62=../testvectors/rsa_salt_62/rsp | |
67 | 69 | |
68 | 70 | fips_test: |
69 | - -rm -rf $(A) | |
70 | - mkdir $(A) | |
71 | + -rm -rf $(A) $(A62) | |
72 | + mkdir $(A) $(A62) | |
71 | 73 | if [ -f $(Q)/SigGen15.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_rsastest < $(Q)/SigGen15.req > $(A)/SigGen15.rsp; fi |
72 | 74 | if [ -f $(Q)/SigVer15.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_rsavtest < $(Q)/SigVer15.req > $(A)/SigVer15.rsp; fi |
73 | 75 | if [ -f $(Q)/SigGenPSS.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_rsastest -saltlen 0 < $(Q)/SigGenPSS.req > $(A)/SigGenPSS.rsp; fi |