diff options
| author | marha <marha@users.sourceforge.net> | 2014-09-02 18:24:12 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-09-02 18:26:00 +0200 |
| commit | 04168ae281bfbd714ddf6b90d98eac892508dde8 (patch) | |
| tree | c2d7e42dede9c0b9930ce537eb7d804e45459e53 /openssl/test/Makefile | |
| parent | e21655632e3fd40b7f6a5cc3c7f3c379d54557c4 (diff) | |
| download | vcxsrv-04168ae281bfbd714ddf6b90d98eac892508dde8.tar.gz vcxsrv-04168ae281bfbd714ddf6b90d98eac892508dde8.tar.bz2 vcxsrv-04168ae281bfbd714ddf6b90d98eac892508dde8.zip | |
Upgrade openssl to version openssl-1.0.1i
Diffstat (limited to 'openssl/test/Makefile')
| -rw-r--r-- | openssl/test/Makefile | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/openssl/test/Makefile b/openssl/test/Makefile index 005f2e8d6..9fb62cf66 100644 --- a/openssl/test/Makefile +++ b/openssl/test/Makefile @@ -370,6 +370,13 @@ FIPS_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ link_app.$${shlib_target} +BUILD_CMD_STATIC=shlib_target=; \ + LIBRARIES="$(DLIBSSL) $(DLIBCRYPTO) $(LIBKRB5)"; \ + $(MAKE) -f $(TOP)/Makefile.shared -e \ + APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ + LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ + link_app.$${shlib_target} + $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) @target=$(RSATEST); $(BUILD_CMD) @@ -476,7 +483,7 @@ $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO) @target=$(SRPTEST); $(BUILD_CMD) $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO) - @target=$(HEARTBEATTEST); $(BUILD_CMD) + @target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC) #$(AESTEST).o: $(AESTEST).c # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c @@ -633,7 +640,7 @@ heartbeat_test.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h heartbeat_test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h heartbeat_test.o: ../include/openssl/tls1.h ../include/openssl/x509.h heartbeat_test.o: ../include/openssl/x509_vfy.h ../ssl/ssl_locl.h -heartbeat_test.o: heartbeat_test.c +heartbeat_test.o: ../test/testutil.h heartbeat_test.c hmactest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h hmactest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h hmactest.o: ../include/openssl/evp.h ../include/openssl/hmac.h |