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

   1 From 90d5822f09f0b6a0f1d8d2e7189e702a18686ab7 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  util/libeay.num         |  2 +-
  17  3 files changed, 1 insertion(+), 17 deletions(-)
  18
  19 diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
  20 index 48ad0d2..a198c5f 100644
  21 --- a/crypto/engine/eng_all.c
  22 +++ b/crypto/engine/eng_all.c
  23 @@ -122,15 +122,3 @@ void ENGINE_load_builtin_engines(void)
  24  #endif
  25      ENGINE_register_all_complete();
  26  }
  27 -
  28 -#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
  29 -void ENGINE_setup_bsd_cryptodev(void)
  30 -{
  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 bd7b591..020d912 100644
  41 --- a/crypto/engine/engine.h
  42 +++ b/crypto/engine/engine.h
  43 @@ -857,10 +857,6 @@ typedef int (*dynamic_bind_engine) (ENGINE *e, const char *id,
  44   */
  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  /*
  53   * The following lines are auto generated by the script mkerr.pl. Any changes
  54 diff --git a/util/libeay.num b/util/libeay.num
  55 index 2094ab3..2742cf5 100755
  56 --- a/util/libeay.num
  57 +++ b/util/libeay.num
  58 @@ -2805,7 +2805,7 @@ BIO_indent                              3242      EXIST::FUNCTION:
  59  BUF_strlcpy                             3243   EXIST::FUNCTION:
  60  OpenSSLDie                              3244   EXIST::FUNCTION:
  61  OPENSSL_cleanse                         3245   EXIST::FUNCTION:
  62 -ENGINE_setup_bsd_cryptodev              3246   EXIST:__FreeBSD__:FUNCTION:ENGINE
  63 +ENGINE_setup_bsd_cryptodev              3246   NOEXIST::FUNCTION:
  64  ERR_release_err_state_table             3247   EXIST::FUNCTION:LHASH
  65  EVP_aes_128_cfb8                        3248   EXIST::FUNCTION:AES
  66  FIPS_corrupt_rsa                        3249   NOEXIST::FUNCTION:
  67 --
  68 2.7.3
  69