[src/trunk]: src/crypto/external/bsd/openssl Put back devcrypto (what was cal...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/64b31ebafebf
branches:  trunk
changeset: 837510:64b31ebafebf
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Dec 08 17:07:27 2018 +0000

description:
Put back devcrypto (what was called cryptodev) engine support.

diffstat:

 crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c |  3 ++-
 crypto/external/bsd/openssl/include/openssl/opensslconf.h      |  6 ++++--
 crypto/external/bsd/openssl/lib/libcrypto/engine.inc           |  3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diffs (46 lines):

diff -r 6603f2df11bf -r 64b31ebafebf crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c
--- a/crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c    Sat Dec 08 15:31:30 2018 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c    Sat Dec 08 17:07:27 2018 +0000
@@ -177,7 +177,8 @@
     if (EVP_CIPHER_CTX_iv_length(ctx) > 0) {
         assert(inl >= EVP_CIPHER_CTX_iv_length(ctx));
         if (!EVP_CIPHER_CTX_encrypting(ctx)) {
-            unsigned char *ivptr = in + inl - EVP_CIPHER_CTX_iv_length(ctx);
+            const unsigned char *ivptr =
+               in + inl - EVP_CIPHER_CTX_iv_length(ctx);
 
             memcpy(saved_iv, ivptr, EVP_CIPHER_CTX_iv_length(ctx));
         }
diff -r 6603f2df11bf -r 64b31ebafebf crypto/external/bsd/openssl/include/openssl/opensslconf.h
--- a/crypto/external/bsd/openssl/include/openssl/opensslconf.h Sat Dec 08 15:31:30 2018 +0000
+++ b/crypto/external/bsd/openssl/include/openssl/opensslconf.h Sat Dec 08 17:07:27 2018 +0000
@@ -45,8 +45,10 @@
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
 # define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
 #endif
-#ifndef OPENSSL_NO_DEVCRYPTOENG
-# define OPENSSL_NO_DEVCRYPTOENG
+#if 0
+# ifndef OPENSSL_NO_DEVCRYPTOENG
+#  define OPENSSL_NO_DEVCRYPTOENG
+# endif
 #endif
 #if !defined(_LP64) || defined(__sparc64__)
 # ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
diff -r 6603f2df11bf -r 64b31ebafebf crypto/external/bsd/openssl/lib/libcrypto/engine.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/engine.inc      Sat Dec 08 15:31:30 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/engine.inc      Sat Dec 08 17:07:27 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: engine.inc,v 1.12 2018/09/23 13:33:04 christos Exp $
+#      $NetBSD: engine.inc,v 1.13 2018/12/08 17:07:27 christos Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -13,6 +13,7 @@
 eng_all.c \
 eng_cnf.c \
 eng_ctrl.c \
+eng_devcrypto.c \
 eng_dyn.c \
 eng_err.c \
 eng_fat.c \