Use SHA-256 in fips_test_suite.

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index ad956476d5badc73d0b5489cfb254f7272f5fb9d..09cb9a07a2d5c05730f6a575ae2fbc18c2708f81 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -281,10 +281,12 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
        ../crypto/bn/bn_exp2.o \
        ../crypto/bn/bn_exp.o \
        ../crypto/bn/bn_gcd.o \
+       ../crypto/bn/bn_gf2m.o \
        ../crypto/bn/bn_lib.o \
        ../crypto/bn/bn_mod.o \
        ../crypto/bn/bn_mont.o \
        ../crypto/bn/bn_mul.o \
+       ../crypto/bn/bn_nist.o \
        ../crypto/bn/bn_prime.o \
        ../crypto/bn/bn_rand.o \
        ../crypto/bn/bn_recp.o \
@@ -307,14 +309,25 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
        ../crypto/dsa/dsa_gen.o \
        ../crypto/dsa/dsa_key.o \
        ../crypto/dsa/dsa_ossl.o \
-       ../crypto/dsa/dsa_sign.o \
-       ../crypto/dsa/dsa_vrf.o \
+       ../crypto/ec/ec_curve.o \
+       ../crypto/ec/ec_cvt.o \
+       ../crypto/ec/ec_key.o \
+       ../crypto/ec/ec_lib.o \
+       ../crypto/ec/ecp_mont.o \
+       ../crypto/ec/ec_mult.o \
+       ../crypto/ec/ecp_nist.o \
+       ../crypto/ec/ecp_smpl.o \
+       ../crypto/ec/ec2_mult.o \
+       ../crypto/ec/ec2_smpl.o \
+       ../crypto/ecdsa/ecs_ossl.o \
        ../crypto/evp/e_aes.o \
        ../crypto/evp/e_des3.o \
        ../crypto/evp/m_sha1.o \
        ../crypto/hmac/hmac.o \
+       ../crypto/modes/cbc128.o \
        ../crypto/modes/cfb128.o \
        ../crypto/modes/ctr128.o \
+       ../crypto/modes/gcm128.o \
        ../crypto/modes/ofb128.o \
        ../crypto/rand/md_rand.o \
        ../crypto/rand/rand_egd.o \
@@ -332,6 +345,7 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
        ../crypto/rsa/rsa_pss.o \
        ../crypto/rsa/rsa_ssl.o \
        ../crypto/rsa/rsa_x931.o \
+       ../crypto/rsa/rsa_x931g.o \
        ../crypto/sha/sha1dgst.o \
        ../crypto/sha/sha256.o \
        ../crypto/sha/sha512.o \
@@ -348,7 +362,7 @@ build_fips:
 
 build_crypto:
        if [ -n "$(FIPSCANLIB)" ]; then \
-               EXCL_OBJ='$(AES_ENC) $(BN_ASM) $(DES_ENC) $(CPUID_OBJ) $(SHA1_ASM_OBJ) $(FIPS_EX_OBJ)' ; export EXCL_OBJ ; \
+               EXCL_OBJ='$(AES_ENC) $(BN_ASM) $(DES_ENC) $(CPUID_OBJ) $(SHA1_ASM_OBJ) $(MODES_ASM_OBJ) $(FIPS_EX_OBJ)' ; export EXCL_OBJ ; \
                ARX='$(PERL) $${TOP}/util/arx.pl $(AR)' ; \
        else \
                ARX='${AR}' ; \