add ECDSA POST

[openssl.git] / Makefile.fips

diff --git a/Makefile.fips b/Makefile.fips
index d6d373fed7d12d654a6b32738f55e174944ff246..f8307cbf692010fb55eb6f20bddf3b2c4d7ad440 100644 (file)
--- a/Makefile.fips
+++ b/Makefile.fips
@@ -78,7 +78,7 @@ LIBDIR=lib
 # dependent assembler flags. E.g. if you throw -mcpu=ultrasparc at SPARC
 # gcc, then the driver will automatically translate it to -xarch=v8plus
 # and pass it down to assembler.
-AS=$(CC) -c
+#AS=$(CC) -c
 ASFLAG=$(CFLAG)
 
 # For x86 assembler: Set PROCESSOR to 386 if you want to support
@@ -148,7 +148,7 @@ SHLIBDIRS= crypto
 SDIRS=  \
        sha hmac des aes modes \
        bn ec rsa dsa ecdsa dh ecdh \
-       buffer rand err evp cmac
+       buffer rand evp cmac
 # keep in mind that the above list is adjusted by ./Configure
 # according to no-xxx arguments...
 
@@ -205,7 +205,7 @@ CLEARENV=   TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS}     \
 
 BUILDENV=      PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \
                CC='$(CC)' CFLAG='$(CFLAG)'                     \
-               AS='$(CC)' ASFLAG='$(CFLAG) -c'                 \
+               ASFLAG='$(CFLAG) -c'                    \
                AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)'        \
                CROSS_COMPILE='$(CROSS_COMPILE)'        \
                PERL='$(PERL)' ENGDIRS='$(ENGDIRS)'             \
@@ -269,7 +269,6 @@ BUILD_ONE_CMD=\
 reflect:
        @[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
 
-
 # FIXME
 
 FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
@@ -282,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 \
@@ -308,8 +309,17 @@ 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 \
@@ -357,6 +367,11 @@ build_crypto:
        else \
                ARX='${AR}' ; \
        fi ; export ARX ; \
+       if [ $(FIPSCANISTERINTERNAL) = "y" ]; then \
+               AS='$(PERL) $${TOP}/util/fipsas.pl $${TOP} $${<} $(CC)' ; \
+       else \
+               AS='$(CC) -c' ; \
+       fi ; export AS ; \
                dir=crypto; target=all; $(BUILD_ONE_CMD)
 build_ssl:
        @dir=ssl; target=all; $(BUILD_ONE_CMD)