![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 136.0.7076.0 * chore: bump chromium in DEPS to 136.0.7077.0 * 6368856: Migrate absl variant.h and utility.h in content (part 2/2) |6368856
* 6356528: Clean up LegacyRenderWidgetHostHWND code |6356528
* chore: export patches * 6339113: [Viewport Segments] Add CDP commands to override Viewport Segments without overriding other device properties. |6339113
* 6352169: [DevTools][MultiInstance] Support new tab in another window on Android |6352169
* 6368856: Migrate absl variant.h and utility.h in content (part 2/2) |6368856
* 6360858:Clickiness: Wire response from URLLoader to DB, add e2e tests|6360858
* chore: bump chromium in DEPS to 136.0.7079.0 * chore: export patches * chore: bump chromium in DEPS to 136.0.7081.0 * chore: export patches * chore: bump chromium in DEPS to 136.0.7083.0 * 6361987: Remove double-declaration with gfx::NativeView and gfx::NativeWindow |6361987
* chore: export patches * chore: bump chromium in DEPS to 136.0.7087.0 * chore: export patches * fix: include node patch for missing AtomicsWaitEvent6385540
* build: add depot_tools python to path * fix: cppgc init and unregistering v8 isolate6333562
CppGc is now initialized earlier so Node can skip reinitializing it. Additionally, gin::IsolateHandle was attempting to destruct an already destructed v8::Isolate upon electron::JavaScriptEnvironment destruction. By removing the call to NodePlatform::UnregisterIsolate, this fixes the crash on app shutdown. * fix: unregister isolate after destruction See code comment. * chore: bump chromium in DEPS to 136.0.7095.0 * chore: sync patches * fix: add script_parsing::ContentScriptType parameter6298395
* fix: migrate content::BrowserAccessibilityState methods6401437
6383275
* feat: enableHappyEyeballs option for host resolver6332599
* fix: add new cookie exclusion reason6343479
* fix: add new url loader method6337340
* fix: add new cppgc header file for electron_node headers6348644
* fix: disable CREL on Linux ARM64 https://chromium-review.googlesource.com/q/I3a62f02f564f07be63173b0773b4ecaffbe939b9 * fixup! fix: add new cppgc header file for electron_node headers6348644
* chore: update corner smoothing patch * fixup! chore: update corner smoothing patch * chore: disable NAN weak tests These two tests are incompatible with a V8 change that disallows running JS code from a weak finalizer callback. Ref:4733273
* test: fix task starvation in node test A V8 change makes these contexts get collected in a task that is posted and run asynchronously. The tests were synchronously GC'ing in an infinite loop, preventing the task loop from running the task that would GC these contexts. This change should be upstreamed in some way. Ref:4733273
--------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: alice <alice@makenotion.com> Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: clavin <clavin@electronjs.org>
97 lines
4.2 KiB
Diff
97 lines
4.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jeremy Apthorp <nornagon@nornagon.net>
|
|
Date: Fri, 18 Jan 2019 13:56:52 -0800
|
|
Subject: expose ripemd160
|
|
|
|
This adds references to the decrepit/ module from non-decrepit source,
|
|
which is not allowed in upstream. Until upstream has a way to interface
|
|
with node.js that allows exposing additional digests without patching,
|
|
this patch is required to provide ripemd160 support in the nodejs crypto
|
|
module.
|
|
|
|
diff --git a/crypto/digest/digest_extra.cc b/crypto/digest/digest_extra.cc
|
|
index f68ede9156ee57526f4578953c350798a1299f00..1de18075e1cfa7f9660fa3b065cd20bafcbe7ee8 100644
|
|
--- a/crypto/digest/digest_extra.cc
|
|
+++ b/crypto/digest/digest_extra.cc
|
|
@@ -45,6 +45,7 @@ static const struct nid_to_digest nid_to_digest_mapping[] = {
|
|
{NID_sha512, EVP_sha512, SN_sha512, LN_sha512},
|
|
{NID_sha512_256, EVP_sha512_256, SN_sha512_256, LN_sha512_256},
|
|
{NID_md5_sha1, EVP_md5_sha1, SN_md5_sha1, LN_md5_sha1},
|
|
+ {NID_ripemd160, EVP_ripemd160, SN_ripemd160, LN_ripemd160},
|
|
// As a remnant of signing |EVP_MD|s, OpenSSL returned the corresponding
|
|
// hash function when given a signature OID. To avoid unintended lax parsing
|
|
// of hash OIDs, this is no longer supported for lookup by OID or NID.
|
|
diff --git a/crypto/fipsmodule/digest/digests.cc.inc b/crypto/fipsmodule/digest/digests.cc.inc
|
|
index 3c1bfac504c8f41788e429f23606a02e87ad03ae..c3a371029cd9e871ebffae5396cc2f8ae773409f 100644
|
|
--- a/crypto/fipsmodule/digest/digests.cc.inc
|
|
+++ b/crypto/fipsmodule/digest/digests.cc.inc
|
|
@@ -18,6 +18,7 @@
|
|
#include <string.h>
|
|
|
|
#include <openssl/nid.h>
|
|
+#include <openssl/ripemd.h>
|
|
|
|
#include "../../internal.h"
|
|
#include "../bcm_interface.h"
|
|
@@ -175,4 +176,27 @@ DEFINE_METHOD_FUNCTION(EVP_MD, EVP_sha512_256) {
|
|
out->ctx_size = sizeof(SHA512_CTX);
|
|
}
|
|
|
|
+static void ripemd160_init(EVP_MD_CTX *ctx) {
|
|
+ CHECK(RIPEMD160_Init(reinterpret_cast<RIPEMD160_CTX *>(ctx->md_data)));
|
|
+}
|
|
+
|
|
+static void ripemd160_update(EVP_MD_CTX *ctx, const void *data, size_t count) {
|
|
+ CHECK(RIPEMD160_Update(reinterpret_cast<RIPEMD160_CTX *>(ctx->md_data), data, count));
|
|
+}
|
|
+
|
|
+static void ripemd160_final(EVP_MD_CTX *ctx, uint8_t *md) {
|
|
+ CHECK(RIPEMD160_Final(md, reinterpret_cast<RIPEMD160_CTX *>(ctx->md_data)));
|
|
+}
|
|
+
|
|
+DEFINE_METHOD_FUNCTION(EVP_MD, EVP_ripemd160) {
|
|
+ out->type = NID_ripemd160;
|
|
+ out->md_size = RIPEMD160_DIGEST_LENGTH;
|
|
+ out->flags = 0;
|
|
+ out->init = ripemd160_init;
|
|
+ out->update = ripemd160_update;
|
|
+ out->final = ripemd160_final;
|
|
+ out->block_size = 64;
|
|
+ out->ctx_size = sizeof(RIPEMD160_CTX);
|
|
+}
|
|
+
|
|
#undef CHECK
|
|
diff --git a/decrepit/evp/evp_do_all.cc b/decrepit/evp/evp_do_all.cc
|
|
index e04b80cd6a1a215fc87f8fd8d750c3d258c3974f..8fdf1c624794f568bfc77b7b6b0c510b23905a4d 100644
|
|
--- a/decrepit/evp/evp_do_all.cc
|
|
+++ b/decrepit/evp/evp_do_all.cc
|
|
@@ -79,6 +79,7 @@ void EVP_MD_do_all_sorted(void (*callback)(const EVP_MD *cipher,
|
|
callback(EVP_sha384(), "SHA384", NULL, arg);
|
|
callback(EVP_sha512(), "SHA512", NULL, arg);
|
|
callback(EVP_sha512_256(), "SHA512-256", NULL, arg);
|
|
+ callback(EVP_ripemd160(), "ripemd160", NULL, arg);
|
|
|
|
callback(EVP_md4(), "md4", NULL, arg);
|
|
callback(EVP_md5(), "md5", NULL, arg);
|
|
@@ -88,6 +89,7 @@ void EVP_MD_do_all_sorted(void (*callback)(const EVP_MD *cipher,
|
|
callback(EVP_sha384(), "sha384", NULL, arg);
|
|
callback(EVP_sha512(), "sha512", NULL, arg);
|
|
callback(EVP_sha512_256(), "sha512-256", NULL, arg);
|
|
+ callback(EVP_ripemd160(), "ripemd160", NULL, arg);
|
|
}
|
|
|
|
void EVP_MD_do_all(void (*callback)(const EVP_MD *cipher, const char *name,
|
|
diff --git a/include/openssl/digest.h b/include/openssl/digest.h
|
|
index b36c5885a31ff3242ac3104e6d875a008c7c39e4..8fe32508a00263295313e77992e2c208459ca42c 100644
|
|
--- a/include/openssl/digest.h
|
|
+++ b/include/openssl/digest.h
|
|
@@ -48,6 +48,9 @@ OPENSSL_EXPORT const EVP_MD *EVP_blake2b256(void);
|
|
// MD5 and SHA-1, as used in TLS 1.1 and below.
|
|
OPENSSL_EXPORT const EVP_MD *EVP_md5_sha1(void);
|
|
|
|
+// EVP_ripemd160 is in decrepit and not available by default.
|
|
+OPENSSL_EXPORT const EVP_MD *EVP_ripemd160(void);
|
|
+
|
|
// EVP_get_digestbynid returns an |EVP_MD| for the given NID, or NULL if no
|
|
// such digest is known.
|
|
OPENSSL_EXPORT const EVP_MD *EVP_get_digestbynid(int nid);
|