![trop[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 140.0.7296.0
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
* chore: update patches
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
* 6702959: Remove OwnedByWidgetPassKey usage from content analysis dialog tests | https://chromium-review.googlesource.com/c/chromium/src/+/6702959
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
* 6722750: Remove un-used `stream_id` argument for `AidaCodeComplete` | https://chromium-review.googlesource.com/c/chromium/src/+/6722750
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
* 6696478: Reland Reland [video pip] Add fade in/out animation to controls visibility changes | https://chromium-review.googlesource.com/c/chromium/src/+/6696478
Co-authored-by: Keeley Hammond <vertedinde@electronjs.org>
* chore: update libc++-filenames
Co-authored-by: Keeley Hammond <vertedinde@electronjs.org>
* build: explicitly include cstdlib in Boyer-Moore patch
Co-authored-by: Keeley Hammond <vertedinde@electronjs.org>
* chore: bump chromium in DEPS to 140.0.7297.0
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
* chore: update patches
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
* 6729537: [FPF] Pipe flag state from the browser to the renderer | https://chromium-review.googlesource.com/c/chromium/src/+/6729537
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
* 6727996: [Win] Detect pre-IPC crashes in sandboxed utility processes | https://chromium-review.googlesource.com/c/chromium/src/+/6727996
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
* 6707182: Move wtf/cross_thread_copier*.* to "blink" namespace | https://chromium-review.googlesource.com/c/chromium/src/+/6707182
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
* 6730796: extensions: Extract safe browsing/telemetry methods to new client class | https://chromium-review.googlesource.com/c/chromium/src/+/6730796
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
* chore: bump chromium in DEPS to 140.0.7299.0
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
* chore: update patches
Co-authored-by: patchup[bot] <73610968+patchup[bot]@users.noreply.github.com>
* chore: update main patches
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
* build: reset the minimum macOS SDK to 15 to match upstream
This reverts commit 499e987c77
.
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
* 6730215: Remove IPC_MESSAGE_LOG_ENABLED ifdef blocks. | https://chromium-review.googlesource.com/c/chromium/src/+/6730215
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
* 6690442: Delete ppapi/buildflags/buildflags.h | https://chromium-review.googlesource.com/c/chromium/src/+/6690442
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
* 6667681: Use more binaries from clang toolchain in mac build | https://chromium-review.googlesource.com/c/chromium/src/+/6667681
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
* chore: bump chromium in DEPS to 140.0.7301.0
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
* chore: update patches
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
* 6656309: extensions: Port proxy API to desktop Android | https://chromium-review.googlesource.com/c/chromium/src/+/6656309
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
* 6758510: Reland 'Move GN enable_plugins variable out of //ppapi' | https://chromium-review.googlesource.com/c/chromium/src/+/6758510
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
* 6701466: [Extensions] Remove NaCl arch info from Update Client URLs | https://chromium-review.googlesource.com/c/chromium/src/+/6701466
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
* 6735979: [FSA] Replace `request_writable` with a new enum `FileSystemAccessPermissionMode`. | https://chromium-review.googlesource.com/c/chromium/src/+/6735979
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
* 6712080: Reland "Turn on gender translation PAK generation everywhere" | https://chromium-review.googlesource.com/c/chromium/src/+/6712080
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
* 6730796: extensions: Extract safe browsing/telemetry methods to new client class | https://chromium-review.googlesource.com/c/chromium/src/+/6730796
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
* build: restore minimum macOS SDK to 10, restore patch
This reverts commit a04c579b994d5f4a782b793a69f34ff7a260e74f.
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
* fixup! 6701466: [Extensions] Remove NaCl arch info from Update Client URLs | https://chromium-review.googlesource.com/c/chromium/src/+/6701466
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
* chore: correct node patches
Co-authored-by: Keeley Hammond <vertedinde@electronjs.org>
* fixup! 6667681: Use more binaries from clang toolchain in mac build | https://chromium-review.googlesource.com/c/chromium/src/+/6667681
Co-authored-by: Keeley Hammond <vertedinde@electronjs.org>
---------
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
Co-authored-by: Keeley Hammond <vertedinde@electronjs.org>
Co-authored-by: patchup[bot] <73610968+patchup[bot]@users.noreply.github.com>
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 431214277314941c5ec031f03ad09e7f22800983..4cc48bbc3f8434876f35767c1a9f01d27388be99 100644
|
|
--- a/crypto/digest/digest_extra.cc
|
|
+++ b/crypto/digest/digest_extra.cc
|
|
@@ -46,6 +46,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 99e3a66c0a47818ccb039f8ccc41ea50e529a16d..dc50fd05bed6cb40bffe1c0f6f3019d25d351ba2 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"
|
|
@@ -179,4 +180,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 710c6e6d110378d1db10d8c2ae57b2d844c603b9..dbb1e0cd5e9480d1ac7a86cbca6fae29d6a8dca4 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);
|