mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
6ea7d6d5a4
* chore: bump chromium in DEPS to 146.0.7633.0 * chore: fixup patch indices * chore: fix unsafe buffer usage in browser_linux.cc --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
98 lines
4.2 KiB
Diff
98 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 17961ba6bd9de78b5b1b1008eb1f73babd49d0e7..6a870dce37df8f49106c24b183308a2c7a03fd7d 100644
|
|
--- a/crypto/digest/digest_extra.cc
|
|
+++ b/crypto/digest/digest_extra.cc
|
|
@@ -47,6 +47,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 a246a51103701e0ac8a0722324350a462f95bcc9..ddf0a90337d4e40de09bc345cf959dffdb161ecb 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"
|
|
@@ -181,4 +182,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 feaf17c72cecb8099bc11ac10747fbad719ddca9..891a73f229e3f0838cb2fa99b8fb24fdeac1962b 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", nullptr, arg);
|
|
callback(EVP_sha512(), "SHA512", nullptr, arg);
|
|
callback(EVP_sha512_256(), "SHA512-256", nullptr, arg);
|
|
+ callback(EVP_ripemd160(), "ripemd160", nullptr, arg);
|
|
|
|
callback(EVP_md4(), "md4", nullptr, arg);
|
|
callback(EVP_md5(), "md5", nullptr, arg);
|
|
@@ -88,6 +89,7 @@ void EVP_MD_do_all_sorted(void (*callback)(const EVP_MD *cipher,
|
|
callback(EVP_sha384(), "sha384", nullptr, arg);
|
|
callback(EVP_sha512(), "sha512", nullptr, arg);
|
|
callback(EVP_sha512_256(), "sha512-256", nullptr, arg);
|
|
+ callback(EVP_ripemd160(), "ripemd160", nullptr, 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 a86c18926e7798a3b0aae70c53870e03b5acd0ab..f4f27f9e803533d8db50d89e7a0125384a025a46 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);
|