Add FIPS support to the WIN32 build system.

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index ddc4e827c165d2fa38a17085d06d1693794826b7..b608f710e9df87e9a0517e7769230cc0d658925e 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -313,6 +313,7 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.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/ofb128.o \
@@ -332,6 +333,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 \
@@ -369,8 +371,12 @@ all_testapps: build_libs build_testapps
 build_testapps:
        @dir=crypto; target=testapps; $(BUILD_ONE_CMD)
 
-libcrypto$(SHLIB_EXT): libcrypto.a
+libcrypto$(SHLIB_EXT): libcrypto.a build_fips
        @if [ "$(SHLIB_TARGET)" != "" ]; then \
+               if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
+                       FIPSLD_CC="$(CC)"; CC=fips/fipsld; \
+                       export CC FIPSLD_CC; \
+               fi; \
                $(MAKE) SHLIBDIRS=crypto build-shared; \
        else \
                echo "There's no support for shared libraries on this platform" >&2; \