[openwrt/openwrt] openssl: bump to 1.1.1s
LEDE Commits
lede-commits at lists.infradead.org
Sat Nov 5 07:27:33 PDT 2022
dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/a0814f04ed955eb10b25df0ce6666ed91f11ca1b
commit a0814f04ed955eb10b25df0ce6666ed91f11ca1b
Author: John Audia <therealgraysky at proton.me>
AuthorDate: Thu Nov 3 09:27:49 2022 -0400
openssl: bump to 1.1.1s
Changes between 1.1.1r and 1.1.1s [1 Nov 2022]
*) Fixed a regression introduced in 1.1.1r version not refreshing the
certificate data to be signed before signing the certificate.
[Gibeom Gwon]
Changes between 1.1.1q and 1.1.1r [11 Oct 2022]
*) Fixed the linux-mips64 Configure target which was missing the
SIXTY_FOUR_BIT bn_ops flag. This was causing heap corruption on that
platform.
[Adam Joseph]
*) Fixed a strict aliasing problem in bn_nist. Clang-14 optimisation was
causing incorrect results in some cases as a result.
[Paul Dale]
*) Fixed SSL_pending() and SSL_has_pending() with DTLS which were failing to
report correct results in some cases
[Matt Caswell]
*) Fixed a regression introduced in 1.1.1o for re-signing certificates with
different key sizes
[Todd Short]
*) Added the loongarch64 target
[Shi Pujin]
*) Fixed a DRBG seed propagation thread safety issue
[Bernd Edlinger]
*) Fixed a memory leak in tls13_generate_secret
[Bernd Edlinger]
*) Fixed reported performance degradation on aarch64. Restored the
implementation prior to commit 2621751 ("aes/asm/aesv8-armx.pl: avoid
32-bit lane assignment in CTR mode") for 64bit targets only, since it is
reportedly 2-17% slower and the silicon errata only affects 32bit targets.
The new algorithm is still used for 32 bit targets.
[Bernd Edlinger]
*) Added a missing header for memcmp that caused compilation failure on some
platforms
[Gregor Jasny]
Build system: x86_64
Build-tested: bcm2711/RPi4B
Run-tested: bcm2711/RPi4B
Signed-off-by: John Audia <therealgraysky at proton.me>
---
package/libs/openssl/Makefile | 4 +-
...erlasm-ppc-xlate.pl-add-linux64v2-flavour.patch | 1 -
.../patches/100-Configure-afalg-support.patch | 3 +-
.../libs/openssl/patches/110-openwrt_targets.patch | 2 -
.../patches/120-strip-cflags-from-binary.patch | 3 +-
.../patches/130-dont-build-tests-fuzz.patch | 3 +-
.../patches/140-allow-prefer-chacha20.patch | 6 +-
.../patches/150-openssl.cnf-add-engines-conf.patch | 1 -
...crypto-save-ioctl-if-EVP_MD_.FLAG_ONESHOT.patch | 5 +-
...0-eng_devcrypto-add-configuration-options.patch | 20 +-
...devcrypto-add-command-to-dump-driver-info.patch | 15 +-
...crypto-make-the-dev-crypto-engine-dynamic.patch | 2666 ++++++++++++++++++--
...ypto-default-to-not-use-digests-in-engine.patch | 3 +-
...vcrypto-ignore-error-when-closing-session.patch | 3 +-
14 files changed, 2547 insertions(+), 188 deletions(-)
diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile
index bf2d6ae64d..d9b082979b 100644
--- a/package/libs/openssl/Makefile
+++ b/package/libs/openssl/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openssl
PKG_BASE:=1.1.1
-PKG_BUGFIX:=q
+PKG_BUGFIX:=s
PKG_VERSION:=$(PKG_BASE)$(PKG_BUGFIX)
PKG_RELEASE:=$(AUTORELEASE)
PKG_USE_MIPS16:=0
@@ -25,7 +25,7 @@ PKG_SOURCE_URL:= \
ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source/ \
ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source/old/$(PKG_BASE)/
-PKG_HASH:=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca
+PKG_HASH:=c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa
PKG_LICENSE:=OpenSSL
PKG_LICENSE_FILES:=LICENSE
diff --git a/package/libs/openssl/patches/001-crypto-perlasm-ppc-xlate.pl-add-linux64v2-flavour.patch b/package/libs/openssl/patches/001-crypto-perlasm-ppc-xlate.pl-add-linux64v2-flavour.patch
index e52a3d52ea..3da67e25fc 100644
--- a/package/libs/openssl/patches/001-crypto-perlasm-ppc-xlate.pl-add-linux64v2-flavour.patch
+++ b/package/libs/openssl/patches/001-crypto-perlasm-ppc-xlate.pl-add-linux64v2-flavour.patch
@@ -15,7 +15,6 @@ Reviewed-by: Paul Dale <paul.dale at oracle.com>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8883)
-diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
--- a/crypto/perlasm/ppc-xlate.pl
+++ b/crypto/perlasm/ppc-xlate.pl
@@ -49,7 +49,7 @@ my $globl = sub {
diff --git a/package/libs/openssl/patches/100-Configure-afalg-support.patch b/package/libs/openssl/patches/100-Configure-afalg-support.patch
index 3125e37a94..746c50621f 100644
--- a/package/libs/openssl/patches/100-Configure-afalg-support.patch
+++ b/package/libs/openssl/patches/100-Configure-afalg-support.patch
@@ -8,10 +8,9 @@ version to disable building the AFALG engine on openwrt targets.
Signed-off-by: Eneas U de Queiroz <cote2004-github at yahoo.com>
-diff --git a/Configure b/Configure
--- a/Configure
+++ b/Configure
-@@ -1548,7 +1548,9 @@ unless ($disabled{"crypto-mdebug-backtrace"})
+@@ -1548,7 +1548,9 @@ unless ($disabled{"crypto-mdebug-backtra
unless ($disabled{afalgeng}) {
$config{afalgeng}="";
diff --git a/package/libs/openssl/patches/110-openwrt_targets.patch b/package/libs/openssl/patches/110-openwrt_targets.patch
index 9d5db6cfd1..6b4fbad0a7 100644
--- a/package/libs/openssl/patches/110-openwrt_targets.patch
+++ b/package/libs/openssl/patches/110-openwrt_targets.patch
@@ -7,8 +7,6 @@ Targets are named: linux-$(CONFIG_ARCH)-openwrt
Signed-off-by: Eneas U de Queiroz <cote2004-github at yahoo.com>
-diff --git a/Configurations/25-openwrt.conf b/Configurations/25-openwrt.conf
-new file mode 100644
--- /dev/null
+++ b/Configurations/25-openwrt.conf
@@ -0,0 +1,52 @@
diff --git a/package/libs/openssl/patches/120-strip-cflags-from-binary.patch b/package/libs/openssl/patches/120-strip-cflags-from-binary.patch
index 20fe21f2ac..90282706d1 100644
--- a/package/libs/openssl/patches/120-strip-cflags-from-binary.patch
+++ b/package/libs/openssl/patches/120-strip-cflags-from-binary.patch
@@ -8,10 +8,9 @@ OpenSSL_version(OPENSSL_CFLAGS), or running openssl version -a
Signed-off-by: Eneas U de Queiroz <cote2004-github at yahoo.com>
-diff --git a/crypto/build.info b/crypto/build.info
--- a/crypto/build.info
+++ b/crypto/build.info
-@@ -10,7 +10,7 @@ EXTRA= ../ms/uplink-x86.pl ../ms/uplink.c ../ms/applink.c \
+@@ -10,7 +10,7 @@ EXTRA= ../ms/uplink-x86.pl ../ms/uplink
ppccpuid.pl pariscid.pl alphacpuid.pl arm64cpuid.pl armv4cpuid.pl
DEPEND[cversion.o]=buildinf.h
diff --git a/package/libs/openssl/patches/130-dont-build-tests-fuzz.patch b/package/libs/openssl/patches/130-dont-build-tests-fuzz.patch
index 4707554d2d..baf8bca9e1 100644
--- a/package/libs/openssl/patches/130-dont-build-tests-fuzz.patch
+++ b/package/libs/openssl/patches/130-dont-build-tests-fuzz.patch
@@ -7,10 +7,9 @@ This shortens build time.
Signed-off-by: Eneas U de Queiroz <cote2004-github at yahoo.com>
-diff --git a/Configure b/Configure
--- a/Configure
+++ b/Configure
-@@ -318,7 +318,7 @@ my $auto_threads=1; # enable threads automatically? true by default
+@@ -318,7 +318,7 @@ my $auto_threads=1; # enable threads
my $default_ranlib;
# Top level directories to build
diff --git a/package/libs/openssl/patches/140-allow-prefer-chacha20.patch b/package/libs/openssl/patches/140-allow-prefer-chacha20.patch
index b2418006a9..99afd9acf8 100644
--- a/package/libs/openssl/patches/140-allow-prefer-chacha20.patch
+++ b/package/libs/openssl/patches/140-allow-prefer-chacha20.patch
@@ -14,7 +14,6 @@ when the client has it on top of its ciphersuite preference.
Signed-off-by: Eneas U de Queiroz <cote2004-github at yahoo.com>
-diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -173,9 +173,15 @@ extern "C" {
@@ -36,10 +35,9 @@ diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
# else
# define TLS_DEFAULT_CIPHERSUITES "TLS_AES_256_GCM_SHA384:" \
"TLS_AES_128_GCM_SHA256"
-diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
-@@ -1467,11 +1467,29 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method,
+@@ -1465,11 +1465,29 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
ssl_cipher_apply_rule(0, SSL_kECDHE, 0, 0, 0, 0, 0, CIPHER_DEL, -1, &head,
&tail);
@@ -69,7 +67,7 @@ diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
/*
* ...and generally, our preferred cipher is AES.
-@@ -1527,7 +1545,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method,
+@@ -1525,7 +1543,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
* Within each group, ciphers remain sorted by strength and previous
* preference, i.e.,
* 1) ECDHE > DHE
diff --git a/package/libs/openssl/patches/150-openssl.cnf-add-engines-conf.patch b/package/libs/openssl/patches/150-openssl.cnf-add-engines-conf.patch
index 8851116347..fa92fbe2ab 100644
--- a/package/libs/openssl/patches/150-openssl.cnf-add-engines-conf.patch
+++ b/package/libs/openssl/patches/150-openssl.cnf-add-engines-conf.patch
@@ -8,7 +8,6 @@ This adds configuration options for engines, loading all cnf files under
Signed-off-by: Eneas U de Queiroz <cotequeiroz at gmail.com>
-diff --git a/apps/openssl.cnf b/apps/openssl.cnf
--- a/apps/openssl.cnf
+++ b/apps/openssl.cnf
@@ -22,6 +22,16 @@ oid_section = new_oids
diff --git a/package/libs/openssl/patches/400-eng_devcrypto-save-ioctl-if-EVP_MD_.FLAG_ONESHOT.patch b/package/libs/openssl/patches/400-eng_devcrypto-save-ioctl-if-EVP_MD_.FLAG_ONESHOT.patch
index 71c9fdd438..ed8204c339 100644
--- a/package/libs/openssl/patches/400-eng_devcrypto-save-ioctl-if-EVP_MD_.FLAG_ONESHOT.patch
+++ b/package/libs/openssl/patches/400-eng_devcrypto-save-ioctl-if-EVP_MD_.FLAG_ONESHOT.patch
@@ -14,7 +14,6 @@ Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7585)
-diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c
--- a/crypto/engine/eng_devcrypto.c
+++ b/crypto/engine/eng_devcrypto.c
@@ -461,6 +461,7 @@ struct digest_ctx {
@@ -25,7 +24,7 @@ diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c
};
static const struct digest_data_st {
-@@ -564,12 +565,15 @@ static int digest_update(EVP_MD_CTX *ctx, const void *data, size_t count)
+@@ -564,12 +565,15 @@ static int digest_update(EVP_MD_CTX *ctx
if (digest_ctx == NULL)
return 0;
@@ -45,7 +44,7 @@ diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c
}
static int digest_final(EVP_MD_CTX *ctx, unsigned char *md)
-@@ -579,7 +583,10 @@ static int digest_final(EVP_MD_CTX *ctx, unsigned char *md)
+@@ -579,7 +583,10 @@ static int digest_final(EVP_MD_CTX *ctx,
if (md == NULL || digest_ctx == NULL)
return 0;
diff --git a/package/libs/openssl/patches/410-eng_devcrypto-add-configuration-options.patch b/package/libs/openssl/patches/410-eng_devcrypto-add-configuration-options.patch
index 6d0fbfc982..bad7a37256 100644
--- a/package/libs/openssl/patches/410-eng_devcrypto-add-configuration-options.patch
+++ b/package/libs/openssl/patches/410-eng_devcrypto-add-configuration-options.patch
@@ -13,7 +13,6 @@ Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7585)
-diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c
--- a/crypto/engine/eng_devcrypto.c
+++ b/crypto/engine/eng_devcrypto.c
@@ -16,6 +16,7 @@
@@ -79,7 +78,7 @@ diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c
/*
* Code further down must make sure that only NIDs in the table above
-@@ -333,19 +367,40 @@ static int cipher_cleanup(EVP_CIPHER_CTX *ctx)
+@@ -333,19 +367,40 @@ static int cipher_cleanup(EVP_CIPHER_CTX
}
/*
@@ -185,7 +184,7 @@ diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c
static const EVP_CIPHER *get_cipher_method(int nid)
{
size_t i = get_cipher_data_index(nid);
-@@ -438,6 +520,36 @@ static int devcrypto_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
+@@ -438,6 +520,36 @@ static int devcrypto_ciphers(ENGINE *e,
return *cipher != NULL;
}
@@ -246,7 +245,7 @@ diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c
/*
* Code further down must make sure that only NIDs in the table above
-@@ -516,8 +637,8 @@ static const struct digest_data_st *get_digest_data(int nid)
+@@ -516,8 +637,8 @@ static const struct digest_data_st *get_
}
/*
@@ -257,7 +256,7 @@ diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c
*/
static int digest_init(EVP_MD_CTX *ctx)
-@@ -630,52 +751,94 @@ static int digest_cleanup(EVP_MD_CTX *ctx)
+@@ -630,52 +751,94 @@ static int digest_cleanup(EVP_MD_CTX *ct
return clean_devcrypto_session(&digest_ctx->sess);
}
@@ -402,7 +401,7 @@ diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c
}
}
-@@ -739,8 +909,154 @@ static int devcrypto_digests(ENGINE *e, const EVP_MD **digest,
+@@ -739,7 +909,153 @@ static int devcrypto_digests(ENGINE *e,
return *digest != NULL;
}
@@ -478,8 +477,8 @@ diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c
+ "DIGESTS",
+ "either ALL, NONE, or a comma-separated list of digests to enable [default=ALL]",
+ ENGINE_CMD_FLAG_STRING},
- #endif
-
++#endif
++
+ {0, NULL, NULL, 0}
+};
+
@@ -503,7 +502,7 @@ diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c
+ use_softdrivers = i;
+#ifdef IMPLEMENT_DIGEST
+ rebuild_known_digest_nids(e);
-+#endif
+ #endif
+ rebuild_known_cipher_nids(e);
+ return 1;
+#endif /* CIOCGSESSINFO */
@@ -553,10 +552,9 @@ diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c
+ }
+ return 0;
+}
-+
+
/******************************************************************************
*
- * LOAD / UNLOAD
@@ -806,6 +1122,8 @@ void engine_load_devcrypto_int()
if (!ENGINE_set_id(e, "devcrypto")
diff --git a/package/libs/openssl/patches/420-eng_devcrypto-add-command-to-dump-driver-info.patch b/package/libs/openssl/patches/420-eng_devcrypto-add-command-to-dump-driver-info.patch
index 83989a3625..eee71c6c62 100644
--- a/package/libs/openssl/patches/420-eng_devcrypto-add-command-to-dump-driver-info.patch
+++ b/package/libs/openssl/patches/420-eng_devcrypto-add-command-to-dump-driver-info.patch
@@ -11,10 +11,9 @@ Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7585)
-diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c
--- a/crypto/engine/eng_devcrypto.c
+++ b/crypto/engine/eng_devcrypto.c
-@@ -50,16 +50,20 @@ static int use_softdrivers = DEVCRYPTO_DEFAULT_USE_SOFDTRIVERS;
+@@ -50,16 +50,20 @@ static int use_softdrivers = DEVCRYPTO_D
*/
struct driver_info_st {
enum devcrypto_status_t {
@@ -81,7 +80,7 @@ diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c
#endif /* CIOCGSESSINFO */
}
ioctl(cfd, CIOCFSESSION, &sess.ses);
-@@ -505,8 +514,11 @@ static void destroy_all_cipher_methods(void)
+@@ -505,8 +514,11 @@ static void destroy_all_cipher_methods(v
{
size_t i;
@@ -94,7 +93,7 @@ diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c
}
static int devcrypto_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
-@@ -550,6 +562,40 @@ static int cryptodev_select_cipher_cb(const char *str, int len, void *usr)
+@@ -550,6 +562,40 @@ static int cryptodev_select_cipher_cb(co
return 1;
}
@@ -189,7 +188,7 @@ diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c
EVP_MD_meth_free(known_digest_methods[i]);
known_digest_methods[i] = NULL;
goto finish;
-@@ -894,8 +945,11 @@ static void destroy_all_digest_methods(void)
+@@ -894,8 +945,11 @@ static void destroy_all_digest_methods(v
{
size_t i;
@@ -202,7 +201,7 @@ diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c
}
static int devcrypto_digests(ENGINE *e, const EVP_MD **digest,
-@@ -939,6 +993,43 @@ static int cryptodev_select_digest_cb(const char *str, int len, void *usr)
+@@ -939,6 +993,43 @@ static int cryptodev_select_digest_cb(co
return 1;
}
@@ -246,7 +245,7 @@ diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c
#endif
/******************************************************************************
-@@ -983,6 +1074,11 @@ static const ENGINE_CMD_DEFN devcrypto_cmds[] = {
+@@ -983,6 +1074,11 @@ static const ENGINE_CMD_DEFN devcrypto_c
ENGINE_CMD_FLAG_STRING},
#endif
@@ -258,7 +257,7 @@ diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c
{0, NULL, NULL, 0}
};
-@@ -1051,6 +1147,13 @@ static int devcrypto_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void))
+@@ -1051,6 +1147,13 @@ static int devcrypto_ctrl(ENGINE *e, int
return 1;
#endif /* IMPLEMENT_DIGEST */
diff --git a/package/libs/openssl/patches/430-e_devcrypto-make-the-dev-crypto-engine-dynamic.patch b/package/libs/openssl/patches/430-e_devcrypto-make-the-dev-crypto-engine-dynamic.patch
index da9b704501..00c74972ab 100644
--- a/package/libs/openssl/patches/430-e_devcrypto-make-the-dev-crypto-engine-dynamic.patch
+++ b/package/libs/openssl/patches/430-e_devcrypto-make-the-dev-crypto-engine-dynamic.patch
@@ -8,7 +8,6 @@ engines/e_devcrypto.c.
Signed-off-by: Eneas U de Queiroz <cote2004-github at yahoo.com>
-diff --git a/crypto/engine/build.info b/crypto/engine/build.info
--- a/crypto/engine/build.info
+++ b/crypto/engine/build.info
@@ -6,6 +6,3 @@ SOURCE[../../libcrypto]=\
@@ -18,10 +17,9 @@ diff --git a/crypto/engine/build.info b/crypto/engine/build.info
-IF[{- !$disabled{devcryptoeng} -}]
- SOURCE[../../libcrypto]=eng_devcrypto.c
-ENDIF
-diff --git a/crypto/init.c b/crypto/init.c
--- a/crypto/init.c
+++ b/crypto/init.c
-@@ -328,18 +328,6 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_engine_openssl)
+@@ -328,18 +328,6 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_engine_
engine_load_openssl_int();
return 1;
}
@@ -40,7 +38,7 @@ diff --git a/crypto/init.c b/crypto/init.c
# ifndef OPENSSL_NO_RDRAND
static CRYPTO_ONCE engine_rdrand = CRYPTO_ONCE_STATIC_INIT;
-@@ -364,6 +352,18 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_engine_dynamic)
+@@ -364,6 +352,18 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_engine_
return 1;
}
# ifndef OPENSSL_NO_STATIC_ENGINE
@@ -59,7 +57,7 @@ diff --git a/crypto/init.c b/crypto/init.c
# if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK)
static CRYPTO_ONCE engine_padlock = CRYPTO_ONCE_STATIC_INIT;
DEFINE_RUN_ONCE_STATIC(ossl_init_engine_padlock)
-@@ -704,11 +704,6 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
+@@ -704,11 +704,6 @@ int OPENSSL_init_crypto(uint64_t opts, c
if ((opts & OPENSSL_INIT_ENGINE_OPENSSL)
&& !RUN_ONCE(&engine_openssl, ossl_init_engine_openssl))
return 0;
@@ -71,7 +69,7 @@ diff --git a/crypto/init.c b/crypto/init.c
# ifndef OPENSSL_NO_RDRAND
if ((opts & OPENSSL_INIT_ENGINE_RDRAND)
&& !RUN_ONCE(&engine_rdrand, ossl_init_engine_rdrand))
-@@ -718,6 +713,11 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
+@@ -718,6 +713,11 @@ int OPENSSL_init_crypto(uint64_t opts, c
&& !RUN_ONCE(&engine_dynamic, ossl_init_engine_dynamic))
return 0;
# ifndef OPENSSL_NO_STATIC_ENGINE
@@ -83,7 +81,6 @@ diff --git a/crypto/init.c b/crypto/init.c
# if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK)
if ((opts & OPENSSL_INIT_ENGINE_PADLOCK)
&& !RUN_ONCE(&engine_padlock, ossl_init_engine_padlock))
-diff --git a/engines/build.info b/engines/build.info
--- a/engines/build.info
+++ b/engines/build.info
@@ -11,6 +11,9 @@ IF[{- !$disabled{"engine"} -}]
@@ -109,115 +106,2489 @@ diff --git a/engines/build.info b/engines/build.info
ENGINES_NO_INST=ossltest dasync
SOURCE[dasync]=e_dasync.c
-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
--- a/crypto/engine/eng_devcrypto.c
++++ /dev/null
+@@ -1,1277 +0,0 @@
+-/*
+- * Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+- *
+- * Licensed under the OpenSSL license (the "License"). You may not use
+- * this file except in compliance with the License. You can obtain a copy
+- * in the file LICENSE in the source distribution or at
+- * https://www.openssl.org/source/license.html
+- */
+-
+-#include "e_os.h"
+-#include <string.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-#include <fcntl.h>
+-#include <sys/ioctl.h>
+-#include <unistd.h>
+-#include <assert.h>
+-
+-#include <openssl/conf.h>
+-#include <openssl/evp.h>
+-#include <openssl/err.h>
+-#include <openssl/engine.h>
+-#include <openssl/objects.h>
+-#include <crypto/cryptodev.h>
+-
+-#include "crypto/engine.h"
+-
+-/* #define ENGINE_DEVCRYPTO_DEBUG */
+-
+-#if CRYPTO_ALGORITHM_MIN < CRYPTO_ALGORITHM_MAX
+-# define CHECK_BSD_STYLE_MACROS
+-#endif
+-
+-/*
+- * ONE global file descriptor for all sessions. This allows operations
+- * such as digest session data copying (see digest_copy()), but is also
+- * saner... why re-open /dev/crypto for every session?
+- */
+-static int cfd;
+-#define DEVCRYPTO_REQUIRE_ACCELERATED 0 /* require confirmation of acceleration */
+-#define DEVCRYPTO_USE_SOFTWARE 1 /* allow software drivers */
+-#define DEVCRYPTO_REJECT_SOFTWARE 2 /* only disallow confirmed software drivers */
+-
+-#define DEVCRYPTO_DEFAULT_USE_SOFDTRIVERS DEVCRYPTO_REJECT_SOFTWARE
+-static int use_softdrivers = DEVCRYPTO_DEFAULT_USE_SOFDTRIVERS;
+-
+-/*
+- * cipher/digest status & acceleration definitions
+- * Make sure the defaults are set to 0
+- */
+-struct driver_info_st {
+- enum devcrypto_status_t {
+- DEVCRYPTO_STATUS_FAILURE = -3, /* unusable for other reason */
+- DEVCRYPTO_STATUS_NO_CIOCCPHASH = -2, /* hash state copy not supported */
+- DEVCRYPTO_STATUS_NO_CIOCGSESSION = -1, /* session open failed */
+- DEVCRYPTO_STATUS_UNKNOWN = 0, /* not tested yet */
+- DEVCRYPTO_STATUS_USABLE = 1 /* algo can be used */
+- } status;
+-
+- enum devcrypto_accelerated_t {
+- DEVCRYPTO_NOT_ACCELERATED = -1, /* software implemented */
+- DEVCRYPTO_ACCELERATION_UNKNOWN = 0, /* acceleration support unkown */
+- DEVCRYPTO_ACCELERATED = 1 /* hardware accelerated */
+- } accelerated;
+-
+- char *driver_name;
+-};
+-
+-static int clean_devcrypto_session(struct session_op *sess) {
+- if (ioctl(cfd, CIOCFSESSION, &sess->ses) < 0) {
+- SYSerr(SYS_F_IOCTL, errno);
+- return 0;
+- }
+- memset(sess, 0, sizeof(struct session_op));
+- return 1;
+-}
+-
+-/******************************************************************************
+- *
+- * Ciphers
+- *
+- * Because they all do the same basic operation, we have only one set of
+- * method functions for them all to share, and a mapping table between
+- * NIDs and cryptodev IDs, with all the necessary size data.
+- *
+- *****/
+-
+-struct cipher_ctx {
+- struct session_op sess;
+- int op; /* COP_ENCRYPT or COP_DECRYPT */
+- unsigned long mode; /* EVP_CIPH_*_MODE */
+-
+- /* to handle ctr mode being a stream cipher */
+- unsigned char partial[EVP_MAX_BLOCK_LENGTH];
+- unsigned int blocksize, num;
+-};
+-
+-static const struct cipher_data_st {
+- int nid;
+- int blocksize;
+- int keylen;
+- int ivlen;
+- int flags;
+- int devcryptoid;
+-} cipher_data[] = {
+-#ifndef OPENSSL_NO_DES
+- { NID_des_cbc, 8, 8, 8, EVP_CIPH_CBC_MODE, CRYPTO_DES_CBC },
+- { NID_des_ede3_cbc, 8, 24, 8, EVP_CIPH_CBC_MODE, CRYPTO_3DES_CBC },
+-#endif
+-#ifndef OPENSSL_NO_BF
+- { NID_bf_cbc, 8, 16, 8, EVP_CIPH_CBC_MODE, CRYPTO_BLF_CBC },
+-#endif
+-#ifndef OPENSSL_NO_CAST
+- { NID_cast5_cbc, 8, 16, 8, EVP_CIPH_CBC_MODE, CRYPTO_CAST_CBC },
+-#endif
+- { NID_aes_128_cbc, 16, 128 / 8, 16, EVP_CIPH_CBC_MODE, CRYPTO_AES_CBC },
+- { NID_aes_192_cbc, 16, 192 / 8, 16, EVP_CIPH_CBC_MODE, CRYPTO_AES_CBC },
+- { NID_aes_256_cbc, 16, 256 / 8, 16, EVP_CIPH_CBC_MODE, CRYPTO_AES_CBC },
+-#ifndef OPENSSL_NO_RC4
+- { NID_rc4, 1, 16, 0, EVP_CIPH_STREAM_CIPHER, CRYPTO_ARC4 },
+-#endif
+-#if !defined(CHECK_BSD_STYLE_MACROS) || defined(CRYPTO_AES_CTR)
+- { NID_aes_128_ctr, 16, 128 / 8, 16, EVP_CIPH_CTR_MODE, CRYPTO_AES_CTR },
+- { NID_aes_192_ctr, 16, 192 / 8, 16, EVP_CIPH_CTR_MODE, CRYPTO_AES_CTR },
+- { NID_aes_256_ctr, 16, 256 / 8, 16, EVP_CIPH_CTR_MODE, CRYPTO_AES_CTR },
+-#endif
+-#if 0 /* Not yet supported */
+- { NID_aes_128_xts, 16, 128 / 8 * 2, 16, EVP_CIPH_XTS_MODE, CRYPTO_AES_XTS },
+- { NID_aes_256_xts, 16, 256 / 8 * 2, 16, EVP_CIPH_XTS_MODE, CRYPTO_AES_XTS },
+-#endif
+-#if !defined(CHECK_BSD_STYLE_MACROS) || defined(CRYPTO_AES_ECB)
+- { NID_aes_128_ecb, 16, 128 / 8, 0, EVP_CIPH_ECB_MODE, CRYPTO_AES_ECB },
+- { NID_aes_192_ecb, 16, 192 / 8, 0, EVP_CIPH_ECB_MODE, CRYPTO_AES_ECB },
+- { NID_aes_256_ecb, 16, 256 / 8, 0, EVP_CIPH_ECB_MODE, CRYPTO_AES_ECB },
+-#endif
+-#if 0 /* Not yet supported */
+- { NID_aes_128_gcm, 16, 128 / 8, 16, EVP_CIPH_GCM_MODE, CRYPTO_AES_GCM },
+- { NID_aes_192_gcm, 16, 192 / 8, 16, EVP_CIPH_GCM_MODE, CRYPTO_AES_GCM },
+- { NID_aes_256_gcm, 16, 256 / 8, 16, EVP_CIPH_GCM_MODE, CRYPTO_AES_GCM },
+-#endif
+-#ifndef OPENSSL_NO_CAMELLIA
+- { NID_camellia_128_cbc, 16, 128 / 8, 16, EVP_CIPH_CBC_MODE,
+- CRYPTO_CAMELLIA_CBC },
+- { NID_camellia_192_cbc, 16, 192 / 8, 16, EVP_CIPH_CBC_MODE,
+- CRYPTO_CAMELLIA_CBC },
+- { NID_camellia_256_cbc, 16, 256 / 8, 16, EVP_CIPH_CBC_MODE,
+- CRYPTO_CAMELLIA_CBC },
+-#endif
+-};
+-
+-static size_t find_cipher_data_index(int nid)
+-{
+- size_t i;
+-
+- for (i = 0; i < OSSL_NELEM(cipher_data); i++)
+- if (nid == cipher_data[i].nid)
+- return i;
+- return (size_t)-1;
+-}
+-
+-static size_t get_cipher_data_index(int nid)
+-{
+- size_t i = find_cipher_data_index(nid);
+-
+- if (i != (size_t)-1)
+- return i;
+-
+- /*
+- * Code further down must make sure that only NIDs in the table above
+- * are used. If any other NID reaches this function, there's a grave
+- * coding error further down.
+- */
+- assert("Code that never should be reached" == NULL);
+- return -1;
+-}
+-
+-static const struct cipher_data_st *get_cipher_data(int nid)
+-{
+- return &cipher_data[get_cipher_data_index(nid)];
+-}
+-
+-/*
+- * Following are the three necessary functions to map OpenSSL functionality
+- * with cryptodev.
+- */
+-
+-static int cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+- const unsigned char *iv, int enc)
+-{
+- struct cipher_ctx *cipher_ctx =
+- (struct cipher_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
+- const struct cipher_data_st *cipher_d =
+- get_cipher_data(EVP_CIPHER_CTX_nid(ctx));
+-
+- /* cleanup a previous session */
+- if (cipher_ctx->sess.ses != 0 &&
+- clean_devcrypto_session(&cipher_ctx->sess) == 0)
+- return 0;
+-
+- cipher_ctx->sess.cipher = cipher_d->devcryptoid;
+- cipher_ctx->sess.keylen = cipher_d->keylen;
+- cipher_ctx->sess.key = (void *)key;
+- cipher_ctx->op = enc ? COP_ENCRYPT : COP_DECRYPT;
+- cipher_ctx->mode = cipher_d->flags & EVP_CIPH_MODE;
+- cipher_ctx->blocksize = cipher_d->blocksize;
+- if (ioctl(cfd, CIOCGSESSION, &cipher_ctx->sess) < 0) {
+- SYSerr(SYS_F_IOCTL, errno);
+- return 0;
+- }
+-
+- return 1;
+-}
+-
+-static int cipher_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+- const unsigned char *in, size_t inl)
+-{
+- struct cipher_ctx *cipher_ctx =
+- (struct cipher_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
+- struct crypt_op cryp;
+- unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx);
+-#if !defined(COP_FLAG_WRITE_IV)
+- unsigned char saved_iv[EVP_MAX_IV_LENGTH];
+- const unsigned char *ivptr;
+- size_t nblocks, ivlen;
+-#endif
+-
+- memset(&cryp, 0, sizeof(cryp));
+- cryp.ses = cipher_ctx->sess.ses;
+- cryp.len = inl;
+- cryp.src = (void *)in;
+- cryp.dst = (void *)out;
+- cryp.iv = (void *)iv;
+- cryp.op = cipher_ctx->op;
+-#if !defined(COP_FLAG_WRITE_IV)
+- cryp.flags = 0;
+-
+- ivlen = EVP_CIPHER_CTX_iv_length(ctx);
+- if (ivlen > 0)
+- switch (cipher_ctx->mode) {
+- case EVP_CIPH_CBC_MODE:
+- assert(inl >= ivlen);
+- if (!EVP_CIPHER_CTX_encrypting(ctx)) {
+- ivptr = in + inl - ivlen;
+- memcpy(saved_iv, ivptr, ivlen);
+- }
+- break;
+-
+- case EVP_CIPH_CTR_MODE:
+- break;
+-
+- default: /* should not happen */
+- return 0;
+- }
+-#else
+- cryp.flags = COP_FLAG_WRITE_IV;
+-#endif
+-
+- if (ioctl(cfd, CIOCCRYPT, &cryp) < 0) {
+- SYSerr(SYS_F_IOCTL, errno);
+- return 0;
+- }
+-
+-#if !defined(COP_FLAG_WRITE_IV)
+- if (ivlen > 0)
+- switch (cipher_ctx->mode) {
+- case EVP_CIPH_CBC_MODE:
+- assert(inl >= ivlen);
+- if (EVP_CIPHER_CTX_encrypting(ctx))
+- ivptr = out + inl - ivlen;
+- else
+- ivptr = saved_iv;
+-
+- memcpy(iv, ivptr, ivlen);
+- break;
+-
+- case EVP_CIPH_CTR_MODE:
+- nblocks = (inl + cipher_ctx->blocksize - 1)
+- / cipher_ctx->blocksize;
+- do {
+- ivlen--;
+- nblocks += iv[ivlen];
+- iv[ivlen] = (uint8_t) nblocks;
+- nblocks >>= 8;
+- } while (ivlen);
+- break;
+-
+- default: /* should not happen */
+- return 0;
+- }
+-#endif
+-
+- return 1;
+-}
+-
+-static int ctr_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+- const unsigned char *in, size_t inl)
+-{
+- struct cipher_ctx *cipher_ctx =
+- (struct cipher_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
+- size_t nblocks, len;
+-
+- /* initial partial block */
+- while (cipher_ctx->num && inl) {
+- (*out++) = *(in++) ^ cipher_ctx->partial[cipher_ctx->num];
+- --inl;
+- cipher_ctx->num = (cipher_ctx->num + 1) % cipher_ctx->blocksize;
+- }
+-
+- /* full blocks */
+- if (inl > (unsigned int) cipher_ctx->blocksize) {
+- nblocks = inl/cipher_ctx->blocksize;
+- len = nblocks * cipher_ctx->blocksize;
+- if (cipher_do_cipher(ctx, out, in, len) < 1)
+- return 0;
+- inl -= len;
+- out += len;
+- in += len;
+- }
+-
+- /* final partial block */
+- if (inl) {
+- memset(cipher_ctx->partial, 0, cipher_ctx->blocksize);
+- if (cipher_do_cipher(ctx, cipher_ctx->partial, cipher_ctx->partial,
+- cipher_ctx->blocksize) < 1)
+- return 0;
+- while (inl--) {
+- out[cipher_ctx->num] = in[cipher_ctx->num]
+- ^ cipher_ctx->partial[cipher_ctx->num];
+- cipher_ctx->num++;
+- }
+- }
+-
+- return 1;
+-}
+-
+-static int cipher_ctrl(EVP_CIPHER_CTX *ctx, int type, int p1, void* p2)
+-{
+- struct cipher_ctx *cipher_ctx =
+- (struct cipher_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
+- EVP_CIPHER_CTX *to_ctx = (EVP_CIPHER_CTX *)p2;
+- struct cipher_ctx *to_cipher_ctx;
+-
+- switch (type) {
+- case EVP_CTRL_COPY:
+- if (cipher_ctx == NULL)
+- return 1;
+- /* when copying the context, a new session needs to be initialized */
+- to_cipher_ctx =
+- (struct cipher_ctx *)EVP_CIPHER_CTX_get_cipher_data(to_ctx);
+- memset(&to_cipher_ctx->sess, 0, sizeof(to_cipher_ctx->sess));
+- return cipher_init(to_ctx, cipher_ctx->sess.key, EVP_CIPHER_CTX_iv(ctx),
+- (cipher_ctx->op == COP_ENCRYPT));
+-
+- case EVP_CTRL_INIT:
+- memset(&cipher_ctx->sess, 0, sizeof(cipher_ctx->sess));
+- return 1;
+-
+- default:
+- break;
+- }
+-
+- return -1;
+-}
+-
+-static int cipher_cleanup(EVP_CIPHER_CTX *ctx)
+-{
+- struct cipher_ctx *cipher_ctx =
+- (struct cipher_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
+-
+- return clean_devcrypto_session(&cipher_ctx->sess);
+-}
+-
+-/*
+- * Keep tables of known nids, associated methods, selected ciphers, and driver
+- * info.
+- * Note that known_cipher_nids[] isn't necessarily indexed the same way as
+- * cipher_data[] above, which the other tables are.
+- */
+-static int known_cipher_nids[OSSL_NELEM(cipher_data)];
+-static int known_cipher_nids_amount = -1; /* -1 indicates not yet initialised */
+-static EVP_CIPHER *known_cipher_methods[OSSL_NELEM(cipher_data)] = { NULL, };
+-static int selected_ciphers[OSSL_NELEM(cipher_data)];
+-static struct driver_info_st cipher_driver_info[OSSL_NELEM(cipher_data)];
+-
+-
+-static int devcrypto_test_cipher(size_t cipher_data_index)
+-{
+- return (cipher_driver_info[cipher_data_index].status == DEVCRYPTO_STATUS_USABLE
+- && selected_ciphers[cipher_data_index] == 1
+- && (cipher_driver_info[cipher_data_index].accelerated
+- == DEVCRYPTO_ACCELERATED
+- || use_softdrivers == DEVCRYPTO_USE_SOFTWARE
+- || (cipher_driver_info[cipher_data_index].accelerated
+- != DEVCRYPTO_NOT_ACCELERATED
+- && use_softdrivers == DEVCRYPTO_REJECT_SOFTWARE)));
+-}
+-
+-static void prepare_cipher_methods(void)
+-{
+- size_t i;
+- struct session_op sess;
+- unsigned long cipher_mode;
+-#ifdef CIOCGSESSINFO
+- struct session_info_op siop;
+-#endif
+-
+- memset(&cipher_driver_info, 0, sizeof(cipher_driver_info));
+-
+- memset(&sess, 0, sizeof(sess));
+- sess.key = (void *)"01234567890123456789012345678901234567890123456789";
+-
+- for (i = 0, known_cipher_nids_amount = 0;
+- i < OSSL_NELEM(cipher_data); i++) {
+-
+- selected_ciphers[i] = 1;
+- /*
+- * Check that the cipher is usable
+- */
+- sess.cipher = cipher_data[i].devcryptoid;
+- sess.keylen = cipher_data[i].keylen;
+- if (ioctl(cfd, CIOCGSESSION, &sess) < 0) {
+- cipher_driver_info[i].status = DEVCRYPTO_STATUS_NO_CIOCGSESSION;
+- continue;
+- }
+-
+- cipher_mode = cipher_data[i].flags & EVP_CIPH_MODE;
+-
+- if ((known_cipher_methods[i] =
+- EVP_CIPHER_meth_new(cipher_data[i].nid,
+- cipher_mode == EVP_CIPH_CTR_MODE ? 1 :
+- cipher_data[i].blocksize,
+- cipher_data[i].keylen)) == NULL
+- || !EVP_CIPHER_meth_set_iv_length(known_cipher_methods[i],
+- cipher_data[i].ivlen)
+- || !EVP_CIPHER_meth_set_flags(known_cipher_methods[i],
+- cipher_data[i].flags
+- | EVP_CIPH_CUSTOM_COPY
+- | EVP_CIPH_CTRL_INIT
+- | EVP_CIPH_FLAG_DEFAULT_ASN1)
+- || !EVP_CIPHER_meth_set_init(known_cipher_methods[i], cipher_init)
+- || !EVP_CIPHER_meth_set_do_cipher(known_cipher_methods[i],
+- cipher_mode == EVP_CIPH_CTR_MODE ?
+- ctr_do_cipher :
+- cipher_do_cipher)
+- || !EVP_CIPHER_meth_set_ctrl(known_cipher_methods[i], cipher_ctrl)
+- || !EVP_CIPHER_meth_set_cleanup(known_cipher_methods[i],
+- cipher_cleanup)
+- || !EVP_CIPHER_meth_set_impl_ctx_size(known_cipher_methods[i],
+- sizeof(struct cipher_ctx))) {
+- cipher_driver_info[i].status = DEVCRYPTO_STATUS_FAILURE;
+- EVP_CIPHER_meth_free(known_cipher_methods[i]);
+- known_cipher_methods[i] = NULL;
+- } else {
+- cipher_driver_info[i].status = DEVCRYPTO_STATUS_USABLE;
+-#ifdef CIOCGSESSINFO
+- siop.ses = sess.ses;
+- if (ioctl(cfd, CIOCGSESSINFO, &siop) < 0) {
+- cipher_driver_info[i].accelerated = DEVCRYPTO_ACCELERATION_UNKNOWN;
+- } else {
+- cipher_driver_info[i].driver_name =
+- OPENSSL_strndup(siop.cipher_info.cra_driver_name,
+- CRYPTODEV_MAX_ALG_NAME);
+- if (!(siop.flags & SIOP_FLAG_KERNEL_DRIVER_ONLY))
+- cipher_driver_info[i].accelerated = DEVCRYPTO_NOT_ACCELERATED;
+- else
+- cipher_driver_info[i].accelerated = DEVCRYPTO_ACCELERATED;
+- }
+-#endif /* CIOCGSESSINFO */
+- }
+- ioctl(cfd, CIOCFSESSION, &sess.ses);
+- if (devcrypto_test_cipher(i)) {
+- known_cipher_nids[known_cipher_nids_amount++] =
+- cipher_data[i].nid;
+- }
+- }
+-}
+-
+-static void rebuild_known_cipher_nids(ENGINE *e)
+-{
+- size_t i;
+-
+- for (i = 0, known_cipher_nids_amount = 0; i < OSSL_NELEM(cipher_data); i++) {
+- if (devcrypto_test_cipher(i))
+- known_cipher_nids[known_cipher_nids_amount++] = cipher_data[i].nid;
+- }
+- ENGINE_unregister_ciphers(e);
+- ENGINE_register_ciphers(e);
+-}
+-
+-static const EVP_CIPHER *get_cipher_method(int nid)
+-{
+- size_t i = get_cipher_data_index(nid);
+-
+- if (i == (size_t)-1)
+- return NULL;
+- return known_cipher_methods[i];
+-}
+-
+-static int get_cipher_nids(const int **nids)
+-{
+- *nids = known_cipher_nids;
+- return known_cipher_nids_amount;
+-}
+-
+-static void destroy_cipher_method(int nid)
+-{
+- size_t i = get_cipher_data_index(nid);
+-
+- EVP_CIPHER_meth_free(known_cipher_methods[i]);
+- known_cipher_methods[i] = NULL;
+-}
+-
+-static void destroy_all_cipher_methods(void)
+-{
+- size_t i;
+-
+- for (i = 0; i < OSSL_NELEM(cipher_data); i++) {
+- destroy_cipher_method(cipher_data[i].nid);
+- OPENSSL_free(cipher_driver_info[i].driver_name);
+- cipher_driver_info[i].driver_name = NULL;
+- }
+-}
+-
+-static int devcrypto_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
+- const int **nids, int nid)
+-{
+- if (cipher == NULL)
+- return get_cipher_nids(nids);
+-
+- *cipher = get_cipher_method(nid);
+-
+- return *cipher != NULL;
+-}
+-
+-static void devcrypto_select_all_ciphers(int *cipher_list)
+-{
+- size_t i;
+-
+- for (i = 0; i < OSSL_NELEM(cipher_data); i++)
+- cipher_list[i] = 1;
+-}
+-
+-static int cryptodev_select_cipher_cb(const char *str, int len, void *usr)
+-{
+- int *cipher_list = (int *)usr;
+- char *name;
+- const EVP_CIPHER *EVP;
+- size_t i;
+-
+- if (len == 0)
+- return 1;
+- if (usr == NULL || (name = OPENSSL_strndup(str, len)) == NULL)
+- return 0;
+- EVP = EVP_get_cipherbyname(name);
+- if (EVP == NULL)
+- fprintf(stderr, "devcrypto: unknown cipher %s\n", name);
+- else if ((i = find_cipher_data_index(EVP_CIPHER_nid(EVP))) != (size_t)-1)
+- cipher_list[i] = 1;
+- else
+- fprintf(stderr, "devcrypto: cipher %s not available\n", name);
+- OPENSSL_free(name);
+- return 1;
+-}
+-
+-static void dump_cipher_info(void)
+-{
+- size_t i;
+- const char *name;
+-
+- fprintf (stderr, "Information about ciphers supported by the /dev/crypto"
+- " engine:\n");
+-#ifndef CIOCGSESSINFO
+- fprintf(stderr, "CIOCGSESSINFO (session info call) unavailable\n");
+-#endif
+- for (i = 0; i < OSSL_NELEM(cipher_data); i++) {
+- name = OBJ_nid2sn(cipher_data[i].nid);
+- fprintf (stderr, "Cipher %s, NID=%d, /dev/crypto info: id=%d, ",
+- name ? name : "unknown", cipher_data[i].nid,
+- cipher_data[i].devcryptoid);
+- if (cipher_driver_info[i].status == DEVCRYPTO_STATUS_NO_CIOCGSESSION ) {
+- fprintf (stderr, "CIOCGSESSION (session open call) failed\n");
+- continue;
+- }
+- fprintf (stderr, "driver=%s ", cipher_driver_info[i].driver_name ?
+- cipher_driver_info[i].driver_name : "unknown");
+- if (cipher_driver_info[i].accelerated == DEVCRYPTO_ACCELERATED)
+- fprintf(stderr, "(hw accelerated)");
+- else if (cipher_driver_info[i].accelerated == DEVCRYPTO_NOT_ACCELERATED)
+- fprintf(stderr, "(software)");
+- else
+- fprintf(stderr, "(acceleration status unknown)");
+- if (cipher_driver_info[i].status == DEVCRYPTO_STATUS_FAILURE)
+- fprintf (stderr, ". Cipher setup failed");
+- fprintf(stderr, "\n");
+- }
+- fprintf(stderr, "\n");
+-}
+-
+-/*
+- * We only support digests if the cryptodev implementation supports multiple
+- * data updates and session copying. Otherwise, we would be forced to maintain
+- * a cache, which is perilous if there's a lot of data coming in (if someone
+- * wants to checksum an OpenSSL tarball, for example).
+- */
+-#if defined(CIOCCPHASH) && defined(COP_FLAG_UPDATE) && defined(COP_FLAG_FINAL)
+-#define IMPLEMENT_DIGEST
+-
+-/******************************************************************************
+- *
+- * Digests
+- *
+- * Because they all do the same basic operation, we have only one set of
+- * method functions for them all to share, and a mapping table between
+- * NIDs and cryptodev IDs, with all the necessary size data.
+- *
+- *****/
+-
+-struct digest_ctx {
+- struct session_op sess;
+- /* This signals that the init function was called, not that it succeeded. */
+- int init_called;
+- unsigned char digest_res[HASH_MAX_LEN];
+-};
+-
+-static const struct digest_data_st {
+- int nid;
+- int blocksize;
+- int digestlen;
+- int devcryptoid;
+-} digest_data[] = {
+-#ifndef OPENSSL_NO_MD5
+- { NID_md5, /* MD5_CBLOCK */ 64, 16, CRYPTO_MD5 },
+-#endif
+- { NID_sha1, SHA_CBLOCK, 20, CRYPTO_SHA1 },
+-#ifndef OPENSSL_NO_RMD160
+-# if !defined(CHECK_BSD_STYLE_MACROS) || defined(CRYPTO_RIPEMD160)
+- { NID_ripemd160, /* RIPEMD160_CBLOCK */ 64, 20, CRYPTO_RIPEMD160 },
+-# endif
+-#endif
+-#if !defined(CHECK_BSD_STYLE_MACROS) || defined(CRYPTO_SHA2_224)
+- { NID_sha224, SHA256_CBLOCK, 224 / 8, CRYPTO_SHA2_224 },
+-#endif
+-#if !defined(CHECK_BSD_STYLE_MACROS) || defined(CRYPTO_SHA2_256)
+- { NID_sha256, SHA256_CBLOCK, 256 / 8, CRYPTO_SHA2_256 },
+-#endif
+-#if !defined(CHECK_BSD_STYLE_MACROS) || defined(CRYPTO_SHA2_384)
+- { NID_sha384, SHA512_CBLOCK, 384 / 8, CRYPTO_SHA2_384 },
+-#endif
+-#if !defined(CHECK_BSD_STYLE_MACROS) || defined(CRYPTO_SHA2_512)
+- { NID_sha512, SHA512_CBLOCK, 512 / 8, CRYPTO_SHA2_512 },
+-#endif
+-};
+-
+-static size_t find_digest_data_index(int nid)
+-{
+- size_t i;
+-
+- for (i = 0; i < OSSL_NELEM(digest_data); i++)
+- if (nid == digest_data[i].nid)
+- return i;
+- return (size_t)-1;
+-}
+-
+-static size_t get_digest_data_index(int nid)
+-{
+- size_t i = find_digest_data_index(nid);
+-
+- if (i != (size_t)-1)
+- return i;
+-
+- /*
+- * Code further down must make sure that only NIDs in the table above
+- * are used. If any other NID reaches this function, there's a grave
+- * coding error further down.
+- */
+- assert("Code that never should be reached" == NULL);
+- return -1;
+-}
+-
+-static const struct digest_data_st *get_digest_data(int nid)
+-{
+- return &digest_data[get_digest_data_index(nid)];
+-}
+-
+-/*
+- * Following are the five necessary functions to map OpenSSL functionality
+- * with cryptodev: init, update, final, cleanup, and copy.
+- */
+-
+-static int digest_init(EVP_MD_CTX *ctx)
+-{
+- struct digest_ctx *digest_ctx =
+- (struct digest_ctx *)EVP_MD_CTX_md_data(ctx);
+- const struct digest_data_st *digest_d =
+- get_digest_data(EVP_MD_CTX_type(ctx));
+-
+- digest_ctx->init_called = 1;
+-
+- memset(&digest_ctx->sess, 0, sizeof(digest_ctx->sess));
+- digest_ctx->sess.mac = digest_d->devcryptoid;
+- if (ioctl(cfd, CIOCGSESSION, &digest_ctx->sess) < 0) {
+- SYSerr(SYS_F_IOCTL, errno);
+- return 0;
+- }
+-
+- return 1;
+-}
+-
+-static int digest_op(struct digest_ctx *ctx, const void *src, size_t srclen,
+- void *res, unsigned int flags)
+-{
+- struct crypt_op cryp;
+-
+- memset(&cryp, 0, sizeof(cryp));
+- cryp.ses = ctx->sess.ses;
+- cryp.len = srclen;
+- cryp.src = (void *)src;
+- cryp.dst = NULL;
+- cryp.mac = res;
+- cryp.flags = flags;
+- return ioctl(cfd, CIOCCRYPT, &cryp);
+-}
+-
+-static int digest_update(EVP_MD_CTX *ctx, const void *data, size_t count)
+-{
+- struct digest_ctx *digest_ctx =
+- (struct digest_ctx *)EVP_MD_CTX_md_data(ctx);
+-
+- if (count == 0)
+- return 1;
+-
+- if (digest_ctx == NULL)
+- return 0;
+-
+- if (EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_ONESHOT)) {
+- if (digest_op(digest_ctx, data, count, digest_ctx->digest_res, 0) >= 0)
+- return 1;
+- } else if (digest_op(digest_ctx, data, count, NULL, COP_FLAG_UPDATE) >= 0) {
+- return 1;
+- }
+-
+- SYSerr(SYS_F_IOCTL, errno);
+- return 0;
+-}
+-
+-static int digest_final(EVP_MD_CTX *ctx, unsigned char *md)
+-{
+- struct digest_ctx *digest_ctx =
+- (struct digest_ctx *)EVP_MD_CTX_md_data(ctx);
+-
+- if (md == NULL || digest_ctx == NULL)
+- return 0;
+-
+- if (EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_ONESHOT)) {
+- memcpy(md, digest_ctx->digest_res, EVP_MD_CTX_size(ctx));
+- } else if (digest_op(digest_ctx, NULL, 0, md, COP_FLAG_FINAL) < 0) {
+- SYSerr(SYS_F_IOCTL, errno);
+- return 0;
+- }
+-
+- return 1;
+-}
+-
+-static int digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from)
+-{
+- struct digest_ctx *digest_from =
+- (struct digest_ctx *)EVP_MD_CTX_md_data(from);
+- struct digest_ctx *digest_to =
+- (struct digest_ctx *)EVP_MD_CTX_md_data(to);
+- struct cphash_op cphash;
+-
+- if (digest_from == NULL || digest_from->init_called != 1)
+- return 1;
+-
+- if (!digest_init(to)) {
+- SYSerr(SYS_F_IOCTL, errno);
+- return 0;
+- }
+-
+- cphash.src_ses = digest_from->sess.ses;
+- cphash.dst_ses = digest_to->sess.ses;
+- if (ioctl(cfd, CIOCCPHASH, &cphash) < 0) {
+- SYSerr(SYS_F_IOCTL, errno);
+- return 0;
+- }
+- return 1;
+-}
+-
+-static int digest_cleanup(EVP_MD_CTX *ctx)
+-{
+- struct digest_ctx *digest_ctx =
+- (struct digest_ctx *)EVP_MD_CTX_md_data(ctx);
+-
+- if (digest_ctx == NULL)
+- return 1;
+-
+- return clean_devcrypto_session(&digest_ctx->sess);
+-}
+-
+-/*
+- * Keep tables of known nids, associated methods, selected digests, and
+- * driver info.
+- * Note that known_digest_nids[] isn't necessarily indexed the same way as
+- * digest_data[] above, which the other tables are.
+- */
+-static int known_digest_nids[OSSL_NELEM(digest_data)];
+-static int known_digest_nids_amount = -1; /* -1 indicates not yet initialised */
+-static EVP_MD *known_digest_methods[OSSL_NELEM(digest_data)] = { NULL, };
+-static int selected_digests[OSSL_NELEM(digest_data)];
+-static struct driver_info_st digest_driver_info[OSSL_NELEM(digest_data)];
+-
+-static int devcrypto_test_digest(size_t digest_data_index)
+-{
+- return (digest_driver_info[digest_data_index].status == DEVCRYPTO_STATUS_USABLE
+- && selected_digests[digest_data_index] == 1
+- && (digest_driver_info[digest_data_index].accelerated
+- == DEVCRYPTO_ACCELERATED
+- || use_softdrivers == DEVCRYPTO_USE_SOFTWARE
+- || (digest_driver_info[digest_data_index].accelerated
+- != DEVCRYPTO_NOT_ACCELERATED
+- && use_softdrivers == DEVCRYPTO_REJECT_SOFTWARE)));
+-}
+-
+-static void rebuild_known_digest_nids(ENGINE *e)
+-{
+- size_t i;
+-
+- for (i = 0, known_digest_nids_amount = 0; i < OSSL_NELEM(digest_data); i++) {
+- if (devcrypto_test_digest(i))
+- known_digest_nids[known_digest_nids_amount++] = digest_data[i].nid;
+- }
+- ENGINE_unregister_digests(e);
+- ENGINE_register_digests(e);
+-}
+-
+-static void prepare_digest_methods(void)
+-{
+- size_t i;
+- struct session_op sess1, sess2;
+-#ifdef CIOCGSESSINFO
+- struct session_info_op siop;
+-#endif
+- struct cphash_op cphash;
+-
+- memset(&digest_driver_info, 0, sizeof(digest_driver_info));
+-
+- memset(&sess1, 0, sizeof(sess1));
+- memset(&sess2, 0, sizeof(sess2));
+-
+- for (i = 0, known_digest_nids_amount = 0; i < OSSL_NELEM(digest_data);
+- i++) {
+-
+- selected_digests[i] = 1;
+-
+- /*
+- * Check that the digest is usable
+- */
+- sess1.mac = digest_data[i].devcryptoid;
+- sess2.ses = 0;
+- if (ioctl(cfd, CIOCGSESSION, &sess1) < 0) {
+- digest_driver_info[i].status = DEVCRYPTO_STATUS_NO_CIOCGSESSION;
+- goto finish;
+- }
+-
+-#ifdef CIOCGSESSINFO
+- /* gather hardware acceleration info from the driver */
+- siop.ses = sess1.ses;
+- if (ioctl(cfd, CIOCGSESSINFO, &siop) < 0) {
+- digest_driver_info[i].accelerated = DEVCRYPTO_ACCELERATION_UNKNOWN;
+- } else {
+- digest_driver_info[i].driver_name =
+- OPENSSL_strndup(siop.hash_info.cra_driver_name,
+- CRYPTODEV_MAX_ALG_NAME);
+- if (siop.flags & SIOP_FLAG_KERNEL_DRIVER_ONLY)
+- digest_driver_info[i].accelerated = DEVCRYPTO_ACCELERATED;
+- else
+- digest_driver_info[i].accelerated = DEVCRYPTO_NOT_ACCELERATED;
+- }
+-#endif
+-
+- /* digest must be capable of hash state copy */
+- sess2.mac = sess1.mac;
+- if (ioctl(cfd, CIOCGSESSION, &sess2) < 0) {
+- digest_driver_info[i].status = DEVCRYPTO_STATUS_FAILURE;
+- goto finish;
+- }
+- cphash.src_ses = sess1.ses;
+- cphash.dst_ses = sess2.ses;
+- if (ioctl(cfd, CIOCCPHASH, &cphash) < 0) {
+- digest_driver_info[i].status = DEVCRYPTO_STATUS_NO_CIOCCPHASH;
+- goto finish;
+- }
+- if ((known_digest_methods[i] = EVP_MD_meth_new(digest_data[i].nid,
+- NID_undef)) == NULL
+- || !EVP_MD_meth_set_input_blocksize(known_digest_methods[i],
+- digest_data[i].blocksize)
+- || !EVP_MD_meth_set_result_size(known_digest_methods[i],
+- digest_data[i].digestlen)
+- || !EVP_MD_meth_set_init(known_digest_methods[i], digest_init)
+- || !EVP_MD_meth_set_update(known_digest_methods[i], digest_update)
+- || !EVP_MD_meth_set_final(known_digest_methods[i], digest_final)
+- || !EVP_MD_meth_set_copy(known_digest_methods[i], digest_copy)
+- || !EVP_MD_meth_set_cleanup(known_digest_methods[i], digest_cleanup)
+- || !EVP_MD_meth_set_app_datasize(known_digest_methods[i],
+- sizeof(struct digest_ctx))) {
+- digest_driver_info[i].status = DEVCRYPTO_STATUS_FAILURE;
+- EVP_MD_meth_free(known_digest_methods[i]);
+- known_digest_methods[i] = NULL;
+- goto finish;
+- }
+- digest_driver_info[i].status = DEVCRYPTO_STATUS_USABLE;
+-finish:
+- ioctl(cfd, CIOCFSESSION, &sess1.ses);
+- if (sess2.ses != 0)
+- ioctl(cfd, CIOCFSESSION, &sess2.ses);
+- if (devcrypto_test_digest(i))
+- known_digest_nids[known_digest_nids_amount++] = digest_data[i].nid;
+- }
+-}
+-
+-static const EVP_MD *get_digest_method(int nid)
+-{
+- size_t i = get_digest_data_index(nid);
+-
+- if (i == (size_t)-1)
+- return NULL;
+- return known_digest_methods[i];
+-}
+-
+-static int get_digest_nids(const int **nids)
+-{
+- *nids = known_digest_nids;
+- return known_digest_nids_amount;
+-}
+-
+-static void destroy_digest_method(int nid)
+-{
+- size_t i = get_digest_data_index(nid);
+-
+- EVP_MD_meth_free(known_digest_methods[i]);
+- known_digest_methods[i] = NULL;
+-}
+-
+-static void destroy_all_digest_methods(void)
+-{
+- size_t i;
+-
+- for (i = 0; i < OSSL_NELEM(digest_data); i++) {
+- destroy_digest_method(digest_data[i].nid);
+- OPENSSL_free(digest_driver_info[i].driver_name);
+- digest_driver_info[i].driver_name = NULL;
+- }
+-}
+-
+-static int devcrypto_digests(ENGINE *e, const EVP_MD **digest,
+- const int **nids, int nid)
+-{
+- if (digest == NULL)
+- return get_digest_nids(nids);
+-
+- *digest = get_digest_method(nid);
+-
+- return *digest != NULL;
+-}
+-
+-static void devcrypto_select_all_digests(int *digest_list)
+-{
+- size_t i;
+-
+- for (i = 0; i < OSSL_NELEM(digest_data); i++)
+- digest_list[i] = 1;
+-}
+-
+-static int cryptodev_select_digest_cb(const char *str, int len, void *usr)
+-{
+- int *digest_list = (int *)usr;
+- char *name;
+- const EVP_MD *EVP;
+- size_t i;
+-
+- if (len == 0)
+- return 1;
+- if (usr == NULL || (name = OPENSSL_strndup(str, len)) == NULL)
+- return 0;
+- EVP = EVP_get_digestbyname(name);
+- if (EVP == NULL)
+- fprintf(stderr, "devcrypto: unknown digest %s\n", name);
+- else if ((i = find_digest_data_index(EVP_MD_type(EVP))) != (size_t)-1)
+- digest_list[i] = 1;
+- else
+- fprintf(stderr, "devcrypto: digest %s not available\n", name);
+- OPENSSL_free(name);
+- return 1;
+-}
+-
+-static void dump_digest_info(void)
+-{
+- size_t i;
+- const char *name;
+-
+- fprintf (stderr, "Information about digests supported by the /dev/crypto"
+- " engine:\n");
+-#ifndef CIOCGSESSINFO
+- fprintf(stderr, "CIOCGSESSINFO (session info call) unavailable\n");
+-#endif
+-
+- for (i = 0; i < OSSL_NELEM(digest_data); i++) {
+- name = OBJ_nid2sn(digest_data[i].nid);
+- fprintf (stderr, "Digest %s, NID=%d, /dev/crypto info: id=%d, driver=%s",
+- name ? name : "unknown", digest_data[i].nid,
+- digest_data[i].devcryptoid,
+- digest_driver_info[i].driver_name ? digest_driver_info[i].driver_name : "unknown");
+- if (digest_driver_info[i].status == DEVCRYPTO_STATUS_NO_CIOCGSESSION) {
+- fprintf (stderr, ". CIOCGSESSION (session open) failed\n");
+- continue;
+- }
+- if (digest_driver_info[i].accelerated == DEVCRYPTO_ACCELERATED)
+- fprintf(stderr, " (hw accelerated)");
+- else if (digest_driver_info[i].accelerated == DEVCRYPTO_NOT_ACCELERATED)
+- fprintf(stderr, " (software)");
+- else
+- fprintf(stderr, " (acceleration status unknown)");
+- if (cipher_driver_info[i].status == DEVCRYPTO_STATUS_FAILURE)
+- fprintf (stderr, ". Cipher setup failed\n");
+- else if (digest_driver_info[i].status == DEVCRYPTO_STATUS_NO_CIOCCPHASH)
+- fprintf(stderr, ", CIOCCPHASH failed\n");
+- else
+- fprintf(stderr, ", CIOCCPHASH capable\n");
+- }
+- fprintf(stderr, "\n");
+-}
+-
+-#endif
+-
+-/******************************************************************************
+- *
+- * CONTROL COMMANDS
+- *
+- *****/
+-
+-#define DEVCRYPTO_CMD_USE_SOFTDRIVERS ENGINE_CMD_BASE
+-#define DEVCRYPTO_CMD_CIPHERS (ENGINE_CMD_BASE + 1)
+-#define DEVCRYPTO_CMD_DIGESTS (ENGINE_CMD_BASE + 2)
+-#define DEVCRYPTO_CMD_DUMP_INFO (ENGINE_CMD_BASE + 3)
+-
+-/* Helper macros for CPP string composition */
+-#ifndef OPENSSL_MSTR
+-# define OPENSSL_MSTR_HELPER(x) #x
+-# define OPENSSL_MSTR(x) OPENSSL_MSTR_HELPER(x)
+-#endif
+-
+-static const ENGINE_CMD_DEFN devcrypto_cmds[] = {
+-#ifdef CIOCGSESSINFO
+- {DEVCRYPTO_CMD_USE_SOFTDRIVERS,
+- "USE_SOFTDRIVERS",
+- "specifies whether to use software (not accelerated) drivers ("
+- OPENSSL_MSTR(DEVCRYPTO_REQUIRE_ACCELERATED) "=use only accelerated drivers, "
+- OPENSSL_MSTR(DEVCRYPTO_USE_SOFTWARE) "=allow all drivers, "
+- OPENSSL_MSTR(DEVCRYPTO_REJECT_SOFTWARE)
+- "=use if acceleration can't be determined) [default="
+- OPENSSL_MSTR(DEVCRYPTO_DEFAULT_USE_SOFDTRIVERS) "]",
+- ENGINE_CMD_FLAG_NUMERIC},
+-#endif
+-
+- {DEVCRYPTO_CMD_CIPHERS,
+- "CIPHERS",
+- "either ALL, NONE, or a comma-separated list of ciphers to enable [default=ALL]",
+- ENGINE_CMD_FLAG_STRING},
+-
+-#ifdef IMPLEMENT_DIGEST
+- {DEVCRYPTO_CMD_DIGESTS,
+- "DIGESTS",
+- "either ALL, NONE, or a comma-separated list of digests to enable [default=ALL]",
+- ENGINE_CMD_FLAG_STRING},
+-#endif
+-
+- {DEVCRYPTO_CMD_DUMP_INFO,
+- "DUMP_INFO",
+- "dump info about each algorithm to stderr; use 'openssl engine -pre DUMP_INFO devcrypto'",
+- ENGINE_CMD_FLAG_NO_INPUT},
+-
+- {0, NULL, NULL, 0}
+-};
+-
+-static int devcrypto_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void))
+-{
+- int *new_list;
+- switch (cmd) {
+-#ifdef CIOCGSESSINFO
+- case DEVCRYPTO_CMD_USE_SOFTDRIVERS:
+- switch (i) {
+- case DEVCRYPTO_REQUIRE_ACCELERATED:
+- case DEVCRYPTO_USE_SOFTWARE:
+- case DEVCRYPTO_REJECT_SOFTWARE:
+- break;
+- default:
+- fprintf(stderr, "devcrypto: invalid value (%ld) for USE_SOFTDRIVERS\n", i);
+- return 0;
+- }
+- if (use_softdrivers == i)
+- return 1;
+- use_softdrivers = i;
+-#ifdef IMPLEMENT_DIGEST
+- rebuild_known_digest_nids(e);
+-#endif
+- rebuild_known_cipher_nids(e);
+- return 1;
+-#endif /* CIOCGSESSINFO */
+-
+- case DEVCRYPTO_CMD_CIPHERS:
+- if (p == NULL)
+- return 1;
+- if (strcasecmp((const char *)p, "ALL") == 0) {
+- devcrypto_select_all_ciphers(selected_ciphers);
+- } else if (strcasecmp((const char*)p, "NONE") == 0) {
+- memset(selected_ciphers, 0, sizeof(selected_ciphers));
+- } else {
+- new_list=OPENSSL_zalloc(sizeof(selected_ciphers));
+- if (!CONF_parse_list(p, ',', 1, cryptodev_select_cipher_cb, new_list)) {
+- OPENSSL_free(new_list);
+- return 0;
+- }
+- memcpy(selected_ciphers, new_list, sizeof(selected_ciphers));
+- OPENSSL_free(new_list);
+- }
+- rebuild_known_cipher_nids(e);
+- return 1;
+-
+-#ifdef IMPLEMENT_DIGEST
+- case DEVCRYPTO_CMD_DIGESTS:
+- if (p == NULL)
+- return 1;
+- if (strcasecmp((const char *)p, "ALL") == 0) {
+- devcrypto_select_all_digests(selected_digests);
+- } else if (strcasecmp((const char*)p, "NONE") == 0) {
+- memset(selected_digests, 0, sizeof(selected_digests));
+- } else {
+- new_list=OPENSSL_zalloc(sizeof(selected_digests));
+- if (!CONF_parse_list(p, ',', 1, cryptodev_select_digest_cb, new_list)) {
+- OPENSSL_free(new_list);
+- return 0;
+- }
+- memcpy(selected_digests, new_list, sizeof(selected_digests));
+- OPENSSL_free(new_list);
+- }
+- rebuild_known_digest_nids(e);
+- return 1;
+-#endif /* IMPLEMENT_DIGEST */
+-
+- case DEVCRYPTO_CMD_DUMP_INFO:
+- dump_cipher_info();
+-#ifdef IMPLEMENT_DIGEST
+- dump_digest_info();
+-#endif
+- return 1;
+-
+- default:
+- break;
+- }
+- return 0;
+-}
+-
+-/******************************************************************************
+- *
+- * LOAD / UNLOAD
+- *
+- *****/
+-
+-static int devcrypto_unload(ENGINE *e)
+-{
+- destroy_all_cipher_methods();
+-#ifdef IMPLEMENT_DIGEST
+- destroy_all_digest_methods();
+-#endif
+-
+- close(cfd);
+-
+- return 1;
+-}
+-/*
+- * This engine is always built into libcrypto, so it doesn't offer any
+- * ability to be dynamically loadable.
+- */
+-void engine_load_devcrypto_int()
+-{
+- ENGINE *e = NULL;
+- int fd;
+-
+- if ((fd = open("/dev/crypto", O_RDWR, 0)) < 0) {
+-#ifndef ENGINE_DEVCRYPTO_DEBUG
+- if (errno != ENOENT)
+-#endif
+- fprintf(stderr, "Could not open /dev/crypto: %s\n", strerror(errno));
+- return;
+- }
+-
+-#ifdef CRIOGET
+- if (ioctl(fd, CRIOGET, &cfd) < 0) {
+- fprintf(stderr, "Could not create crypto fd: %s\n", strerror(errno));
+- close(fd);
+- cfd = -1;
+- return;
+- }
+- close(fd);
+-#else
+- cfd = fd;
+-#endif
+-
+- if ((e = ENGINE_new()) == NULL
+- || !ENGINE_set_destroy_function(e, devcrypto_unload)) {
+- ENGINE_free(e);
+- /*
+- * We know that devcrypto_unload() won't be called when one of the
+- * above two calls have failed, so we close cfd explicitly here to
+- * avoid leaking resources.
+- */
+- close(cfd);
+- return;
+- }
+-
+- prepare_cipher_methods();
+-#ifdef IMPLEMENT_DIGEST
+- prepare_digest_methods();
+-#endif
+-
+- if (!ENGINE_set_id(e, "devcrypto")
+- || !ENGINE_set_name(e, "/dev/crypto engine")
+- || !ENGINE_set_cmd_defns(e, devcrypto_cmds)
+- || !ENGINE_set_ctrl_function(e, devcrypto_ctrl)
+-
+-/*
+- * Asymmetric ciphers aren't well supported with /dev/crypto. Among the BSD
+- * implementations, it seems to only exist in FreeBSD, and regarding the
+- * parameters in its crypt_kop, the manual crypto(4) has this to say:
+- *
+- * The semantics of these arguments are currently undocumented.
+- *
+- * Reading through the FreeBSD source code doesn't give much more than
+- * their CRK_MOD_EXP implementation for ubsec.
+- *
+- * It doesn't look much better with cryptodev-linux. They have the crypt_kop
+- * structure as well as the command (CRK_*) in cryptodev.h, but no support
+- * seems to be implemented at all for the moment.
+- *
+- * At the time of writing, it seems impossible to write proper support for
+- * FreeBSD's asym features without some very deep knowledge and access to
+- * specific kernel modules.
+- *
+- * /Richard Levitte, 2017-05-11
+- */
+-#if 0
+-# ifndef OPENSSL_NO_RSA
+- || !ENGINE_set_RSA(e, devcrypto_rsa)
+-# endif
+-# ifndef OPENSSL_NO_DSA
+- || !ENGINE_set_DSA(e, devcrypto_dsa)
+-# endif
+-# ifndef OPENSSL_NO_DH
+- || !ENGINE_set_DH(e, devcrypto_dh)
+-# endif
+-# ifndef OPENSSL_NO_EC
+- || !ENGINE_set_EC(e, devcrypto_ec)
+-# endif
+-#endif
+- || !ENGINE_set_ciphers(e, devcrypto_ciphers)
+-#ifdef IMPLEMENT_DIGEST
+- || !ENGINE_set_digests(e, devcrypto_digests)
+-#endif
+- ) {
+- ENGINE_free(e);
+- return;
+- }
+-
+- ENGINE_add(e);
+- ENGINE_free(e); /* Loose our local reference */
+- ERR_clear_error();
+-}
+--- /dev/null
+++ b/engines/e_devcrypto.c
-@@ -7,7 +7,7 @@
- * https://www.openssl.org/source/license.html
- */
-
--#include "e_os.h"
+@@ -0,0 +1,1327 @@
++/*
++ * Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
++ *
++ * Licensed under the OpenSSL license (the "License"). You may not use
++ * this file except in compliance with the License. You can obtain a copy
++ * in the file LICENSE in the source distribution or at
++ * https://www.openssl.org/source/license.html
++ */
++
+#include "../e_os.h"
- #include <string.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -31,18 +31,20 @@
- # define CHECK_BSD_STYLE_MACROS
- #endif
-
++#include <string.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <fcntl.h>
++#include <sys/ioctl.h>
++#include <unistd.h>
++#include <assert.h>
++
++#include <openssl/conf.h>
++#include <openssl/evp.h>
++#include <openssl/err.h>
++#include <openssl/engine.h>
++#include <openssl/objects.h>
++#include <crypto/cryptodev.h>
++
++#include "crypto/engine.h"
++
++/* #define ENGINE_DEVCRYPTO_DEBUG */
++
++#if CRYPTO_ALGORITHM_MIN < CRYPTO_ALGORITHM_MAX
++# define CHECK_BSD_STYLE_MACROS
++#endif
++
+#define engine_devcrypto_id "devcrypto"
+
- /*
- * ONE global file descriptor for all sessions. This allows operations
- * such as digest session data copying (see digest_copy()), but is also
- * saner... why re-open /dev/crypto for every session?
- */
--static int cfd;
-+static int cfd = -1;
- #define DEVCRYPTO_REQUIRE_ACCELERATED 0 /* require confirmation of acceleration */
- #define DEVCRYPTO_USE_SOFTWARE 1 /* allow software drivers */
- #define DEVCRYPTO_REJECT_SOFTWARE 2 /* only disallow confirmed software drivers */
-
--#define DEVCRYPTO_DEFAULT_USE_SOFDTRIVERS DEVCRYPTO_REJECT_SOFTWARE
--static int use_softdrivers = DEVCRYPTO_DEFAULT_USE_SOFDTRIVERS;
-+#define DEVCRYPTO_DEFAULT_USE_SOFTDRIVERS DEVCRYPTO_REJECT_SOFTWARE
-+static int use_softdrivers = DEVCRYPTO_DEFAULT_USE_SOFTDRIVERS;
-
- /*
- * cipher/digest status & acceleration definitions
-@@ -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="
-- OPENSSL_MSTR(DEVCRYPTO_DEFAULT_USE_SOFDTRIVERS) "]",
++/*
++ * ONE global file descriptor for all sessions. This allows operations
++ * such as digest session data copying (see digest_copy()), but is also
++ * saner... why re-open /dev/crypto for every session?
++ */
++static int cfd = -1;
++#define DEVCRYPTO_REQUIRE_ACCELERATED 0 /* require confirmation of acceleration */
++#define DEVCRYPTO_USE_SOFTWARE 1 /* allow software drivers */
++#define DEVCRYPTO_REJECT_SOFTWARE 2 /* only disallow confirmed software drivers */
++
++#define DEVCRYPTO_DEFAULT_USE_SOFTDRIVERS DEVCRYPTO_REJECT_SOFTWARE
++static int use_softdrivers = DEVCRYPTO_DEFAULT_USE_SOFTDRIVERS;
++
++/*
++ * cipher/digest status & acceleration definitions
++ * Make sure the defaults are set to 0
++ */
++struct driver_info_st {
++ enum devcrypto_status_t {
++ DEVCRYPTO_STATUS_FAILURE = -3, /* unusable for other reason */
++ DEVCRYPTO_STATUS_NO_CIOCCPHASH = -2, /* hash state copy not supported */
++ DEVCRYPTO_STATUS_NO_CIOCGSESSION = -1, /* session open failed */
++ DEVCRYPTO_STATUS_UNKNOWN = 0, /* not tested yet */
++ DEVCRYPTO_STATUS_USABLE = 1 /* algo can be used */
++ } status;
++
++ enum devcrypto_accelerated_t {
++ DEVCRYPTO_NOT_ACCELERATED = -1, /* software implemented */
++ DEVCRYPTO_ACCELERATION_UNKNOWN = 0, /* acceleration support unkown */
++ DEVCRYPTO_ACCELERATED = 1 /* hardware accelerated */
++ } accelerated;
++
++ char *driver_name;
++};
++
++static int clean_devcrypto_session(struct session_op *sess) {
++ if (ioctl(cfd, CIOCFSESSION, &sess->ses) < 0) {
++ SYSerr(SYS_F_IOCTL, errno);
++ return 0;
++ }
++ memset(sess, 0, sizeof(struct session_op));
++ return 1;
++}
++
++/******************************************************************************
++ *
++ * Ciphers
++ *
++ * Because they all do the same basic operation, we have only one set of
++ * method functions for them all to share, and a mapping table between
++ * NIDs and cryptodev IDs, with all the necessary size data.
++ *
++ *****/
++
++struct cipher_ctx {
++ struct session_op sess;
++ int op; /* COP_ENCRYPT or COP_DECRYPT */
++ unsigned long mode; /* EVP_CIPH_*_MODE */
++
++ /* to handle ctr mode being a stream cipher */
++ unsigned char partial[EVP_MAX_BLOCK_LENGTH];
++ unsigned int blocksize, num;
++};
++
++static const struct cipher_data_st {
++ int nid;
++ int blocksize;
++ int keylen;
++ int ivlen;
++ int flags;
++ int devcryptoid;
++} cipher_data[] = {
++#ifndef OPENSSL_NO_DES
++ { NID_des_cbc, 8, 8, 8, EVP_CIPH_CBC_MODE, CRYPTO_DES_CBC },
++ { NID_des_ede3_cbc, 8, 24, 8, EVP_CIPH_CBC_MODE, CRYPTO_3DES_CBC },
++#endif
++#ifndef OPENSSL_NO_BF
++ { NID_bf_cbc, 8, 16, 8, EVP_CIPH_CBC_MODE, CRYPTO_BLF_CBC },
++#endif
++#ifndef OPENSSL_NO_CAST
++ { NID_cast5_cbc, 8, 16, 8, EVP_CIPH_CBC_MODE, CRYPTO_CAST_CBC },
++#endif
++ { NID_aes_128_cbc, 16, 128 / 8, 16, EVP_CIPH_CBC_MODE, CRYPTO_AES_CBC },
++ { NID_aes_192_cbc, 16, 192 / 8, 16, EVP_CIPH_CBC_MODE, CRYPTO_AES_CBC },
++ { NID_aes_256_cbc, 16, 256 / 8, 16, EVP_CIPH_CBC_MODE, CRYPTO_AES_CBC },
++#ifndef OPENSSL_NO_RC4
++ { NID_rc4, 1, 16, 0, EVP_CIPH_STREAM_CIPHER, CRYPTO_ARC4 },
++#endif
++#if !defined(CHECK_BSD_STYLE_MACROS) || defined(CRYPTO_AES_CTR)
++ { NID_aes_128_ctr, 16, 128 / 8, 16, EVP_CIPH_CTR_MODE, CRYPTO_AES_CTR },
++ { NID_aes_192_ctr, 16, 192 / 8, 16, EVP_CIPH_CTR_MODE, CRYPTO_AES_CTR },
++ { NID_aes_256_ctr, 16, 256 / 8, 16, EVP_CIPH_CTR_MODE, CRYPTO_AES_CTR },
++#endif
++#if 0 /* Not yet supported */
++ { NID_aes_128_xts, 16, 128 / 8 * 2, 16, EVP_CIPH_XTS_MODE, CRYPTO_AES_XTS },
++ { NID_aes_256_xts, 16, 256 / 8 * 2, 16, EVP_CIPH_XTS_MODE, CRYPTO_AES_XTS },
++#endif
++#if !defined(CHECK_BSD_STYLE_MACROS) || defined(CRYPTO_AES_ECB)
++ { NID_aes_128_ecb, 16, 128 / 8, 0, EVP_CIPH_ECB_MODE, CRYPTO_AES_ECB },
++ { NID_aes_192_ecb, 16, 192 / 8, 0, EVP_CIPH_ECB_MODE, CRYPTO_AES_ECB },
++ { NID_aes_256_ecb, 16, 256 / 8, 0, EVP_CIPH_ECB_MODE, CRYPTO_AES_ECB },
++#endif
++#if 0 /* Not yet supported */
++ { NID_aes_128_gcm, 16, 128 / 8, 16, EVP_CIPH_GCM_MODE, CRYPTO_AES_GCM },
++ { NID_aes_192_gcm, 16, 192 / 8, 16, EVP_CIPH_GCM_MODE, CRYPTO_AES_GCM },
++ { NID_aes_256_gcm, 16, 256 / 8, 16, EVP_CIPH_GCM_MODE, CRYPTO_AES_GCM },
++#endif
++#ifndef OPENSSL_NO_CAMELLIA
++ { NID_camellia_128_cbc, 16, 128 / 8, 16, EVP_CIPH_CBC_MODE,
++ CRYPTO_CAMELLIA_CBC },
++ { NID_camellia_192_cbc, 16, 192 / 8, 16, EVP_CIPH_CBC_MODE,
++ CRYPTO_CAMELLIA_CBC },
++ { NID_camellia_256_cbc, 16, 256 / 8, 16, EVP_CIPH_CBC_MODE,
++ CRYPTO_CAMELLIA_CBC },
++#endif
++};
++
++static size_t find_cipher_data_index(int nid)
++{
++ size_t i;
++
++ for (i = 0; i < OSSL_NELEM(cipher_data); i++)
++ if (nid == cipher_data[i].nid)
++ return i;
++ return (size_t)-1;
++}
++
++static size_t get_cipher_data_index(int nid)
++{
++ size_t i = find_cipher_data_index(nid);
++
++ if (i != (size_t)-1)
++ return i;
++
++ /*
++ * Code further down must make sure that only NIDs in the table above
++ * are used. If any other NID reaches this function, there's a grave
++ * coding error further down.
++ */
++ assert("Code that never should be reached" == NULL);
++ return -1;
++}
++
++static const struct cipher_data_st *get_cipher_data(int nid)
++{
++ return &cipher_data[get_cipher_data_index(nid)];
++}
++
++/*
++ * Following are the three necessary functions to map OpenSSL functionality
++ * with cryptodev.
++ */
++
++static int cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
++ const unsigned char *iv, int enc)
++{
++ struct cipher_ctx *cipher_ctx =
++ (struct cipher_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
++ const struct cipher_data_st *cipher_d =
++ get_cipher_data(EVP_CIPHER_CTX_nid(ctx));
++
++ /* cleanup a previous session */
++ if (cipher_ctx->sess.ses != 0 &&
++ clean_devcrypto_session(&cipher_ctx->sess) == 0)
++ return 0;
++
++ cipher_ctx->sess.cipher = cipher_d->devcryptoid;
++ cipher_ctx->sess.keylen = cipher_d->keylen;
++ cipher_ctx->sess.key = (void *)key;
++ cipher_ctx->op = enc ? COP_ENCRYPT : COP_DECRYPT;
++ cipher_ctx->mode = cipher_d->flags & EVP_CIPH_MODE;
++ cipher_ctx->blocksize = cipher_d->blocksize;
++ if (ioctl(cfd, CIOCGSESSION, &cipher_ctx->sess) < 0) {
++ SYSerr(SYS_F_IOCTL, errno);
++ return 0;
++ }
++
++ return 1;
++}
++
++static int cipher_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
++ const unsigned char *in, size_t inl)
++{
++ struct cipher_ctx *cipher_ctx =
++ (struct cipher_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
++ struct crypt_op cryp;
++ unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx);
++#if !defined(COP_FLAG_WRITE_IV)
++ unsigned char saved_iv[EVP_MAX_IV_LENGTH];
++ const unsigned char *ivptr;
++ size_t nblocks, ivlen;
++#endif
++
++ memset(&cryp, 0, sizeof(cryp));
++ cryp.ses = cipher_ctx->sess.ses;
++ cryp.len = inl;
++ cryp.src = (void *)in;
++ cryp.dst = (void *)out;
++ cryp.iv = (void *)iv;
++ cryp.op = cipher_ctx->op;
++#if !defined(COP_FLAG_WRITE_IV)
++ cryp.flags = 0;
++
++ ivlen = EVP_CIPHER_CTX_iv_length(ctx);
++ if (ivlen > 0)
++ switch (cipher_ctx->mode) {
++ case EVP_CIPH_CBC_MODE:
++ assert(inl >= ivlen);
++ if (!EVP_CIPHER_CTX_encrypting(ctx)) {
++ ivptr = in + inl - ivlen;
++ memcpy(saved_iv, ivptr, ivlen);
++ }
++ break;
++
++ case EVP_CIPH_CTR_MODE:
++ break;
++
++ default: /* should not happen */
++ return 0;
++ }
++#else
++ cryp.flags = COP_FLAG_WRITE_IV;
++#endif
++
++ if (ioctl(cfd, CIOCCRYPT, &cryp) < 0) {
++ SYSerr(SYS_F_IOCTL, errno);
++ return 0;
++ }
++
++#if !defined(COP_FLAG_WRITE_IV)
++ if (ivlen > 0)
++ switch (cipher_ctx->mode) {
++ case EVP_CIPH_CBC_MODE:
++ assert(inl >= ivlen);
++ if (EVP_CIPHER_CTX_encrypting(ctx))
++ ivptr = out + inl - ivlen;
++ else
++ ivptr = saved_iv;
++
++ memcpy(iv, ivptr, ivlen);
++ break;
++
++ case EVP_CIPH_CTR_MODE:
++ nblocks = (inl + cipher_ctx->blocksize - 1)
++ / cipher_ctx->blocksize;
++ do {
++ ivlen--;
++ nblocks += iv[ivlen];
++ iv[ivlen] = (uint8_t) nblocks;
++ nblocks >>= 8;
++ } while (ivlen);
++ break;
++
++ default: /* should not happen */
++ return 0;
++ }
++#endif
++
++ return 1;
++}
++
++static int ctr_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
++ const unsigned char *in, size_t inl)
++{
++ struct cipher_ctx *cipher_ctx =
++ (struct cipher_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
++ size_t nblocks, len;
++
++ /* initial partial block */
++ while (cipher_ctx->num && inl) {
++ (*out++) = *(in++) ^ cipher_ctx->partial[cipher_ctx->num];
++ --inl;
++ cipher_ctx->num = (cipher_ctx->num + 1) % cipher_ctx->blocksize;
++ }
++
++ /* full blocks */
++ if (inl > (unsigned int) cipher_ctx->blocksize) {
++ nblocks = inl/cipher_ctx->blocksize;
++ len = nblocks * cipher_ctx->blocksize;
++ if (cipher_do_cipher(ctx, out, in, len) < 1)
++ return 0;
++ inl -= len;
++ out += len;
++ in += len;
++ }
++
++ /* final partial block */
++ if (inl) {
++ memset(cipher_ctx->partial, 0, cipher_ctx->blocksize);
++ if (cipher_do_cipher(ctx, cipher_ctx->partial, cipher_ctx->partial,
++ cipher_ctx->blocksize) < 1)
++ return 0;
++ while (inl--) {
++ out[cipher_ctx->num] = in[cipher_ctx->num]
++ ^ cipher_ctx->partial[cipher_ctx->num];
++ cipher_ctx->num++;
++ }
++ }
++
++ return 1;
++}
++
++static int cipher_ctrl(EVP_CIPHER_CTX *ctx, int type, int p1, void* p2)
++{
++ struct cipher_ctx *cipher_ctx =
++ (struct cipher_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
++ EVP_CIPHER_CTX *to_ctx = (EVP_CIPHER_CTX *)p2;
++ struct cipher_ctx *to_cipher_ctx;
++
++ switch (type) {
++ case EVP_CTRL_COPY:
++ if (cipher_ctx == NULL)
++ return 1;
++ /* when copying the context, a new session needs to be initialized */
++ to_cipher_ctx =
++ (struct cipher_ctx *)EVP_CIPHER_CTX_get_cipher_data(to_ctx);
++ memset(&to_cipher_ctx->sess, 0, sizeof(to_cipher_ctx->sess));
++ return cipher_init(to_ctx, cipher_ctx->sess.key, EVP_CIPHER_CTX_iv(ctx),
++ (cipher_ctx->op == COP_ENCRYPT));
++
++ case EVP_CTRL_INIT:
++ memset(&cipher_ctx->sess, 0, sizeof(cipher_ctx->sess));
++ return 1;
++
++ default:
++ break;
++ }
++
++ return -1;
++}
++
++static int cipher_cleanup(EVP_CIPHER_CTX *ctx)
++{
++ struct cipher_ctx *cipher_ctx =
++ (struct cipher_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
++
++ return clean_devcrypto_session(&cipher_ctx->sess);
++}
++
++/*
++ * Keep tables of known nids, associated methods, selected ciphers, and driver
++ * info.
++ * Note that known_cipher_nids[] isn't necessarily indexed the same way as
++ * cipher_data[] above, which the other tables are.
++ */
++static int known_cipher_nids[OSSL_NELEM(cipher_data)];
++static int known_cipher_nids_amount = -1; /* -1 indicates not yet initialised */
++static EVP_CIPHER *known_cipher_methods[OSSL_NELEM(cipher_data)] = { NULL, };
++static int selected_ciphers[OSSL_NELEM(cipher_data)];
++static struct driver_info_st cipher_driver_info[OSSL_NELEM(cipher_data)];
++
++
++static int devcrypto_test_cipher(size_t cipher_data_index)
++{
++ return (cipher_driver_info[cipher_data_index].status == DEVCRYPTO_STATUS_USABLE
++ && selected_ciphers[cipher_data_index] == 1
++ && (cipher_driver_info[cipher_data_index].accelerated
++ == DEVCRYPTO_ACCELERATED
++ || use_softdrivers == DEVCRYPTO_USE_SOFTWARE
++ || (cipher_driver_info[cipher_data_index].accelerated
++ != DEVCRYPTO_NOT_ACCELERATED
++ && use_softdrivers == DEVCRYPTO_REJECT_SOFTWARE)));
++}
++
++static void prepare_cipher_methods(void)
++{
++ size_t i;
++ struct session_op sess;
++ unsigned long cipher_mode;
++#ifdef CIOCGSESSINFO
++ struct session_info_op siop;
++#endif
++
++ memset(&cipher_driver_info, 0, sizeof(cipher_driver_info));
++
++ memset(&sess, 0, sizeof(sess));
++ sess.key = (void *)"01234567890123456789012345678901234567890123456789";
++
++ for (i = 0, known_cipher_nids_amount = 0;
++ i < OSSL_NELEM(cipher_data); i++) {
++
++ selected_ciphers[i] = 1;
++ /*
++ * Check that the cipher is usable
++ */
++ sess.cipher = cipher_data[i].devcryptoid;
++ sess.keylen = cipher_data[i].keylen;
++ if (ioctl(cfd, CIOCGSESSION, &sess) < 0) {
++ cipher_driver_info[i].status = DEVCRYPTO_STATUS_NO_CIOCGSESSION;
++ continue;
++ }
++
++ cipher_mode = cipher_data[i].flags & EVP_CIPH_MODE;
++
++ if ((known_cipher_methods[i] =
++ EVP_CIPHER_meth_new(cipher_data[i].nid,
++ cipher_mode == EVP_CIPH_CTR_MODE ? 1 :
++ cipher_data[i].blocksize,
++ cipher_data[i].keylen)) == NULL
++ || !EVP_CIPHER_meth_set_iv_length(known_cipher_methods[i],
++ cipher_data[i].ivlen)
++ || !EVP_CIPHER_meth_set_flags(known_cipher_methods[i],
++ cipher_data[i].flags
++ | EVP_CIPH_CUSTOM_COPY
++ | EVP_CIPH_CTRL_INIT
++ | EVP_CIPH_FLAG_DEFAULT_ASN1)
++ || !EVP_CIPHER_meth_set_init(known_cipher_methods[i], cipher_init)
++ || !EVP_CIPHER_meth_set_do_cipher(known_cipher_methods[i],
++ cipher_mode == EVP_CIPH_CTR_MODE ?
++ ctr_do_cipher :
++ cipher_do_cipher)
++ || !EVP_CIPHER_meth_set_ctrl(known_cipher_methods[i], cipher_ctrl)
++ || !EVP_CIPHER_meth_set_cleanup(known_cipher_methods[i],
++ cipher_cleanup)
++ || !EVP_CIPHER_meth_set_impl_ctx_size(known_cipher_methods[i],
++ sizeof(struct cipher_ctx))) {
++ cipher_driver_info[i].status = DEVCRYPTO_STATUS_FAILURE;
++ EVP_CIPHER_meth_free(known_cipher_methods[i]);
++ known_cipher_methods[i] = NULL;
++ } else {
++ cipher_driver_info[i].status = DEVCRYPTO_STATUS_USABLE;
++#ifdef CIOCGSESSINFO
++ siop.ses = sess.ses;
++ if (ioctl(cfd, CIOCGSESSINFO, &siop) < 0) {
++ cipher_driver_info[i].accelerated = DEVCRYPTO_ACCELERATION_UNKNOWN;
++ } else {
++ cipher_driver_info[i].driver_name =
++ OPENSSL_strndup(siop.cipher_info.cra_driver_name,
++ CRYPTODEV_MAX_ALG_NAME);
++ if (!(siop.flags & SIOP_FLAG_KERNEL_DRIVER_ONLY))
++ cipher_driver_info[i].accelerated = DEVCRYPTO_NOT_ACCELERATED;
++ else
++ cipher_driver_info[i].accelerated = DEVCRYPTO_ACCELERATED;
++ }
++#endif /* CIOCGSESSINFO */
++ }
++ ioctl(cfd, CIOCFSESSION, &sess.ses);
++ if (devcrypto_test_cipher(i)) {
++ known_cipher_nids[known_cipher_nids_amount++] =
++ cipher_data[i].nid;
++ }
++ }
++}
++
++static void rebuild_known_cipher_nids(ENGINE *e)
++{
++ size_t i;
++
++ for (i = 0, known_cipher_nids_amount = 0; i < OSSL_NELEM(cipher_data); i++) {
++ if (devcrypto_test_cipher(i))
++ known_cipher_nids[known_cipher_nids_amount++] = cipher_data[i].nid;
++ }
++ ENGINE_unregister_ciphers(e);
++ ENGINE_register_ciphers(e);
++}
++
++static const EVP_CIPHER *get_cipher_method(int nid)
++{
++ size_t i = get_cipher_data_index(nid);
++
++ if (i == (size_t)-1)
++ return NULL;
++ return known_cipher_methods[i];
++}
++
++static int get_cipher_nids(const int **nids)
++{
++ *nids = known_cipher_nids;
++ return known_cipher_nids_amount;
++}
++
++static void destroy_cipher_method(int nid)
++{
++ size_t i = get_cipher_data_index(nid);
++
++ EVP_CIPHER_meth_free(known_cipher_methods[i]);
++ known_cipher_methods[i] = NULL;
++}
++
++static void destroy_all_cipher_methods(void)
++{
++ size_t i;
++
++ for (i = 0; i < OSSL_NELEM(cipher_data); i++) {
++ destroy_cipher_method(cipher_data[i].nid);
++ OPENSSL_free(cipher_driver_info[i].driver_name);
++ cipher_driver_info[i].driver_name = NULL;
++ }
++}
++
++static int devcrypto_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
++ const int **nids, int nid)
++{
++ if (cipher == NULL)
++ return get_cipher_nids(nids);
++
++ *cipher = get_cipher_method(nid);
++
++ return *cipher != NULL;
++}
++
++static void devcrypto_select_all_ciphers(int *cipher_list)
++{
++ size_t i;
++
++ for (i = 0; i < OSSL_NELEM(cipher_data); i++)
++ cipher_list[i] = 1;
++}
++
++static int cryptodev_select_cipher_cb(const char *str, int len, void *usr)
++{
++ int *cipher_list = (int *)usr;
++ char *name;
++ const EVP_CIPHER *EVP;
++ size_t i;
++
++ if (len == 0)
++ return 1;
++ if (usr == NULL || (name = OPENSSL_strndup(str, len)) == NULL)
++ return 0;
++ EVP = EVP_get_cipherbyname(name);
++ if (EVP == NULL)
++ fprintf(stderr, "devcrypto: unknown cipher %s\n", name);
++ else if ((i = find_cipher_data_index(EVP_CIPHER_nid(EVP))) != (size_t)-1)
++ cipher_list[i] = 1;
++ else
++ fprintf(stderr, "devcrypto: cipher %s not available\n", name);
++ OPENSSL_free(name);
++ return 1;
++}
++
++static void dump_cipher_info(void)
++{
++ size_t i;
++ const char *name;
++
++ fprintf (stderr, "Information about ciphers supported by the /dev/crypto"
++ " engine:\n");
++#ifndef CIOCGSESSINFO
++ fprintf(stderr, "CIOCGSESSINFO (session info call) unavailable\n");
++#endif
++ for (i = 0; i < OSSL_NELEM(cipher_data); i++) {
++ name = OBJ_nid2sn(cipher_data[i].nid);
++ fprintf (stderr, "Cipher %s, NID=%d, /dev/crypto info: id=%d, ",
++ name ? name : "unknown", cipher_data[i].nid,
++ cipher_data[i].devcryptoid);
++ if (cipher_driver_info[i].status == DEVCRYPTO_STATUS_NO_CIOCGSESSION ) {
++ fprintf (stderr, "CIOCGSESSION (session open call) failed\n");
++ continue;
++ }
++ fprintf (stderr, "driver=%s ", cipher_driver_info[i].driver_name ?
++ cipher_driver_info[i].driver_name : "unknown");
++ if (cipher_driver_info[i].accelerated == DEVCRYPTO_ACCELERATED)
++ fprintf(stderr, "(hw accelerated)");
++ else if (cipher_driver_info[i].accelerated == DEVCRYPTO_NOT_ACCELERATED)
++ fprintf(stderr, "(software)");
++ else
++ fprintf(stderr, "(acceleration status unknown)");
++ if (cipher_driver_info[i].status == DEVCRYPTO_STATUS_FAILURE)
++ fprintf (stderr, ". Cipher setup failed");
++ fprintf(stderr, "\n");
++ }
++ fprintf(stderr, "\n");
++}
++
++/*
++ * We only support digests if the cryptodev implementation supports multiple
++ * data updates and session copying. Otherwise, we would be forced to maintain
++ * a cache, which is perilous if there's a lot of data coming in (if someone
++ * wants to checksum an OpenSSL tarball, for example).
++ */
++#if defined(CIOCCPHASH) && defined(COP_FLAG_UPDATE) && defined(COP_FLAG_FINAL)
++#define IMPLEMENT_DIGEST
++
++/******************************************************************************
++ *
++ * Digests
++ *
++ * Because they all do the same basic operation, we have only one set of
++ * method functions for them all to share, and a mapping table between
++ * NIDs and cryptodev IDs, with all the necessary size data.
++ *
++ *****/
++
++struct digest_ctx {
++ struct session_op sess;
++ /* This signals that the init function was called, not that it succeeded. */
++ int init_called;
++ unsigned char digest_res[HASH_MAX_LEN];
++};
++
++static const struct digest_data_st {
++ int nid;
++ int blocksize;
++ int digestlen;
++ int devcryptoid;
++} digest_data[] = {
++#ifndef OPENSSL_NO_MD5
++ { NID_md5, /* MD5_CBLOCK */ 64, 16, CRYPTO_MD5 },
++#endif
++ { NID_sha1, SHA_CBLOCK, 20, CRYPTO_SHA1 },
++#ifndef OPENSSL_NO_RMD160
++# if !defined(CHECK_BSD_STYLE_MACROS) || defined(CRYPTO_RIPEMD160)
++ { NID_ripemd160, /* RIPEMD160_CBLOCK */ 64, 20, CRYPTO_RIPEMD160 },
++# endif
++#endif
++#if !defined(CHECK_BSD_STYLE_MACROS) || defined(CRYPTO_SHA2_224)
++ { NID_sha224, SHA256_CBLOCK, 224 / 8, CRYPTO_SHA2_224 },
++#endif
++#if !defined(CHECK_BSD_STYLE_MACROS) || defined(CRYPTO_SHA2_256)
++ { NID_sha256, SHA256_CBLOCK, 256 / 8, CRYPTO_SHA2_256 },
++#endif
++#if !defined(CHECK_BSD_STYLE_MACROS) || defined(CRYPTO_SHA2_384)
++ { NID_sha384, SHA512_CBLOCK, 384 / 8, CRYPTO_SHA2_384 },
++#endif
++#if !defined(CHECK_BSD_STYLE_MACROS) || defined(CRYPTO_SHA2_512)
++ { NID_sha512, SHA512_CBLOCK, 512 / 8, CRYPTO_SHA2_512 },
++#endif
++};
++
++static size_t find_digest_data_index(int nid)
++{
++ size_t i;
++
++ for (i = 0; i < OSSL_NELEM(digest_data); i++)
++ if (nid == digest_data[i].nid)
++ return i;
++ return (size_t)-1;
++}
++
++static size_t get_digest_data_index(int nid)
++{
++ size_t i = find_digest_data_index(nid);
++
++ if (i != (size_t)-1)
++ return i;
++
++ /*
++ * Code further down must make sure that only NIDs in the table above
++ * are used. If any other NID reaches this function, there's a grave
++ * coding error further down.
++ */
++ assert("Code that never should be reached" == NULL);
++ return -1;
++}
++
++static const struct digest_data_st *get_digest_data(int nid)
++{
++ return &digest_data[get_digest_data_index(nid)];
++}
++
++/*
++ * Following are the five necessary functions to map OpenSSL functionality
++ * with cryptodev: init, update, final, cleanup, and copy.
++ */
++
++static int digest_init(EVP_MD_CTX *ctx)
++{
++ struct digest_ctx *digest_ctx =
++ (struct digest_ctx *)EVP_MD_CTX_md_data(ctx);
++ const struct digest_data_st *digest_d =
++ get_digest_data(EVP_MD_CTX_type(ctx));
++
++ digest_ctx->init_called = 1;
++
++ memset(&digest_ctx->sess, 0, sizeof(digest_ctx->sess));
++ digest_ctx->sess.mac = digest_d->devcryptoid;
++ if (ioctl(cfd, CIOCGSESSION, &digest_ctx->sess) < 0) {
++ SYSerr(SYS_F_IOCTL, errno);
++ return 0;
++ }
++
++ return 1;
++}
++
++static int digest_op(struct digest_ctx *ctx, const void *src, size_t srclen,
++ void *res, unsigned int flags)
++{
++ struct crypt_op cryp;
++
++ memset(&cryp, 0, sizeof(cryp));
++ cryp.ses = ctx->sess.ses;
++ cryp.len = srclen;
++ cryp.src = (void *)src;
++ cryp.dst = NULL;
++ cryp.mac = res;
++ cryp.flags = flags;
++ return ioctl(cfd, CIOCCRYPT, &cryp);
++}
++
++static int digest_update(EVP_MD_CTX *ctx, const void *data, size_t count)
++{
++ struct digest_ctx *digest_ctx =
++ (struct digest_ctx *)EVP_MD_CTX_md_data(ctx);
++
++ if (count == 0)
++ return 1;
++
++ if (digest_ctx == NULL)
++ return 0;
++
++ if (EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_ONESHOT)) {
++ if (digest_op(digest_ctx, data, count, digest_ctx->digest_res, 0) >= 0)
++ return 1;
++ } else if (digest_op(digest_ctx, data, count, NULL, COP_FLAG_UPDATE) >= 0) {
++ return 1;
++ }
++
++ SYSerr(SYS_F_IOCTL, errno);
++ return 0;
++}
++
++static int digest_final(EVP_MD_CTX *ctx, unsigned char *md)
++{
++ struct digest_ctx *digest_ctx =
++ (struct digest_ctx *)EVP_MD_CTX_md_data(ctx);
++
++ if (md == NULL || digest_ctx == NULL)
++ return 0;
++
++ if (EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_ONESHOT)) {
++ memcpy(md, digest_ctx->digest_res, EVP_MD_CTX_size(ctx));
++ } else if (digest_op(digest_ctx, NULL, 0, md, COP_FLAG_FINAL) < 0) {
++ SYSerr(SYS_F_IOCTL, errno);
++ return 0;
++ }
++
++ return 1;
++}
++
++static int digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from)
++{
++ struct digest_ctx *digest_from =
++ (struct digest_ctx *)EVP_MD_CTX_md_data(from);
++ struct digest_ctx *digest_to =
++ (struct digest_ctx *)EVP_MD_CTX_md_data(to);
++ struct cphash_op cphash;
++
++ if (digest_from == NULL || digest_from->init_called != 1)
++ return 1;
++
++ if (!digest_init(to)) {
++ SYSerr(SYS_F_IOCTL, errno);
++ return 0;
++ }
++
++ cphash.src_ses = digest_from->sess.ses;
++ cphash.dst_ses = digest_to->sess.ses;
++ if (ioctl(cfd, CIOCCPHASH, &cphash) < 0) {
++ SYSerr(SYS_F_IOCTL, errno);
++ return 0;
++ }
++ return 1;
++}
++
++static int digest_cleanup(EVP_MD_CTX *ctx)
++{
++ struct digest_ctx *digest_ctx =
++ (struct digest_ctx *)EVP_MD_CTX_md_data(ctx);
++
++ if (digest_ctx == NULL)
++ return 1;
++
++ return clean_devcrypto_session(&digest_ctx->sess);
++}
++
++/*
++ * Keep tables of known nids, associated methods, selected digests, and
++ * driver info.
++ * Note that known_digest_nids[] isn't necessarily indexed the same way as
++ * digest_data[] above, which the other tables are.
++ */
++static int known_digest_nids[OSSL_NELEM(digest_data)];
++static int known_digest_nids_amount = -1; /* -1 indicates not yet initialised */
++static EVP_MD *known_digest_methods[OSSL_NELEM(digest_data)] = { NULL, };
++static int selected_digests[OSSL_NELEM(digest_data)];
++static struct driver_info_st digest_driver_info[OSSL_NELEM(digest_data)];
++
++static int devcrypto_test_digest(size_t digest_data_index)
++{
++ return (digest_driver_info[digest_data_index].status == DEVCRYPTO_STATUS_USABLE
++ && selected_digests[digest_data_index] == 1
++ && (digest_driver_info[digest_data_index].accelerated
++ == DEVCRYPTO_ACCELERATED
++ || use_softdrivers == DEVCRYPTO_USE_SOFTWARE
++ || (digest_driver_info[digest_data_index].accelerated
++ != DEVCRYPTO_NOT_ACCELERATED
++ && use_softdrivers == DEVCRYPTO_REJECT_SOFTWARE)));
++}
++
++static void rebuild_known_digest_nids(ENGINE *e)
++{
++ size_t i;
++
++ for (i = 0, known_digest_nids_amount = 0; i < OSSL_NELEM(digest_data); i++) {
++ if (devcrypto_test_digest(i))
++ known_digest_nids[known_digest_nids_amount++] = digest_data[i].nid;
++ }
++ ENGINE_unregister_digests(e);
++ ENGINE_register_digests(e);
++}
++
++static void prepare_digest_methods(void)
++{
++ size_t i;
++ struct session_op sess1, sess2;
++#ifdef CIOCGSESSINFO
++ struct session_info_op siop;
++#endif
++ struct cphash_op cphash;
++
++ memset(&digest_driver_info, 0, sizeof(digest_driver_info));
++
++ memset(&sess1, 0, sizeof(sess1));
++ memset(&sess2, 0, sizeof(sess2));
++
++ for (i = 0, known_digest_nids_amount = 0; i < OSSL_NELEM(digest_data);
++ i++) {
++
++ selected_digests[i] = 1;
++
++ /*
++ * Check that the digest is usable
++ */
++ sess1.mac = digest_data[i].devcryptoid;
++ sess2.ses = 0;
++ if (ioctl(cfd, CIOCGSESSION, &sess1) < 0) {
++ digest_driver_info[i].status = DEVCRYPTO_STATUS_NO_CIOCGSESSION;
++ goto finish;
++ }
++
++#ifdef CIOCGSESSINFO
++ /* gather hardware acceleration info from the driver */
++ siop.ses = sess1.ses;
++ if (ioctl(cfd, CIOCGSESSINFO, &siop) < 0) {
++ digest_driver_info[i].accelerated = DEVCRYPTO_ACCELERATION_UNKNOWN;
++ } else {
++ digest_driver_info[i].driver_name =
++ OPENSSL_strndup(siop.hash_info.cra_driver_name,
++ CRYPTODEV_MAX_ALG_NAME);
++ if (siop.flags & SIOP_FLAG_KERNEL_DRIVER_ONLY)
++ digest_driver_info[i].accelerated = DEVCRYPTO_ACCELERATED;
++ else
++ digest_driver_info[i].accelerated = DEVCRYPTO_NOT_ACCELERATED;
++ }
++#endif
++
++ /* digest must be capable of hash state copy */
++ sess2.mac = sess1.mac;
++ if (ioctl(cfd, CIOCGSESSION, &sess2) < 0) {
++ digest_driver_info[i].status = DEVCRYPTO_STATUS_FAILURE;
++ goto finish;
++ }
++ cphash.src_ses = sess1.ses;
++ cphash.dst_ses = sess2.ses;
++ if (ioctl(cfd, CIOCCPHASH, &cphash) < 0) {
++ digest_driver_info[i].status = DEVCRYPTO_STATUS_NO_CIOCCPHASH;
++ goto finish;
++ }
++ if ((known_digest_methods[i] = EVP_MD_meth_new(digest_data[i].nid,
++ NID_undef)) == NULL
++ || !EVP_MD_meth_set_input_blocksize(known_digest_methods[i],
++ digest_data[i].blocksize)
++ || !EVP_MD_meth_set_result_size(known_digest_methods[i],
++ digest_data[i].digestlen)
++ || !EVP_MD_meth_set_init(known_digest_methods[i], digest_init)
++ || !EVP_MD_meth_set_update(known_digest_methods[i], digest_update)
++ || !EVP_MD_meth_set_final(known_digest_methods[i], digest_final)
++ || !EVP_MD_meth_set_copy(known_digest_methods[i], digest_copy)
++ || !EVP_MD_meth_set_cleanup(known_digest_methods[i], digest_cleanup)
++ || !EVP_MD_meth_set_app_datasize(known_digest_methods[i],
++ sizeof(struct digest_ctx))) {
++ digest_driver_info[i].status = DEVCRYPTO_STATUS_FAILURE;
++ EVP_MD_meth_free(known_digest_methods[i]);
++ known_digest_methods[i] = NULL;
++ goto finish;
++ }
++ digest_driver_info[i].status = DEVCRYPTO_STATUS_USABLE;
++finish:
++ ioctl(cfd, CIOCFSESSION, &sess1.ses);
++ if (sess2.ses != 0)
++ ioctl(cfd, CIOCFSESSION, &sess2.ses);
++ if (devcrypto_test_digest(i))
++ known_digest_nids[known_digest_nids_amount++] = digest_data[i].nid;
++ }
++}
++
++static const EVP_MD *get_digest_method(int nid)
++{
++ size_t i = get_digest_data_index(nid);
++
++ if (i == (size_t)-1)
++ return NULL;
++ return known_digest_methods[i];
++}
++
++static int get_digest_nids(const int **nids)
++{
++ *nids = known_digest_nids;
++ return known_digest_nids_amount;
++}
++
++static void destroy_digest_method(int nid)
++{
++ size_t i = get_digest_data_index(nid);
++
++ EVP_MD_meth_free(known_digest_methods[i]);
++ known_digest_methods[i] = NULL;
++}
++
++static void destroy_all_digest_methods(void)
++{
++ size_t i;
++
++ for (i = 0; i < OSSL_NELEM(digest_data); i++) {
++ destroy_digest_method(digest_data[i].nid);
++ OPENSSL_free(digest_driver_info[i].driver_name);
++ digest_driver_info[i].driver_name = NULL;
++ }
++}
++
++static int devcrypto_digests(ENGINE *e, const EVP_MD **digest,
++ const int **nids, int nid)
++{
++ if (digest == NULL)
++ return get_digest_nids(nids);
++
++ *digest = get_digest_method(nid);
++
++ return *digest != NULL;
++}
++
++static void devcrypto_select_all_digests(int *digest_list)
++{
++ size_t i;
++
++ for (i = 0; i < OSSL_NELEM(digest_data); i++)
++ digest_list[i] = 1;
++}
++
++static int cryptodev_select_digest_cb(const char *str, int len, void *usr)
++{
++ int *digest_list = (int *)usr;
++ char *name;
++ const EVP_MD *EVP;
++ size_t i;
++
++ if (len == 0)
++ return 1;
++ if (usr == NULL || (name = OPENSSL_strndup(str, len)) == NULL)
++ return 0;
++ EVP = EVP_get_digestbyname(name);
++ if (EVP == NULL)
++ fprintf(stderr, "devcrypto: unknown digest %s\n", name);
++ else if ((i = find_digest_data_index(EVP_MD_type(EVP))) != (size_t)-1)
++ digest_list[i] = 1;
++ else
++ fprintf(stderr, "devcrypto: digest %s not available\n", name);
++ OPENSSL_free(name);
++ return 1;
++}
++
++static void dump_digest_info(void)
++{
++ size_t i;
++ const char *name;
++
++ fprintf (stderr, "Information about digests supported by the /dev/crypto"
++ " engine:\n");
++#ifndef CIOCGSESSINFO
++ fprintf(stderr, "CIOCGSESSINFO (session info call) unavailable\n");
++#endif
++
++ for (i = 0; i < OSSL_NELEM(digest_data); i++) {
++ name = OBJ_nid2sn(digest_data[i].nid);
++ fprintf (stderr, "Digest %s, NID=%d, /dev/crypto info: id=%d, driver=%s",
++ name ? name : "unknown", digest_data[i].nid,
++ digest_data[i].devcryptoid,
++ digest_driver_info[i].driver_name ? digest_driver_info[i].driver_name : "unknown");
++ if (digest_driver_info[i].status == DEVCRYPTO_STATUS_NO_CIOCGSESSION) {
++ fprintf (stderr, ". CIOCGSESSION (session open) failed\n");
++ continue;
++ }
++ if (digest_driver_info[i].accelerated == DEVCRYPTO_ACCELERATED)
++ fprintf(stderr, " (hw accelerated)");
++ else if (digest_driver_info[i].accelerated == DEVCRYPTO_NOT_ACCELERATED)
++ fprintf(stderr, " (software)");
++ else
++ fprintf(stderr, " (acceleration status unknown)");
++ if (cipher_driver_info[i].status == DEVCRYPTO_STATUS_FAILURE)
++ fprintf (stderr, ". Cipher setup failed\n");
++ else if (digest_driver_info[i].status == DEVCRYPTO_STATUS_NO_CIOCCPHASH)
++ fprintf(stderr, ", CIOCCPHASH failed\n");
++ else
++ fprintf(stderr, ", CIOCCPHASH capable\n");
++ }
++ fprintf(stderr, "\n");
++}
++
++#endif
++
++/******************************************************************************
++ *
++ * CONTROL COMMANDS
++ *
++ *****/
++
++#define DEVCRYPTO_CMD_USE_SOFTDRIVERS ENGINE_CMD_BASE
++#define DEVCRYPTO_CMD_CIPHERS (ENGINE_CMD_BASE + 1)
++#define DEVCRYPTO_CMD_DIGESTS (ENGINE_CMD_BASE + 2)
++#define DEVCRYPTO_CMD_DUMP_INFO (ENGINE_CMD_BASE + 3)
++
++/* Helper macros for CPP string composition */
++#ifndef OPENSSL_MSTR
++# define OPENSSL_MSTR_HELPER(x) #x
++# define OPENSSL_MSTR(x) OPENSSL_MSTR_HELPER(x)
++#endif
++
++static const ENGINE_CMD_DEFN devcrypto_cmds[] = {
++#ifdef CIOCGSESSINFO
++ {DEVCRYPTO_CMD_USE_SOFTDRIVERS,
++ "USE_SOFTDRIVERS",
++ "specifies whether to use software (not accelerated) drivers ("
++ OPENSSL_MSTR(DEVCRYPTO_REQUIRE_ACCELERATED) "=use only accelerated drivers, "
++ OPENSSL_MSTR(DEVCRYPTO_USE_SOFTWARE) "=allow all drivers, "
++ OPENSSL_MSTR(DEVCRYPTO_REJECT_SOFTWARE)
++ "=use if acceleration can't be determined) [default="
+ OPENSSL_MSTR(DEVCRYPTO_DEFAULT_USE_SOFTDRIVERS) "]",
- ENGINE_CMD_FLAG_NUMERIC},
- #endif
-
-@@ -1166,32 +1168,22 @@ static int devcrypto_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void))
- *
- *****/
-
--static int devcrypto_unload(ENGINE *e)
--{
-- destroy_all_cipher_methods();
--#ifdef IMPLEMENT_DIGEST
-- destroy_all_digest_methods();
--#endif
--
-- close(cfd);
--
-- return 1;
--}
- /*
-- * This engine is always built into libcrypto, so it doesn't offer any
-- * ability to be dynamically loadable.
++ ENGINE_CMD_FLAG_NUMERIC},
++#endif
++
++ {DEVCRYPTO_CMD_CIPHERS,
++ "CIPHERS",
++ "either ALL, NONE, or a comma-separated list of ciphers to enable [default=ALL]",
++ ENGINE_CMD_FLAG_STRING},
++
++#ifdef IMPLEMENT_DIGEST
++ {DEVCRYPTO_CMD_DIGESTS,
++ "DIGESTS",
++ "either ALL, NONE, or a comma-separated list of digests to enable [default=ALL]",
++ ENGINE_CMD_FLAG_STRING},
++#endif
++
++ {DEVCRYPTO_CMD_DUMP_INFO,
++ "DUMP_INFO",
++ "dump info about each algorithm to stderr; use 'openssl engine -pre DUMP_INFO devcrypto'",
++ ENGINE_CMD_FLAG_NO_INPUT},
++
++ {0, NULL, NULL, 0}
++};
++
++static int devcrypto_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void))
++{
++ int *new_list;
++ switch (cmd) {
++#ifdef CIOCGSESSINFO
++ case DEVCRYPTO_CMD_USE_SOFTDRIVERS:
++ switch (i) {
++ case DEVCRYPTO_REQUIRE_ACCELERATED:
++ case DEVCRYPTO_USE_SOFTWARE:
++ case DEVCRYPTO_REJECT_SOFTWARE:
++ break;
++ default:
++ fprintf(stderr, "devcrypto: invalid value (%ld) for USE_SOFTDRIVERS\n", i);
++ return 0;
++ }
++ if (use_softdrivers == i)
++ return 1;
++ use_softdrivers = i;
++#ifdef IMPLEMENT_DIGEST
++ rebuild_known_digest_nids(e);
++#endif
++ rebuild_known_cipher_nids(e);
++ return 1;
++#endif /* CIOCGSESSINFO */
++
++ case DEVCRYPTO_CMD_CIPHERS:
++ if (p == NULL)
++ return 1;
++ if (strcasecmp((const char *)p, "ALL") == 0) {
++ devcrypto_select_all_ciphers(selected_ciphers);
++ } else if (strcasecmp((const char*)p, "NONE") == 0) {
++ memset(selected_ciphers, 0, sizeof(selected_ciphers));
++ } else {
++ new_list=OPENSSL_zalloc(sizeof(selected_ciphers));
++ if (!CONF_parse_list(p, ',', 1, cryptodev_select_cipher_cb, new_list)) {
++ OPENSSL_free(new_list);
++ return 0;
++ }
++ memcpy(selected_ciphers, new_list, sizeof(selected_ciphers));
++ OPENSSL_free(new_list);
++ }
++ rebuild_known_cipher_nids(e);
++ return 1;
++
++#ifdef IMPLEMENT_DIGEST
++ case DEVCRYPTO_CMD_DIGESTS:
++ if (p == NULL)
++ return 1;
++ if (strcasecmp((const char *)p, "ALL") == 0) {
++ devcrypto_select_all_digests(selected_digests);
++ } else if (strcasecmp((const char*)p, "NONE") == 0) {
++ memset(selected_digests, 0, sizeof(selected_digests));
++ } else {
++ new_list=OPENSSL_zalloc(sizeof(selected_digests));
++ if (!CONF_parse_list(p, ',', 1, cryptodev_select_digest_cb, new_list)) {
++ OPENSSL_free(new_list);
++ return 0;
++ }
++ memcpy(selected_digests, new_list, sizeof(selected_digests));
++ OPENSSL_free(new_list);
++ }
++ rebuild_known_digest_nids(e);
++ return 1;
++#endif /* IMPLEMENT_DIGEST */
++
++ case DEVCRYPTO_CMD_DUMP_INFO:
++ dump_cipher_info();
++#ifdef IMPLEMENT_DIGEST
++ dump_digest_info();
++#endif
++ return 1;
++
++ default:
++ break;
++ }
++ return 0;
++}
++
++/******************************************************************************
++ *
++ * LOAD / UNLOAD
++ *
++ *****/
++
++/*
+ * Opens /dev/crypto
- */
--void engine_load_devcrypto_int()
++ */
+static int open_devcrypto(void)
- {
-- ENGINE *e = NULL;
- int fd;
-
++{
++ int fd;
++
+ if (cfd >= 0)
+ return 1;
+
- if ((fd = open("/dev/crypto", O_RDWR, 0)) < 0) {
- #ifndef ENGINE_DEVCRYPTO_DEBUG
- if (errno != ENOENT)
- #endif
- fprintf(stderr, "Could not open /dev/crypto: %s\n", strerror(errno));
-- return;
++ if ((fd = open("/dev/crypto", O_RDWR, 0)) < 0) {
++#ifndef ENGINE_DEVCRYPTO_DEBUG
++ if (errno != ENOENT)
++#endif
++ fprintf(stderr, "Could not open /dev/crypto: %s\n", strerror(errno));
+ return 0;
- }
-
- #ifdef CRIOGET
-@@ -1199,35 +1191,61 @@ void engine_load_devcrypto_int()
- fprintf(stderr, "Could not create crypto fd: %s\n", strerror(errno));
- close(fd);
- cfd = -1;
-- return;
++ }
++
++#ifdef CRIOGET
++ if (ioctl(fd, CRIOGET, &cfd) < 0) {
++ fprintf(stderr, "Could not create crypto fd: %s\n", strerror(errno));
++ close(fd);
++ cfd = -1;
+ return 0;
- }
- close(fd);
- #else
- cfd = fd;
- #endif
-
-- if ((e = ENGINE_new()) == NULL
-- || !ENGINE_set_destroy_function(e, devcrypto_unload)) {
-- ENGINE_free(e);
-- /*
-- * We know that devcrypto_unload() won't be called when one of the
-- * above two calls have failed, so we close cfd explicitly here to
-- * avoid leaking resources.
-- */
-- close(cfd);
-- return;
++ }
++ close(fd);
++#else
++ cfd = fd;
++#endif
++
+ return 1;
+}
+
@@ -232,20 +2603,17 @@ rename to engines/e_devcrypto.c
+ if (ret != 0) {
+ fprintf(stderr, "Error closing /dev/crypto: %s\n", strerror(errno));
+ return 0;
- }
++ }
+ return 1;
+}
-
-- prepare_cipher_methods();
++
+static int devcrypto_unload(ENGINE *e)
+{
+ destroy_all_cipher_methods();
- #ifdef IMPLEMENT_DIGEST
-- prepare_digest_methods();
++#ifdef IMPLEMENT_DIGEST
+ destroy_all_digest_methods();
- #endif
-
-- if (!ENGINE_set_id(e, "devcrypto")
++#endif
++
+ close_devcrypto();
+
+ return 1;
@@ -254,13 +2622,12 @@ rename to engines/e_devcrypto.c
+static int bind_devcrypto(ENGINE *e) {
+
+ if (!ENGINE_set_id(e, engine_devcrypto_id)
- || !ENGINE_set_name(e, "/dev/crypto engine")
++ || !ENGINE_set_name(e, "/dev/crypto engine")
+ || !ENGINE_set_destroy_function(e, devcrypto_unload)
- || !ENGINE_set_cmd_defns(e, devcrypto_cmds)
-- || !ENGINE_set_ctrl_function(e, devcrypto_ctrl)
++ || !ENGINE_set_cmd_defns(e, devcrypto_cmds)
+ || !ENGINE_set_ctrl_function(e, devcrypto_ctrl))
+ return 0;
-
++
+ prepare_cipher_methods();
+#ifdef IMPLEMENT_DIGEST
+ prepare_digest_methods();
@@ -270,34 +2637,40 @@ rename to engines/e_devcrypto.c
+#ifdef IMPLEMENT_DIGEST
+ && ENGINE_set_digests(e, devcrypto_digests)
+#endif
- /*
- * Asymmetric ciphers aren't well supported with /dev/crypto. Among the BSD
- * implementations, it seems to only exist in FreeBSD, and regarding the
-@@ -1250,23 +1268,36 @@ void engine_load_devcrypto_int()
- */
- #if 0
- # ifndef OPENSSL_NO_RSA
-- || !ENGINE_set_RSA(e, devcrypto_rsa)
++/*
++ * Asymmetric ciphers aren't well supported with /dev/crypto. Among the BSD
++ * implementations, it seems to only exist in FreeBSD, and regarding the
++ * parameters in its crypt_kop, the manual crypto(4) has this to say:
++ *
++ * The semantics of these arguments are currently undocumented.
++ *
++ * Reading through the FreeBSD source code doesn't give much more than
++ * their CRK_MOD_EXP implementation for ubsec.
++ *
++ * It doesn't look much better with cryptodev-linux. They have the crypt_kop
++ * structure as well as the command (CRK_*) in cryptodev.h, but no support
++ * seems to be implemented at all for the moment.
++ *
++ * At the time of writing, it seems impossible to write proper support for
++ * FreeBSD's asym features without some very deep knowledge and access to
++ * specific kernel modules.
++ *
++ * /Richard Levitte, 2017-05-11
++ */
++#if 0
++# ifndef OPENSSL_NO_RSA
+ && ENGINE_set_RSA(e, devcrypto_rsa)
- # endif
- # ifndef OPENSSL_NO_DSA
-- || !ENGINE_set_DSA(e, devcrypto_dsa)
++# endif
++# ifndef OPENSSL_NO_DSA
+ && ENGINE_set_DSA(e, devcrypto_dsa)
- # endif
- # ifndef OPENSSL_NO_DH
-- || !ENGINE_set_DH(e, devcrypto_dh)
++# endif
++# ifndef OPENSSL_NO_DH
+ && ENGINE_set_DH(e, devcrypto_dh)
- # endif
- # ifndef OPENSSL_NO_EC
-- || !ENGINE_set_EC(e, devcrypto_ec)
++# endif
++# ifndef OPENSSL_NO_EC
+ && ENGINE_set_EC(e, devcrypto_ec)
- # endif
- #endif
-- || !ENGINE_set_ciphers(e, devcrypto_ciphers)
--#ifdef IMPLEMENT_DIGEST
-- || !ENGINE_set_digests(e, devcrypto_digests)
--#endif
-- ) {
++# endif
++#endif
+ );
+}
+
@@ -316,13 +2689,14 @@ rename to engines/e_devcrypto.c
+ if ((e = ENGINE_new()) == NULL
+ || !bind_devcrypto(e)) {
+ close_devcrypto();
- ENGINE_free(e);
- return;
- }
-@@ -1275,3 +1306,22 @@ void engine_load_devcrypto_int()
- ENGINE_free(e); /* Loose our local reference */
- ERR_clear_error();
- }
++ ENGINE_free(e);
++ return;
++ }
++
++ ENGINE_add(e);
++ ENGINE_free(e); /* Loose our local reference */
++ ERR_clear_error();
++}
+
+#else
+
diff --git a/package/libs/openssl/patches/500-e_devcrypto-default-to-not-use-digests-in-engine.patch b/package/libs/openssl/patches/500-e_devcrypto-default-to-not-use-digests-in-engine.patch
index fd4701307e..df5c16d8d2 100644
--- a/package/libs/openssl/patches/500-e_devcrypto-default-to-not-use-digests-in-engine.patch
+++ b/package/libs/openssl/patches/500-e_devcrypto-default-to-not-use-digests-in-engine.patch
@@ -19,7 +19,6 @@ turn them on if it is safe and fast enough.
Signed-off-by: Eneas U de Queiroz <cote2004-github at yahoo.com>
-diff --git a/engines/e_devcrypto.c b/engines/e_devcrypto.c
--- a/engines/e_devcrypto.c
+++ b/engines/e_devcrypto.c
@@ -852,7 +852,7 @@ static void prepare_digest_methods(void)
@@ -31,7 +30,7 @@ diff --git a/engines/e_devcrypto.c b/engines/e_devcrypto.c
/*
* Check that the digest is usable
-@@ -1072,7 +1072,7 @@ static const ENGINE_CMD_DEFN devcrypto_cmds[] = {
+@@ -1072,7 +1072,7 @@ static const ENGINE_CMD_DEFN devcrypto_c
#ifdef IMPLEMENT_DIGEST
{DEVCRYPTO_CMD_DIGESTS,
"DIGESTS",
diff --git a/package/libs/openssl/patches/510-e_devcrypto-ignore-error-when-closing-session.patch b/package/libs/openssl/patches/510-e_devcrypto-ignore-error-when-closing-session.patch
index bf1c98b104..87792cf9d0 100644
--- a/package/libs/openssl/patches/510-e_devcrypto-ignore-error-when-closing-session.patch
+++ b/package/libs/openssl/patches/510-e_devcrypto-ignore-error-when-closing-session.patch
@@ -8,10 +8,9 @@ session. It may have been closed by another process after a fork.
Signed-off-by: Eneas U de Queiroz <cote2004-github at yahoo.com>
-diff --git a/engines/e_devcrypto.c b/engines/e_devcrypto.c
--- a/engines/e_devcrypto.c
+++ b/engines/e_devcrypto.c
-@@ -195,9 +195,8 @@ static int cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+@@ -195,9 +195,8 @@ static int cipher_init(EVP_CIPHER_CTX *c
get_cipher_data(EVP_CIPHER_CTX_nid(ctx));
/* cleanup a previous session */
More information about the lede-commits
mailing list