87f7625c5d
* chore: bump chromium in DEPS to 96.0.4662.0 * chore: bump chromium in DEPS to 96.0.4663.0 * chore: update patches * [Extensions] Remove RuntimeData entirely https://chromium-review.googlesource.com/c/chromium/src/+/3177328 * Make helper macros behave consistently for //content/public UserData types https://chromium-review.googlesource.com/c/chromium/src/+/3198788 * Enabling sandboxing for the speech recognition service browser tests https://chromium-review.googlesource.com/c/chromium/src/+/3146090 * [devtools] Add 'RegisterPreference' host binding https://chromium-review.googlesource.com/c/chromium/src/+/3162281 * [Reland][Extensions]: Add persistAcrossSessions flag (scripting API) https://chromium-review.googlesource.com/c/chromium/src/+/3175161 * [Bluetooth] Add Passkey prompt dialog for bonding. https://chromium-review.googlesource.com/c/chromium/src/+/2841104 * Clipboard: Remove ReadImage path in browser https://chromium-review.googlesource.com/c/chromium/src/+/3194826 * Split printing metafile code into its own target. https://chromium-review.googlesource.com/c/chromium/src/+/3164925 * Cleanup unused DesktopMediaListObserver params https://chromium-review.googlesource.com/c/chromium/src/+/3179203 * Remove base::DictionaryValue::GetBinary https://chromium-review.googlesource.com/c/chromium/src/+/3201974 * Window Placement: change RWHV::GetDisplayList to GetScreenInfos https://chromium-review.googlesource.com/c/chromium/src/+/3138774 * Add a preview to the Tab Capture picker dialog https://chromium-review.googlesource.com/c/chromium/src/+/3045268 * Add service-based usage to update print settings https://chromium-review.googlesource.com/c/chromium/src/+/3155426 * chore: bump chromium in DEPS to 96.0.4664.2 * chore: update patches * chore: bump chromium in DEPS to 96.0.4664.4 * chore: update patches * chore: bump chromium in DEPS to 97.0.4666.0 * Revert "chore: bump chromium in DEPS to 97.0.4666.0" This reverts commit d73caae8ba4b39efc9b3ea4de52685b9c92ef3d0. * Reland "Block external protocol handler with sandbox." https://chromium-review.googlesource.com/c/chromium/src/+/3198263 * fixup for lint * Add CookiePartitionKeychain parameter to CookeManager.GetCookieList. https://chromium-review.googlesource.com/c/chromium/src/+/3206016 * Move ui/gfx/transform*,rrect*,mask_filter_info* into ui/gfx/geometry https://chromium-review.googlesource.com/c/chromium/src/+/3200392 * fixup Move ui/gfx/transform*,rrect*,mask_filter_info* into ui/gfx/geometry * ozone: //chrome/browser clean up from USE_X11 https://chromium-review.googlesource.com/c/chromium/src/+/3186490 * content: don't load v8 snapshot in browser process https://chromium-review.googlesource.com/c/chromium/src/+/3183394 * [devtools] Add 'RegisterPreference' host binding https://chromium-review.googlesource.com/c/chromium/src/+/3162281 * 3186491: Add 'devtools.sync_preferences' preference https://chromium-review.googlesource.com/c/chromium/src/+/3186491 * 2951147: DCHECK accessible names for focusable Views https://chromium-review.googlesource.com/c/chromium/src/+/2951147 * 3201014: Use real font size for calculation of SmallTextRatio https://chromium-review.googlesource.com/c/chromium/src/+/3201014 * fixup Clipboard: Remove ReadImage path in browser * chore: update patches * fix: disable PlzServiceWorker to fix custom protocol SW script loading Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3199761 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
39 lines
1.9 KiB
Diff
39 lines
1.9 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 0c30b0329d32b94b22f342f95035e927797d0aaf..d97f67fb03756169446edf6b41d3a33fe3ae8205 100644
|
|
--- a/crypto/cipher_extra/cipher_extra.c
|
|
+++ b/crypto/cipher_extra/cipher_extra.c
|
|
@@ -93,6 +93,7 @@ static const struct {
|
|
{NID_des_ecb, "des-ecb", EVP_des_ecb},
|
|
{NID_des_ede_cbc, "des-ede-cbc", EVP_des_ede_cbc},
|
|
{NID_des_ede_ecb, "des-ede", EVP_des_ede},
|
|
+ {NID_des_ede3_ecb, "des-ede3", EVP_des_ede3},
|
|
{NID_des_ede3_cbc, "des-ede3-cbc", EVP_des_ede3_cbc},
|
|
{NID_rc2_cbc, "rc2-cbc", EVP_rc2_cbc},
|
|
{NID_rc4, "rc4", EVP_rc4},
|
|
diff --git a/decrepit/evp/evp_do_all.c b/decrepit/evp/evp_do_all.c
|
|
index d443f4dc2daea0b7aa86ae75d31d995fae667ba9..5e71420b765019edea82a33884ace539cd91bda5 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);
|