Merge branch 'vendor/OPENSSL'
authorPeter Avalos <pavalos@dragonflybsd.org>
Wed, 3 Aug 2016 08:18:34 +0000 (01:18 -0700)
committerPeter Avalos <pavalos@dragonflybsd.org>
Wed, 3 Aug 2016 08:18:34 +0000 (01:18 -0700)
1  2 
crypto/openssl/crypto/engine/eng_all.c
crypto/openssl/crypto/engine/eng_cryptodev.c
crypto/openssl/crypto/engine/engine.h

@@@ -73,12 -73,9 +73,9 @@@ void ENGINE_load_builtin_engines(void
       */
      ENGINE_load_openssl();
  #endif
 -#if !defined(OPENSSL_NO_HW) && (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV))
 +#if !defined(OPENSSL_NO_HW) && (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(HAVE_CRYPTODEV))
      ENGINE_load_cryptodev();
  #endif
- #ifndef OPENSSL_NO_RSAX
-     ENGINE_load_rsax();
- #endif
  #ifndef OPENSSL_NO_RDRAND
      ENGINE_load_rdrand();
  #endif
Simple merge