diff options
| author | Nicolas Thill <nico@openwrt.org> | 2005-10-20 04:10:38 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2005-10-20 04:10:38 +0000 |
| commit | fd433b2b9183c002424eb6fdb912d89ae5553c0a (patch) | |
| tree | 03e7eb382ec26eb6c332222dc3cc68102afbce2b /package/openssl/patches/150-remove-fips.patch | |
| parent | 4b60e9bd89f6d8201543572376a543c22282c097 (diff) | |
| download | upstream-fd433b2b9183c002424eb6fdb912d89ae5553c0a.tar.gz upstream-fd433b2b9183c002424eb6fdb912d89ae5553c0a.tar.bz2 upstream-fd433b2b9183c002424eb6fdb912d89ae5553c0a.zip | |
update openssl to new upstream release (v0.9.7i),
enable engine support.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2187 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/openssl/patches/150-remove-fips.patch')
| -rw-r--r-- | package/openssl/patches/150-remove-fips.patch | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/package/openssl/patches/150-remove-fips.patch b/package/openssl/patches/150-remove-fips.patch index 3af1550a30..e4e3cb4870 100644 --- a/package/openssl/patches/150-remove-fips.patch +++ b/package/openssl/patches/150-remove-fips.patch @@ -1,11 +1,21 @@ -diff -Nur openssl-0.9.7f/Makefile.org openssl-0.9.7f.new/Makefile.org ---- openssl-0.9.7f/Makefile.org 2005-03-15 10:46:13.000000000 +0100 -+++ openssl-0.9.7f.new/Makefile.org 2005-04-03 20:15:26.000000000 +0200 -@@ -229,7 +229,6 @@ +diff -ruN openssl-0.9.7h-old/Makefile.org openssl-0.9.7h-new/Makefile.org +--- openssl-0.9.7h-old/Makefile.org 2005-10-12 23:12:38.000000000 +0200 ++++ openssl-0.9.7h-new/Makefile.org 2005-10-12 23:13:38.000000000 +0200 +@@ -230,7 +230,6 @@ libcrypto.a.sha1: libcrypto.a @if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \ $(RANLIB) libcrypto.a; \ -- fips/sha1/fips_standalone_sha1 libcrypto.a > libcrypto.a.sha1; \ +- fips/sha/fips_standalone_sha1 libcrypto.a > libcrypto.a.sha1; \ fi sub_all: +@@ -258,9 +257,6 @@ + libcrypto$(SHLIB_EXT): libcrypto.a + @if [ "$(SHLIB_TARGET)" != "" ]; then \ + $(MAKE) SHLIBDIRS=crypto build-shared; \ +- if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \ +- fips/sha/fips_standalone_sha1 -binary $@ > $@.$${HMAC_EXT:-sha1}; \ +- fi; \ + else \ + echo "There's no support for shared libraries on this platform" >&2; \ + fi |