85718349cc
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Samuel Attard <sam@electronjs.org> Co-authored-by: Jeremy Rose <jeremya@chromium.org>
40 lines
2.1 KiB
Diff
40 lines
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jeremy Rose <nornagon@nornagon.net>
|
|
Date: Wed, 24 Feb 2021 11:08:34 -0800
|
|
Subject: expose des-ede3
|
|
|
|
This should be upstreamed.
|
|
|
|
diff --git a/crypto/cipher_extra/cipher_extra.c b/crypto/cipher_extra/cipher_extra.c
|
|
index 5ede89f9f0761d1da1baa899e9a02b77ffcffe93..8205e121c152fe4e2d8df34a1ac2fe0498381f31 100644
|
|
--- a/crypto/cipher_extra/cipher_extra.c
|
|
+++ b/crypto/cipher_extra/cipher_extra.c
|
|
@@ -97,6 +97,8 @@ const EVP_CIPHER *EVP_get_cipherbyname(const char *name) {
|
|
return EVP_rc4();
|
|
} else if (OPENSSL_strcasecmp(name, "des-cbc") == 0) {
|
|
return EVP_des_cbc();
|
|
+ } else if (OPENSSL_strcasecmp(name, "des-ede3") == 0) {
|
|
+ return EVP_des_ede3();
|
|
} else if (OPENSSL_strcasecmp(name, "des-ede3-cbc") == 0 ||
|
|
// This is not a name used by OpenSSL, but tcpdump registers it
|
|
// with |EVP_add_cipher_alias|. Our |EVP_add_cipher_alias| is a
|
|
diff --git a/decrepit/evp/evp_do_all.c b/decrepit/evp/evp_do_all.c
|
|
index 84af06fc56e4aa72d4d48801d7c037add0221747..fe412e350f43ad20758025da6b9754952d164938 100644
|
|
--- a/decrepit/evp/evp_do_all.c
|
|
+++ b/decrepit/evp/evp_do_all.c
|
|
@@ -39,6 +39,7 @@ void EVP_CIPHER_do_all_sorted(void (*callback)(const EVP_CIPHER *cipher,
|
|
callback(EVP_des_cbc(), "DES-CBC", NULL, arg);
|
|
callback(EVP_des_ecb(), "DES-ECB", NULL, arg);
|
|
callback(EVP_des_ede(), "DES-EDE", NULL, arg);
|
|
+ callback(EVP_des_ede3(), "DES-EDE3", NULL, arg);
|
|
callback(EVP_des_ede_cbc(), "DES-EDE-CBC", NULL, arg);
|
|
callback(EVP_des_ede3_cbc(), "DES-EDE3-CBC", NULL, arg);
|
|
callback(EVP_rc2_cbc(), "RC2-CBC", NULL, arg);
|
|
@@ -65,6 +66,7 @@ void EVP_CIPHER_do_all_sorted(void (*callback)(const EVP_CIPHER *cipher,
|
|
callback(EVP_des_cbc(), "des-cbc", NULL, arg);
|
|
callback(EVP_des_ecb(), "des-ecb", NULL, arg);
|
|
callback(EVP_des_ede(), "des-ede", NULL, arg);
|
|
+ callback(EVP_des_ede3(), "des-ede3", NULL, arg);
|
|
callback(EVP_des_ede_cbc(), "des-ede-cbc", NULL, arg);
|
|
callback(EVP_des_ede3_cbc(), "des-ede3-cbc", NULL, arg);
|
|
callback(EVP_rc2_cbc(), "rc2-cbc", NULL, arg);
|