code.ossystems Code Review - meta-freescale.git/blob

   1 From 45e4b0835ad965cf9cc813a31df354f1e6d14513 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/48] 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 | 12 ------------
  15  crypto/engine/engine.h  |  4 ----
  16  crypto/evp/c_all.c      |  5 -----
  17  util/libeay.num         |  2 +-
  18  4 files changed, 1 insertion(+), 22 deletions(-)
  19
  20 diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
  21 index 48ad0d2..a198c5f 100644
  22 --- a/crypto/engine/eng_all.c
  23 +++ b/crypto/engine/eng_all.c
  24 @@ -122,15 +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 -{
  32 -    static int bsd_cryptodev_default_loaded = 0;
  33 -    if (!bsd_cryptodev_default_loaded) {
  34 -        ENGINE_load_cryptodev();
  35 -        ENGINE_register_all_complete();
  36 -    }
  37 -    bsd_cryptodev_default_loaded = 1;
  38 -}
  39 -#endif
  40 diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h
  41 index bd7b591..020d912 100644
  42 --- a/crypto/engine/engine.h
  43 +++ b/crypto/engine/engine.h
  44 @@ -857,10 +857,6 @@ typedef int (*dynamic_bind_engine) (ENGINE *e, const char *id,
  45   */
  46  void *ENGINE_get_static_state(void);
  47
  48 -# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
  49 -void ENGINE_setup_bsd_cryptodev(void);
  50 -# endif
  51 -
  52  /* BEGIN ERROR CODES */
  53  /*
  54   * The following lines are auto generated by the script mkerr.pl. Any changes
  55 diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c
  56 index 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  }
  69 diff --git a/util/libeay.num b/util/libeay.num
  70 index 2094ab3..2742cf5 100755
  71 --- a/util/libeay.num
  72 +++ b/util/libeay.num
  73 @@ -2805,7 +2805,7 @@ BIO_indent                              3242      EXIST::FUNCTION:
  74  BUF_strlcpy                             3243   EXIST::FUNCTION:
  75  OpenSSLDie                              3244   EXIST::FUNCTION:
  76  OPENSSL_cleanse                         3245   EXIST::FUNCTION:
  77 -ENGINE_setup_bsd_cryptodev              3246   EXIST:__FreeBSD__:FUNCTION:ENGINE
  78 +ENGINE_setup_bsd_cryptodev              3246   NOEXIST::FUNCTION:
  79  ERR_release_err_state_table             3247   EXIST::FUNCTION:LHASH
  80  EVP_aes_128_cfb8                        3248   EXIST::FUNCTION:AES
  81  FIPS_corrupt_rsa                        3249   NOEXIST::FUNCTION:
  82 --
  83 2.7.0
  84