Updated openssl cryptodev patch.

diff --git a/lfs/openssl b/lfs/openssl
index e1602a4071f61bf9ef29ae79e93ddd860b71e53e..1599c7b568d8dc1dde57ead22e665b4b5ff88a0e 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-0.9.8k-cryptodev.diff
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-0.9.8n-cryptodev.diff
 ifeq "$(PADLOCK)" "1"
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-0.9.8g-engine-padlock.patch
 endif

diff --git a/src/patches/openssl-0.9.8k-cryptodev.diff b/src/patches/openssl-0.9.8n-cryptodev.diff
similarity index 59%
rename from src/patches/openssl-0.9.8k-cryptodev.diff
rename to src/patches/openssl-0.9.8n-cryptodev.diff
index 0a4793a2d843926a920523c4fcbbc98e2e8e65e9..0913f9a5cbb1415073a0558dd9acdcb029ffd91f 100644 (file)
--- a/src/patches/openssl-0.9.8k-cryptodev.diff
+++ b/src/patches/openssl-0.9.8n-cryptodev.diff
@@ -1,15 +1,13 @@
-diff -ur openssl-0.9.8k/crypto/engine/eng_all.c openssl-0.9.8k.new/crypto/engine/eng_all.c
---- openssl-0.9.8k/crypto/engine/eng_all.c     2008-06-04 21:01:39.000000000 +0300
-+++ openssl-0.9.8k.new/crypto/engine/eng_all.c 2009-11-24 13:41:49.000000000 +0200
-@@ -104,16 +104,15 @@
+diff -Naur openssl-0.9.8n.org/crypto/engine/eng_all.c openssl-0.9.8n/crypto/engine/eng_all.c
+--- openssl-0.9.8n.org/crypto/engine/eng_all.c 2010-03-01 01:30:11.000000000 +0100
++++ openssl-0.9.8n/crypto/engine/eng_all.c     2010-03-30 08:11:26.000000000 +0200
+@@ -104,16 +104,13 @@
  #endif
  #endif
  #ifndef OPENSSL_NO_HW
--#if defined(__OpenBSD__) || defined(__FreeBSD__)
-+# if (OpenBSD >= 200112) || ((__FreeBSD_version >= 470101 && __FreeBSD_version < 500000) || __FreeBSD_version >= 500041) || defined(__linux__)
+-#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
        ENGINE_load_cryptodev();
 -#endif
-+# endif
  #if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
        ENGINE_load_capi();
  #endif
@@ -20,17 +18,17 @@ diff -ur openssl-0.9.8k/crypto/engine/eng_all.c openssl-0.9.8k.new/crypto/engine
  void ENGINE_setup_bsd_cryptodev(void) {
        static int bsd_cryptodev_default_loaded = 0;
        if (!bsd_cryptodev_default_loaded) {
-@@ -122,4 +121,3 @@
+@@ -122,4 +119,3 @@
        }
        bsd_cryptodev_default_loaded=1;
  }
 -#endif
-diff -ur openssl-0.9.8k/crypto/engine/eng_cryptodev.c openssl-0.9.8k.new/crypto/engine/eng_cryptodev.c
---- openssl-0.9.8k/crypto/engine/eng_cryptodev.c       2004-06-15 14:45:42.000000000 +0300
-+++ openssl-0.9.8k.new/crypto/engine/eng_cryptodev.c   2009-11-24 13:45:31.000000000 +0200
-@@ -34,14 +34,15 @@
+diff -Naur openssl-0.9.8n.org/crypto/engine/eng_cryptodev.c openssl-0.9.8n/crypto/engine/eng_cryptodev.c
+--- openssl-0.9.8n.org/crypto/engine/eng_cryptodev.c   2010-03-03 16:30:05.000000000 +0100
++++ openssl-0.9.8n/crypto/engine/eng_cryptodev.c       2010-03-30 08:01:11.000000000 +0200
+@@ -38,14 +38,15 @@
  #if (defined(__unix__) || defined(unix)) && !defined(USG) && \
-       (defined(OpenBSD) || defined(__FreeBSD_version))
+       (defined(OpenBSD) || defined(__FreeBSD__))
  #include <sys/param.h>
 -# if (OpenBSD >= 200112) || ((__FreeBSD_version >= 470101 && __FreeBSD_version < 500000) || __FreeBSD_version >= 500041)
 -#  define HAVE_CRYPTODEV
@@ -47,7 +45,7 @@ diff -ur openssl-0.9.8k/crypto/engine/eng_cryptodev.c openssl-0.9.8k.new/crypto/
  #ifndef HAVE_CRYPTODEV
  
  void
-@@ -54,7 +55,12 @@
+@@ -58,7 +59,12 @@
  #else 
   
  #include <sys/types.h>
@@ -61,7 +59,7 @@ diff -ur openssl-0.9.8k/crypto/engine/eng_cryptodev.c openssl-0.9.8k.new/crypto/
  #include <sys/ioctl.h>
  #include <errno.h>
  #include <stdio.h>
-@@ -77,7 +83,11 @@
+@@ -81,7 +87,11 @@
  static int get_dev_crypto(void);
  static int cryptodev_max_iv(int cipher);
  static int cryptodev_key_length_valid(int cipher, int len);
@@ -72,12 +70,12 @@ diff -ur openssl-0.9.8k/crypto/engine/eng_cryptodev.c openssl-0.9.8k.new/crypto/
 + static char *cipher_nid_to_cryptodev_name(int nid);
 +#endif
  static int get_cryptodev_ciphers(const int **cnids);
- static int get_cryptodev_digests(const int **cnids);
+ /*static int get_cryptodev_digests(const int **cnids);*/
  static int cryptodev_usable_ciphers(const int **nids);
-diff -ur openssl-0.9.8k/crypto/engine/engine.h openssl-0.9.8k.new/crypto/engine/engine.h
---- openssl-0.9.8k/crypto/engine/engine.h      2008-06-04 21:01:40.000000000 +0300
-+++ openssl-0.9.8k.new/crypto/engine/engine.h  2009-11-24 13:41:49.000000000 +0200
-@@ -703,9 +703,7 @@
+diff -Naur openssl-0.9.8n.org/crypto/engine/engine.h openssl-0.9.8n/crypto/engine/engine.h
+--- openssl-0.9.8n.org/crypto/engine/engine.h  2010-02-09 15:18:15.000000000 +0100
++++ openssl-0.9.8n/crypto/engine/engine.h      2010-03-30 08:01:11.000000000 +0200
+@@ -705,9 +705,7 @@
   * values. */
  void *ENGINE_get_static_state(void);
  
@@ -87,9 +85,9 @@ diff -ur openssl-0.9.8k/crypto/engine/engine.h openssl-0.9.8k.new/crypto/engine/
  
  /* BEGIN ERROR CODES */
  /* The following lines are auto generated by the script mkerr.pl. Any changes
-diff -ur openssl-0.9.8k/crypto/evp/c_all.c openssl-0.9.8k.new/crypto/evp/c_all.c
---- openssl-0.9.8k/crypto/evp/c_all.c  2004-08-29 19:36:04.000000000 +0300
-+++ openssl-0.9.8k.new/crypto/evp/c_all.c      2009-11-24 13:41:49.000000000 +0200
+diff -Naur openssl-0.9.8n.org/crypto/evp/c_all.c openssl-0.9.8n/crypto/evp/c_all.c
+--- openssl-0.9.8n.org/crypto/evp/c_all.c      2004-08-29 18:36:04.000000000 +0200
++++ openssl-0.9.8n/crypto/evp/c_all.c  2010-03-30 08:01:11.000000000 +0200
 @@ -83,8 +83,6 @@
        OpenSSL_add_all_ciphers();
        OpenSSL_add_all_digests();