openssl-qoriq: upgrade to 1.0.2k

Signed-off-by: Chunrong Guo <B40290@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

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 @@
-From 45e4b0835ad965cf9cc813a31df354f1e6d14513 Mon Sep 17 00:00:00 2001
+From 90d5822f09f0b6a0f1d8d2e7189e702a18686ab7 Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@freescale.com>
 Date: Tue, 10 Sep 2013 12:46:46 +0300
 Subject: [PATCH 01/48] remove double initialization of cryptodev engine
@@ -13,9 +13,8 @@ Reviewed-on: http://git.am.freescale.net:8181/17222
 ---
  crypto/engine/eng_all.c | 12 ------------
  crypto/engine/engine.h  |  4 ----
- crypto/evp/c_all.c      |  5 -----
  util/libeay.num         |  2 +-
- 4 files changed, 1 insertion(+), 22 deletions(-)
+ 3 files changed, 1 insertion(+), 17 deletions(-)
 
 diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
 index 48ad0d2..a198c5f 100644
@@ -52,20 +51,6 @@ index bd7b591..020d912 100644
  /* BEGIN ERROR CODES */
  /*
   * The following lines are auto generated by the script mkerr.pl. Any changes
-diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c
-index a3ed00d..719e34d 100644
---- a/crypto/evp/c_all.c
-+++ b/crypto/evp/c_all.c
-@@ -82,9 +82,4 @@ void OPENSSL_add_all_algorithms_noconf(void)
-     OPENSSL_cpuid_setup();
-     OpenSSL_add_all_ciphers();
-     OpenSSL_add_all_digests();
--#ifndef OPENSSL_NO_ENGINE
--# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
--    ENGINE_setup_bsd_cryptodev();
--# endif
--#endif
- }
 diff --git a/util/libeay.num b/util/libeay.num
 index 2094ab3..2742cf5 100755
 --- a/util/libeay.num
@@ -80,5 +65,5 @@ index 2094ab3..2742cf5 100755
  EVP_aes_128_cfb8                        3248   EXIST::FUNCTION:AES
  FIPS_corrupt_rsa                        3249   NOEXIST::FUNCTION:
 -- 
-2.7.0
+2.7.3