• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Aucun tag

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

TLS/SSL and crypto library


Commit MetaInfo

Révision3da3c85a3f02b244dfaeadfeb7d8d0554f9d0f45 (tree)
l'heure2005-06-07 23:08:54
AuteurAndy Polyakov <appro@open...>
CommiterAndy Polyakov

Message de Log

Fix typos and add missing lines in Makefile.

Change Summary

Modification

--- a/Makefile.org
+++ b/Makefile.org
@@ -258,6 +258,9 @@ sub_target:
258258 libcrypto$(SHLIB_EXT): libcrypto.a
259259 @if [ "$(SHLIB_TARGET)" != "" ]; then \
260260 $(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; \
261264 else \
262265 echo "There's no support for shared libraries on this platform" >&2; \
263266 fi
--- 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)
289289 struct shl_descriptor inf;
290290 int i,len;
291291
292- if (addr == NULL) addr = dl_ref_porint;
292+ if (addr == NULL) addr = dl_ref_point;
293293
294294 for (i=-1;shl_get_r(i,&inf)==0;i++)
295295 {
--- a/fips/fips_err.h
+++ b/fips/fips_err.h
@@ -90,7 +90,7 @@ static ERR_STRING_DATA FIPS_str_functs[]=
9090 {ERR_FUNC(FIPS_F_RSA_GENERATE_KEY), "RSA_generate_key"},
9191 {ERR_FUNC(FIPS_F_RSA_X931_GENERATE_KEY), "RSA_X931_generate_key"},
9292 {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"},
9494 {0,NULL}
9595 };
9696
--- a/fips/fipshashes.c
+++ b/fips/fipshashes.c
@@ -2,7 +2,7 @@ const char * const FIPS_source_hashes[] = {
22 "HMAC-SHA1(fips.c)= c5116c8f381d5981d840d240f66c8303b866f5f6",
33 "HMAC-SHA1(fips_err_wrapper.c)= d3e2be316062510312269e98f964cb87e7577898",
44 "HMAC-SHA1(fips.h)= 23151c26e0c735c09b0f229a16a31235150b4ca4",
5-"HMAC-SHA1(fips_err.h)= b9cd3383335a4db7663dd3b7a4851e2d60998597",
5+"HMAC-SHA1(fips_err.h)= 11cc657a0c7989efdeb28dd7c6b3941b1ad08c39",
66 "HMAC-SHA1(aes/fips_aes_core.c)= b70bbbd675efe0613da0d57055310926a0104d55",
77 "HMAC-SHA1(aes/asm/fips-ax86-elf.s)= f797b524a79196e7f59458a5b223432fcfd4a868",
88 "HMAC-SHA1(aes/fips_aes_selftest.c)= 98b01502221e7fe529fd981222f2cbb52eb4cbe0",
--- a/fips/rsa/Makefile
+++ b/fips/rsa/Makefile
@@ -64,10 +64,12 @@ tests:
6464
6565 Q=../testvectors/rsa/req
6666 A=../testvectors/rsa/rsp
67+Q62=../testvectors/rsa_salt_62/req
68+A62=../testvectors/rsa_salt_62/rsp
6769
6870 fips_test:
69- -rm -rf $(A)
70- mkdir $(A)
71+ -rm -rf $(A) $(A62)
72+ mkdir $(A) $(A62)
7173 if [ -f $(Q)/SigGen15.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_rsastest < $(Q)/SigGen15.req > $(A)/SigGen15.rsp; fi
7274 if [ -f $(Q)/SigVer15.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_rsavtest < $(Q)/SigVer15.req > $(A)/SigVer15.rsp; fi
7375 if [ -f $(Q)/SigGenPSS.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_rsastest -saltlen 0 < $(Q)/SigGenPSS.req > $(A)/SigGenPSS.rsp; fi