|
@@ -1,4 +1,4 @@
|
|
|
-From f3cef70b34afde3afd13ce3636232d41533b0162 Mon Sep 17 00:00:00 2001
|
|
|
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
From: Eneas U de Queiroz <cote2004-github@yahoo.com>
|
|
|
Date: Tue, 6 Nov 2018 10:57:03 -0200
|
|
|
Subject: e_devcrypto: make the /dev/crypto engine dynamic
|
|
@@ -20,7 +20,7 @@ index e00802a3fd..47fe948966 100644
|
|
|
- SOURCE[../../libcrypto]=eng_devcrypto.c
|
|
|
-ENDIF
|
|
|
diff --git a/crypto/init.c b/crypto/init.c
|
|
|
-index 9fc0e8ef68..b387559920 100644
|
|
|
+index 1b0d523bea..ee3e2eb075 100644
|
|
|
--- a/crypto/init.c
|
|
|
+++ b/crypto/init.c
|
|
|
@@ -329,18 +329,6 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_engine_openssl)
|
|
@@ -116,7 +116,7 @@ diff --git a/crypto/engine/eng_devcrypto.c b/engines/e_devcrypto.c
|
|
|
similarity index 95%
|
|
|
rename from crypto/engine/eng_devcrypto.c
|
|
|
rename to engines/e_devcrypto.c
|
|
|
-index 64dc6b891d..fb5c6e1636 100644
|
|
|
+index 0d420e50aa..3fcd81de7a 100644
|
|
|
--- a/crypto/engine/eng_devcrypto.c
|
|
|
+++ b/engines/e_devcrypto.c
|
|
|
@@ -7,7 +7,7 @@
|
|
@@ -128,15 +128,7 @@ index 64dc6b891d..fb5c6e1636 100644
|
|
|
#include <string.h>
|
|
|
#include <sys/types.h>
|
|
|
#include <sys/stat.h>
|
|
|
-@@ -23,26 +23,26 @@
|
|
|
- #include <openssl/objects.h>
|
|
|
- #include <crypto/cryptodev.h>
|
|
|
-
|
|
|
--#include "internal/engine.h"
|
|
|
--
|
|
|
- /* #define ENGINE_DEVCRYPTO_DEBUG */
|
|
|
-
|
|
|
- #if CRYPTO_ALGORITHM_MIN < CRYPTO_ALGORITHM_MAX
|
|
|
+@@ -31,18 +31,20 @@
|
|
|
# define CHECK_BSD_STYLE_MACROS
|
|
|
#endif
|
|
|
|
|
@@ -160,18 +152,7 @@ index 64dc6b891d..fb5c6e1636 100644
|
|
|
|
|
|
/*
|
|
|
* cipher/digest status & acceleration definitions
|
|
|
-@@ -66,6 +66,10 @@ struct driver_info_st {
|
|
|
- char *driver_name;
|
|
|
- };
|
|
|
-
|
|
|
-+#ifdef OPENSSL_NO_DYNAMIC_ENGINE
|
|
|
-+void engine_load_devcrypto_int(void);
|
|
|
-+#endif
|
|
|
-+
|
|
|
- static int clean_devcrypto_session(struct session_op *sess) {
|
|
|
- if (ioctl(cfd, CIOCFSESSION, &sess->ses) < 0) {
|
|
|
- SYSerr(SYS_F_IOCTL, errno);
|
|
|
-@@ -341,6 +345,7 @@ static int cipher_ctrl(EVP_CIPHER_CTX *ctx, int type, int p1, void* p2)
|
|
|
+@@ -341,6 +343,7 @@ static int cipher_ctrl(EVP_CIPHER_CTX *ctx, int type, int p1, void* p2)
|
|
|
struct cipher_ctx *to_cipher_ctx;
|
|
|
|
|
|
switch (type) {
|
|
@@ -179,7 +160,7 @@ index 64dc6b891d..fb5c6e1636 100644
|
|
|
case EVP_CTRL_COPY:
|
|
|
if (cipher_ctx == NULL)
|
|
|
return 1;
|
|
|
-@@ -702,7 +707,6 @@ static int digest_init(EVP_MD_CTX *ctx)
|
|
|
+@@ -702,7 +705,6 @@ static int digest_init(EVP_MD_CTX *ctx)
|
|
|
SYSerr(SYS_F_IOCTL, errno);
|
|
|
return 0;
|
|
|
}
|
|
@@ -187,7 +168,7 @@ index 64dc6b891d..fb5c6e1636 100644
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
-@@ -1058,7 +1062,7 @@ static const ENGINE_CMD_DEFN devcrypto_cmds[] = {
|
|
|
+@@ -1058,7 +1060,7 @@ static const ENGINE_CMD_DEFN devcrypto_cmds[] = {
|
|
|
OPENSSL_MSTR(DEVCRYPTO_USE_SOFTWARE) "=allow all drivers, "
|
|
|
OPENSSL_MSTR(DEVCRYPTO_REJECT_SOFTWARE)
|
|
|
"=use if acceleration can't be determined) [default="
|
|
@@ -196,7 +177,7 @@ index 64dc6b891d..fb5c6e1636 100644
|
|
|
ENGINE_CMD_FLAG_NUMERIC},
|
|
|
#endif
|
|
|
|
|
|
-@@ -1166,55 +1170,70 @@ static int devcrypto_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void))
|
|
|
+@@ -1166,55 +1168,70 @@ static int devcrypto_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void))
|
|
|
*
|
|
|
*****/
|
|
|
|
|
@@ -284,12 +265,12 @@ index 64dc6b891d..fb5c6e1636 100644
|
|
|
- || !ENGINE_set_ctrl_function(e, devcrypto_ctrl)
|
|
|
+ || !ENGINE_set_ctrl_function(e, devcrypto_ctrl))
|
|
|
+ return 0;
|
|
|
-+
|
|
|
+
|
|
|
+ prepare_cipher_methods();
|
|
|
+#ifdef IMPLEMENT_DIGEST
|
|
|
+ prepare_digest_methods();
|
|
|
+#endif
|
|
|
-
|
|
|
++
|
|
|
+ return (ENGINE_set_ciphers(e, devcrypto_ciphers)
|
|
|
+#ifdef IMPLEMENT_DIGEST
|
|
|
+ && ENGINE_set_digests(e, devcrypto_digests)
|
|
@@ -297,7 +278,7 @@ index 64dc6b891d..fb5c6e1636 100644
|
|
|
/*
|
|
|
* Asymmetric ciphers aren't well supported with /dev/crypto. Among the BSD
|
|
|
* implementations, it seems to only exist in FreeBSD, and regarding the
|
|
|
-@@ -1237,23 +1256,36 @@ void engine_load_devcrypto_int()
|
|
|
+@@ -1237,23 +1254,36 @@ void engine_load_devcrypto_int()
|
|
|
*/
|
|
|
#if 0
|
|
|
# ifndef OPENSSL_NO_RSA
|
|
@@ -343,7 +324,7 @@ index 64dc6b891d..fb5c6e1636 100644
|
|
|
ENGINE_free(e);
|
|
|
return;
|
|
|
}
|
|
|
-@@ -1262,3 +1294,22 @@ void engine_load_devcrypto_int()
|
|
|
+@@ -1262,3 +1292,22 @@ void engine_load_devcrypto_int()
|
|
|
ENGINE_free(e); /* Loose our local reference */
|
|
|
ERR_clear_error();
|
|
|
}
|