Reorganise ECC code for inclusion in FIPS module.

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index b608f710e9df87e9a0517e7769230cc0d658925e..4cdd60bc04bf2e32ea223c30621e19863e379a36 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -307,8 +307,6 @@ 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/evp/e_aes.o \
        ../crypto/evp/e_des3.o \
        ../crypto/evp/m_sha1.o \
@@ -316,6 +314,7 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.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 \
@@ -350,7 +349,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}' ; \