Module Name: src
Committed By: christos
Date: Sat Dec 8 17:07:27 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/dist/crypto/engine: eng_devcrypto.c
src/crypto/external/bsd/openssl/include/openssl: opensslconf.h
src/crypto/external/bsd/openssl/lib/libcrypto: engine.inc
Log Message:
Put back devcrypto (what was called cryptodev) engine support.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/include/openssl/opensslconf.h
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/openssl/lib/libcrypto/engine.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c:1.1.1.1 src/crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c:1.2
--- src/crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c:1.1.1.1 Sun Sep 23 09:17:46 2018
+++ src/crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c Sat Dec 8 12:07:27 2018
@@ -177,7 +177,8 @@ static int cipher_do_cipher(EVP_CIPHER_C
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));
}
Index: src/crypto/external/bsd/openssl/include/openssl/opensslconf.h
diff -u src/crypto/external/bsd/openssl/include/openssl/opensslconf.h:1.6 src/crypto/external/bsd/openssl/include/openssl/opensslconf.h:1.7
--- src/crypto/external/bsd/openssl/include/openssl/opensslconf.h:1.6 Mon Oct 15 08:45:52 2018
+++ src/crypto/external/bsd/openssl/include/openssl/opensslconf.h Sat Dec 8 12:07:27 2018
@@ -45,8 +45,10 @@ extern "C" {
#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
Index: src/crypto/external/bsd/openssl/lib/libcrypto/engine.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/engine.inc:1.12 src/crypto/external/bsd/openssl/lib/libcrypto/engine.inc:1.13
--- src/crypto/external/bsd/openssl/lib/libcrypto/engine.inc:1.12 Sun Sep 23 09:33:04 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/engine.inc Sat Dec 8 12:07:27 2018
@@ -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 @@ ENGINE_SRCS += \
eng_all.c \
eng_cnf.c \
eng_ctrl.c \
+eng_devcrypto.c \
eng_dyn.c \
eng_err.c \
eng_fat.c \
