diff options
Diffstat (limited to 'recipes-connectivity/openssl/openssl-fsl/0001-remove-double-initialization-of-cryptodev-engine.patch')
| -rw-r--r-- | recipes-connectivity/openssl/openssl-fsl/0001-remove-double-initialization-of-cryptodev-engine.patch | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/recipes-connectivity/openssl/openssl-fsl/0001-remove-double-initialization-of-cryptodev-engine.patch b/recipes-connectivity/openssl/openssl-fsl/0001-remove-double-initialization-of-cryptodev-engine.patch deleted file mode 100644 index e7b874f5f..000000000 --- a/recipes-connectivity/openssl/openssl-fsl/0001-remove-double-initialization-of-cryptodev-engine.patch +++ /dev/null | |||
| @@ -1,83 +0,0 @@ | |||
| 1 | From 9297e3834518ff0558d6e7004a62adfd107e659a Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Cristian Stoica <cristian.stoica@freescale.com> | ||
| 3 | Date: Tue, 10 Sep 2013 12:46:46 +0300 | ||
| 4 | Subject: [PATCH 01/26] remove double initialization of cryptodev engine | ||
| 5 | |||
| 6 | cryptodev engine is initialized together with the other engines in | ||
| 7 | ENGINE_load_builtin_engines. The initialization done through | ||
| 8 | OpenSSL_add_all_algorithms is redundant. | ||
| 9 | |||
| 10 | Change-Id: Ic9488500967595543ff846f147b36f383db7cb27 | ||
| 11 | Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com> | ||
| 12 | Reviewed-on: http://git.am.freescale.net:8181/17222 | ||
| 13 | --- | ||
| 14 | crypto/engine/eng_all.c | 11 ----------- | ||
| 15 | crypto/engine/engine.h | 4 ---- | ||
| 16 | crypto/evp/c_all.c | 5 ----- | ||
| 17 | util/libeay.num | 2 +- | ||
| 18 | 4 files changed, 1 insertion(+), 21 deletions(-) | ||
| 19 | |||
| 20 | diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c | ||
| 21 | index 6093376..f16c043 100644 | ||
| 22 | --- a/crypto/engine/eng_all.c | ||
| 23 | +++ b/crypto/engine/eng_all.c | ||
| 24 | @@ -122,14 +122,3 @@ void ENGINE_load_builtin_engines(void) | ||
| 25 | #endif | ||
| 26 | ENGINE_register_all_complete(); | ||
| 27 | } | ||
| 28 | - | ||
| 29 | -#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) | ||
| 30 | -void ENGINE_setup_bsd_cryptodev(void) { | ||
| 31 | - static int bsd_cryptodev_default_loaded = 0; | ||
| 32 | - if (!bsd_cryptodev_default_loaded) { | ||
| 33 | - ENGINE_load_cryptodev(); | ||
| 34 | - ENGINE_register_all_complete(); | ||
| 35 | - } | ||
| 36 | - bsd_cryptodev_default_loaded=1; | ||
| 37 | -} | ||
| 38 | -#endif | ||
| 39 | diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h | ||
| 40 | index f8be497..237a6c9 100644 | ||
| 41 | --- a/crypto/engine/engine.h | ||
| 42 | +++ b/crypto/engine/engine.h | ||
| 43 | @@ -740,10 +740,6 @@ typedef int (*dynamic_bind_engine)(ENGINE *e, const char *id, | ||
| 44 | * values. */ | ||
| 45 | void *ENGINE_get_static_state(void); | ||
| 46 | |||
| 47 | -#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) | ||
| 48 | -void ENGINE_setup_bsd_cryptodev(void); | ||
| 49 | -#endif | ||
| 50 | - | ||
| 51 | /* BEGIN ERROR CODES */ | ||
| 52 | /* The following lines are auto generated by the script mkerr.pl. Any changes | ||
| 53 | * made after this point may be overwritten when the script is next run. | ||
| 54 | diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c | ||
| 55 | index 766c4ce..5d6c21b 100644 | ||
| 56 | --- a/crypto/evp/c_all.c | ||
| 57 | +++ b/crypto/evp/c_all.c | ||
| 58 | @@ -82,9 +82,4 @@ void OPENSSL_add_all_algorithms_noconf(void) | ||
| 59 | OPENSSL_cpuid_setup(); | ||
| 60 | OpenSSL_add_all_ciphers(); | ||
| 61 | OpenSSL_add_all_digests(); | ||
| 62 | -#ifndef OPENSSL_NO_ENGINE | ||
| 63 | -# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) | ||
| 64 | - ENGINE_setup_bsd_cryptodev(); | ||
| 65 | -# endif | ||
| 66 | -#endif | ||
| 67 | } | ||
| 68 | diff --git a/util/libeay.num b/util/libeay.num | ||
| 69 | index aa86b2b..ae50040 100755 | ||
| 70 | --- a/util/libeay.num | ||
| 71 | +++ b/util/libeay.num | ||
| 72 | @@ -2801,7 +2801,7 @@ BIO_indent 3242 EXIST::FUNCTION: | ||
| 73 | BUF_strlcpy 3243 EXIST::FUNCTION: | ||
| 74 | OpenSSLDie 3244 EXIST::FUNCTION: | ||
| 75 | OPENSSL_cleanse 3245 EXIST::FUNCTION: | ||
| 76 | -ENGINE_setup_bsd_cryptodev 3246 EXIST:__FreeBSD__:FUNCTION:ENGINE | ||
| 77 | +ENGINE_setup_bsd_cryptodev 3246 NOEXIST::FUNCTION: | ||
| 78 | ERR_release_err_state_table 3247 EXIST::FUNCTION:LHASH | ||
| 79 | EVP_aes_128_cfb8 3248 EXIST::FUNCTION:AES | ||
| 80 | FIPS_corrupt_rsa 3249 NOEXIST::FUNCTION: | ||
| 81 | -- | ||
| 82 | 2.3.5 | ||
| 83 | |||
