SW/openwrt
2
0
Fork 0
forked from Ivasoft/openwrt
Code Pull Requests Activity

openssl: refresh patches

Browse Source 
Tidy up some patch fuzz.

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
This commit is contained in:
Kevin Darbyshire-Bryant
2021-03-26 08:58:07 +00:00
parent 9390e20dba
commit e27ef2da0d
11 changed files with 2498 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
package/libs/openssl/patches/420-eng_devcrypto-add-command-to-dump-driver-info.patch
View File

@@ -11,11 +11,9 @@ Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Richard Levitte <levitte@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
index 5ec38ca8f3..64dc6b891d 100644
--- 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 {
@@ -82,7 +80,7 @@ index 5ec38ca8f3..64dc6b891d 100644
#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;
@@ -95,7 +93,7 @@ index 5ec38ca8f3..64dc6b891d 100644
}
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;
}
@@ -190,7 +188,7 @@ index 5ec38ca8f3..64dc6b891d 100644
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;
@@ -203,7 +201,7 @@ index 5ec38ca8f3..64dc6b891d 100644
}
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;
}
@@ -247,7 +245,7 @@ index 5ec38ca8f3..64dc6b891d 100644
#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
@@ -259,7 +257,7 @@ index 5ec38ca8f3..64dc6b891d 100644
{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 */