add null cipher to FIPS module

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index 551530c9245794eee773a506106aa723a1a421cc..3e95c0a025f958ba9623c53415aa62e4fe2fba46 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -268,9 +268,6 @@ BUILD_ONE_CMD=\
 reflect:
        @[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
 
 reflect:
        @[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
 

-
-# FIXME
-

 FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
        ../crypto/aes/aes_ecb.o \
        ../crypto/aes/aes_ofb.o \
 FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
        ../crypto/aes/aes_ecb.o \
        ../crypto/aes/aes_ofb.o \


@@ -325,20 +322,19 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
        ../crypto/ecdsa/ecs_ossl.o \
        ../crypto/evp/e_aes.o \
        ../crypto/evp/e_des3.o \
        ../crypto/ecdsa/ecs_ossl.o \
        ../crypto/evp/e_aes.o \
        ../crypto/evp/e_des3.o \

+       ../crypto/evp/e_null.o \

        ../crypto/evp/m_sha1.o \
        ../crypto/evp/m_sha1.o \

+       ../crypto/evp/m_dss1.o \
+       ../crypto/evp/m_dss.o \
+       ../crypto/evp/m_ecdsa.o \

        ../crypto/hmac/hmac.o \
        ../crypto/modes/cbc128.o \
        ../crypto/hmac/hmac.o \
        ../crypto/modes/cbc128.o \

+       ../crypto/modes/ccm128.o \

        ../crypto/modes/cfb128.o \
        ../crypto/modes/ctr128.o \
        ../crypto/modes/gcm128.o \
        ../crypto/modes/ofb128.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 \
-       ../crypto/rand/randfile.o \
-       ../crypto/rand/rand_lib.o \
-       ../crypto/rand/rand_os2.o \
-       ../crypto/rand/rand_unix.o \
-       ../crypto/rand/rand_win.o \
+       ../crypto/modes/xts128.o \

        ../crypto/rsa/rsa_eay.o \
        ../crypto/rsa/rsa_gen.o \
        ../crypto/rsa/rsa_crpt.o \
        ../crypto/rsa/rsa_eay.o \
        ../crypto/rsa/rsa_gen.o \
        ../crypto/rsa/rsa_crpt.o \