37db307153
* chore: bump chromium in DEPS to 461ecae368fd0832f18e0b13e61f3561d83f0031 * update patches * update patches * Remove both vs browser/child split in content gn files. https://chromium-review.googlesource.com/c/chromium/src/+/2157965 * chore: bump chromium in DEPS to 7ff3897f3104563763ef26ad940d4e988d7245dd * update patches * update patches * Add ElectronKioskDelegate for extensions https://chromium-review.googlesource.com/c/chromium/src/+/2159760 Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Electron Bot <anonymous@electronjs.org>
95 lines
4 KiB
Diff
95 lines
4 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_extra/digest_extra.c b/crypto/digest_extra/digest_extra.c
|
|
index 4b4bb38135e6089eaf6f47afda0199567a2397ef..43b7eca808b82a032055f56ce726ce4f38c5f2c5 100644
|
|
--- a/crypto/digest_extra/digest_extra.c
|
|
+++ b/crypto/digest_extra/digest_extra.c
|
|
@@ -81,6 +81,7 @@ static const struct nid_to_digest nid_to_digest_mapping[] = {
|
|
{NID_sha384, EVP_sha384, SN_sha384, LN_sha384},
|
|
{NID_sha512, EVP_sha512, SN_sha512, LN_sha512},
|
|
{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.c b/crypto/fipsmodule/digest/digests.c
|
|
index 16daeba650e2390c168fb4998450ba5182815816..893dc93cb03bd4518afee795af44316b810fcb20 100644
|
|
--- a/crypto/fipsmodule/digest/digests.c
|
|
+++ b/crypto/fipsmodule/digest/digests.c
|
|
@@ -63,6 +63,7 @@
|
|
#include <openssl/md5.h>
|
|
#include <openssl/nid.h>
|
|
#include <openssl/sha.h>
|
|
+#include <openssl/ripemd.h>
|
|
|
|
#include "internal.h"
|
|
#include "../delocate.h"
|
|
@@ -293,4 +294,27 @@ DEFINE_METHOD_FUNCTION(EVP_MD, EVP_md5_sha1) {
|
|
out->ctx_size = sizeof(MD5_SHA1_CTX);
|
|
}
|
|
|
|
+static void ripemd160_init(EVP_MD_CTX *ctx) {
|
|
+ CHECK(RIPEMD160_Init(ctx->md_data));
|
|
+}
|
|
+
|
|
+static void ripemd160_update(EVP_MD_CTX *ctx, const void *data, size_t count) {
|
|
+ CHECK(RIPEMD160_Update(ctx->md_data, data, count));
|
|
+}
|
|
+
|
|
+static void ripemd160_final(EVP_MD_CTX *ctx, uint8_t *md) {
|
|
+ CHECK(RIPEMD160_Final(md, 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.c b/decrepit/evp/evp_do_all.c
|
|
index d540144b293297791c087e0b968a47d368a73695..53cb9d2dc8f1962a70dc12b648d27c32be8aca4b 100644
|
|
--- a/decrepit/evp/evp_do_all.c
|
|
+++ b/decrepit/evp/evp_do_all.c
|
|
@@ -78,6 +78,7 @@ void EVP_MD_do_all_sorted(void (*callback)(const EVP_MD *cipher,
|
|
callback(EVP_sha256(), "SHA256", NULL, arg);
|
|
callback(EVP_sha384(), "SHA384", NULL, arg);
|
|
callback(EVP_sha512(), "SHA512", NULL, arg);
|
|
+ callback(EVP_ripemd160(), "RIPEMD160", NULL, arg);
|
|
|
|
callback(EVP_md4(), "md4", NULL, arg);
|
|
callback(EVP_md5(), "md5", NULL, arg);
|
|
@@ -86,4 +87,5 @@ void EVP_MD_do_all_sorted(void (*callback)(const EVP_MD *cipher,
|
|
callback(EVP_sha256(), "sha256", NULL, arg);
|
|
callback(EVP_sha384(), "sha384", NULL, arg);
|
|
callback(EVP_sha512(), "sha512", NULL, arg);
|
|
+ callback(EVP_ripemd160(), "ripemd160", NULL, arg);
|
|
}
|
|
diff --git a/include/openssl/digest.h b/include/openssl/digest.h
|
|
index 7b0ed06cb352718a972be875d03d7c7c89489701..7072457224af3a66d1862f0028cb0ae17847f237 100644
|
|
--- a/include/openssl/digest.h
|
|
+++ b/include/openssl/digest.h
|
|
@@ -89,6 +89,9 @@ OPENSSL_EXPORT const EVP_MD *EVP_sha512_256(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);
|