summaryrefslogtreecommitdiffstats
path: root/recipes-connectivity/openssl/openssl-qoriq/qoriq/0001-remove-double-initialization-of-cryptodev-engine.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-connectivity/openssl/openssl-qoriq/qoriq/0001-remove-double-initialization-of-cryptodev-engine.patch')
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0001-remove-double-initialization-of-cryptodev-engine.patch21
1 files changed, 3 insertions, 18 deletions
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0001-remove-double-initialization-of-cryptodev-engine.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0001-remove-double-initialization-of-cryptodev-engine.patch
index 5e99d912..67314cd2 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0001-remove-double-initialization-of-cryptodev-engine.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0001-remove-double-initialization-of-cryptodev-engine.patch
@@ -1,4 +1,4 @@
1From 45e4b0835ad965cf9cc813a31df354f1e6d14513 Mon Sep 17 00:00:00 2001 1From 90d5822f09f0b6a0f1d8d2e7189e702a18686ab7 Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@freescale.com> 2From: Cristian Stoica <cristian.stoica@freescale.com>
3Date: Tue, 10 Sep 2013 12:46:46 +0300 3Date: Tue, 10 Sep 2013 12:46:46 +0300
4Subject: [PATCH 01/48] remove double initialization of cryptodev engine 4Subject: [PATCH 01/48] remove double initialization of cryptodev engine
@@ -13,9 +13,8 @@ Reviewed-on: http://git.am.freescale.net:8181/17222
13--- 13---
14 crypto/engine/eng_all.c | 12 ------------ 14 crypto/engine/eng_all.c | 12 ------------
15 crypto/engine/engine.h | 4 ---- 15 crypto/engine/engine.h | 4 ----
16 crypto/evp/c_all.c | 5 -----
17 util/libeay.num | 2 +- 16 util/libeay.num | 2 +-
18 4 files changed, 1 insertion(+), 22 deletions(-) 17 3 files changed, 1 insertion(+), 17 deletions(-)
19 18
20diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c 19diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
21index 48ad0d2..a198c5f 100644 20index 48ad0d2..a198c5f 100644
@@ -52,20 +51,6 @@ index bd7b591..020d912 100644
52 /* BEGIN ERROR CODES */ 51 /* BEGIN ERROR CODES */
53 /* 52 /*
54 * The following lines are auto generated by the script mkerr.pl. Any changes 53 * The following lines are auto generated by the script mkerr.pl. Any changes
55diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c
56index a3ed00d..719e34d 100644
57--- a/crypto/evp/c_all.c
58+++ b/crypto/evp/c_all.c
59@@ -82,9 +82,4 @@ void OPENSSL_add_all_algorithms_noconf(void)
60 OPENSSL_cpuid_setup();
61 OpenSSL_add_all_ciphers();
62 OpenSSL_add_all_digests();
63-#ifndef OPENSSL_NO_ENGINE
64-# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
65- ENGINE_setup_bsd_cryptodev();
66-# endif
67-#endif
68 }
69diff --git a/util/libeay.num b/util/libeay.num 54diff --git a/util/libeay.num b/util/libeay.num
70index 2094ab3..2742cf5 100755 55index 2094ab3..2742cf5 100755
71--- a/util/libeay.num 56--- a/util/libeay.num
@@ -80,5 +65,5 @@ index 2094ab3..2742cf5 100755
80 EVP_aes_128_cfb8 3248 EXIST::FUNCTION:AES 65 EVP_aes_128_cfb8 3248 EXIST::FUNCTION:AES
81 FIPS_corrupt_rsa 3249 NOEXIST::FUNCTION: 66 FIPS_corrupt_rsa 3249 NOEXIST::FUNCTION:
82-- 67--
832.7.0 682.7.3
84 69