Merge branch 'openssl-bench-update'

diff --cc ChangeLog
index 77ea99abc5898edafcfd6900fb10d0372a308069,0bea7af66fa0fdadc8a3168edc083337df9d8a26..10f8e064c0dea00de5d912fd90a8486d2b469d2e
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,18 -1,22 +1,37 @@@
 +2017-08-27  Niels Möller  <nisse@lysator.liu.se>
 +
 +      * configure.ac (GMP_NUMB_BITS): Set to dummy value "n/a" in
 +      mini-gmp builds.
 +      (NUMB_BITS): New substituted variable which always holds the
 +      configured value.
 +      * Makefile.in (GMP_NUMB_BITS): Renamed variable...
 +      (NUMB_BITS): ...new name
 +      * config.make.in: Update corresponding substitution.
 +
 +2017-08-26  Niels Möller  <nisse@lysator.liu.se>
 +
 +      * ecc-mod-inv.c (ecc_mod_inv): Add missing assert. Fixes a
 +      "dead increment" warning from the clang static analyzer.
 +
+ 2017-08-26  Niels Möller  <nisse@lysator.liu.se>
+ 
+       * examples/nettle-openssl.c (struct openssl_cipher_ctx): New
+       struct. Use everywhere, instead of typing EVP_CIPHER_CTX pointers
+       directly.
+ 
+       * configure.ac: Update openssl-related tests. Checks for
+       cipher-specific headers are replaced by a check for openssl/evp.h,
+       and the check for the BF_ecb_encrypt function is replaced by a
+       check for EVP_CIPHER_CTX_new.
+ 
+ 2017-08-03  Daniel P. Berrange  <berrange@redhat.com>
+ 
+       * examples/nettle-openssl.c: Rewritten to use openssl's EVP APIs.
+       The older cipher-specific functions always use openssl's generic
+       software implementation, while the EVP functions enables
+       platform-specific code, e.g., using the x86 AES-NI instructions.
+       (nettle_openssl_init): New function.
+ 
  2017-07-18  Niels Möller  <nisse@lysator.liu.se>
  
        * ecc-add-eh.c (ecc_add_eh): Fix in-place operation by reordering

diff --cc configure.ac
Simple merge