Change RNG test to block oriented instead of request oriented, add option

[openssl.git] / Makefile.fips

diff --git a/Makefile.fips b/Makefile.fips
index 8a26206e5cf4e48180ea3903317617d44c539e77..8d967b7f2afd74a73dea09e5ce8c53c13a637884 100644 (file)
--- a/Makefile.fips
+++ b/Makefile.fips
@@ -148,15 +148,15 @@ SHLIBDIRS= crypto
 SDIRS=  \
        sha hmac des aes modes \
        bn ec rsa dsa ecdsa dh \
-       buffer rand evp # ecdh cmac
+       buffer rand evp ecdh cmac
 # keep in mind that the above list is adjusted by ./Configure
 # according to no-xxx arguments...
 
 LINKDIRS=  \
        objects sha hmac des aes modes \
-       bn ec rsa dsa ecdsa dh ecdh engine \
+       bn ec rsa dsa ecdh ecdsa dh engine \
        buffer bio stack lhash rand err \
-       evp asn1 ui cmac
+       evp asn1 ui
 
 # tests to perform.  "alltests" is a special word indicating that all tests
 # should be performed.
@@ -301,6 +301,7 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
        ../crypto/bn/bn_word.o \
        ../crypto/bn/bn_x931p.o \
        ../crypto/buffer/buf_str.o \
+       ../crypto/cmac/cmac.o \
        ../crypto/cryptlib.o \
        ../crypto/des/cfb64ede.o \
        ../crypto/des/cfb64enc.o \
@@ -325,6 +326,8 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
        ../crypto/ec/ecp_smpl.o \
        ../crypto/ec/ec2_mult.o \
        ../crypto/ec/ec2_smpl.o \
+       ../crypto/ecdh/ech_key.o \
+       ../crypto/ecdh/ech_ossl.o \
        ../crypto/ecdsa/ecs_ossl.o \
        ../crypto/evp/e_aes.o \
        ../crypto/evp/e_des3.o \