openssl: Update to version 1.1

[ipfire-2.x.git] / src / patches / openssl-1.0.2a_auto_enable_padlock.patch

diff --git a/src/patches/openssl-1.0.2a_auto_enable_padlock.patch b/src/patches/openssl-1.0.2a_auto_enable_padlock.patch
deleted file mode 100644 (file)
index b5c0e95..0000000
--- a/src/patches/openssl-1.0.2a_auto_enable_padlock.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Naur openssl-1.0.2a.org/crypto/engine/eng_all.c openssl-1.0.2a/crypto/engine/eng_all.c
---- openssl-1.0.2a.org/crypto/engine/eng_all.c 2015-03-19 14:30:36.000000000 +0100
-+++ openssl-1.0.2a/crypto/engine/eng_all.c     2015-04-27 12:27:05.063569969 +0200
-@@ -120,6 +120,14 @@
-     ENGINE_load_capi();
- # endif
- #endif
-+#ifdef OPENSSL_NO_STATIC_ENGINE
-+      ENGINE *e;
-+      e = ENGINE_by_id("padlock");
-+      if (e != NULL) {
-+              ENGINE_add(e);
-+              ENGINE_free(e);
-+      }
-+#endif
-     ENGINE_register_all_complete();
- }
- 
-diff -Naur openssl-1.0.2a.org/ssl/ssl_algs.c openssl-1.0.2a/ssl/ssl_algs.c
---- openssl-1.0.2a.org/ssl/ssl_algs.c  2015-03-19 14:30:36.000000000 +0100
-+++ openssl-1.0.2a/ssl/ssl_algs.c      2015-04-27 11:04:27.893399695 +0200
-@@ -151,5 +151,12 @@
- #endif
-     /* initialize cipher/digest methods table */
-     ssl_load_ciphers();
-+
-+    /* Init available hardware crypto engines */
-+    ENGINE_load_builtin_engines();
-+    ENGINE_register_all_complete();
-+    ENGINE * padlock = ENGINE_by_id("padlock");
-+    if (padlock) ENGINE_set_default_ciphers(padlock);
-+
-     return (1);
- }