openwrt/package/openssl/patches/remove_fips.patch

   1 diff -urN openssl-0.9.7e.old/Makefile.org openssl-0.9.7e/Makefile.org
   2 --- openssl-0.9.7e.old/Makefile.org     2004-09-28 22:52:14.000000000 +0200
   3 +++ openssl-0.9.7e/Makefile.org 2005-03-03 15:55:11.000000000 +0100
   4 @@ -175,8 +175,8 @@
   5  # we might set SHLIB_MARK to '$(SHARED_LIBS)'.
   6  SHLIB_MARK=
   7
   8 -DIRS=   crypto fips ssl $(SHLIB_MARK) sigs apps test tools
   9 -SHLIBDIRS= fips crypto ssl
  10 +DIRS=   crypto ssl $(SHLIB_MARK) sigs apps test tools
  11 +SHLIBDIRS= crypto ssl
  12
  13  # dirs in crypto to build
  14  SDIRS=  objects \
  15 @@ -229,7 +229,6 @@
  16  libcrypto.a.sha1: libcrypto.a
  17         if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
  18                 $(RANLIB) libcrypto.a; \
  19 -               fips/sha1/fips_standalone_sha1 libcrypto.a > libcrypto.a.sha1; \
  20         fi
  21
  22  sub_all:
  23 --- openssl-0.9.7e/crypto/rand/rand_lib.c 2004-07-30 16:38:00.000000000 +0200
  24 +++ openssl-0.9.7e.patched/crypto/rand/rand_lib.c 2005-02-18 15:46:22.000000000 +0100
  25 @@ -63,8 +63,10 @@
  26  #ifndef OPENSSL_NO_ENGINE
  27  #include <openssl/engine.h>
  28  #endif
  29 +#ifdef OPENSSL_FIPS
  30  #include <openssl/fips.h>
  31  #include <openssl/fips_rand.h>
  32 +#endif
  33
  34  #ifndef OPENSSL_NO_ENGINE
  35  /* non-NULL if default_RAND_meth is ENGINE-provided */