2019-01-28 13:36:51 -08:00
|
|
|
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.
|
|
|
|
|
2025-01-23 23:07:43 -05:00
|
|
|
diff --git a/crypto/digest/digest_extra.cc b/crypto/digest/digest_extra.cc
|
2025-02-14 11:05:01 +01:00
|
|
|
index f68ede9156ee57526f4578953c350798a1299f00..1de18075e1cfa7f9660fa3b065cd20bafcbe7ee8 100644
|
2025-01-23 23:07:43 -05:00
|
|
|
--- a/crypto/digest/digest_extra.cc
|
|
|
|
+++ b/crypto/digest/digest_extra.cc
|
2025-02-14 11:05:01 +01:00
|
|
|
@@ -45,6 +45,7 @@ static const struct nid_to_digest nid_to_digest_mapping[] = {
|
2019-01-28 13:36:51 -08:00
|
|
|
{NID_sha512, EVP_sha512, SN_sha512, LN_sha512},
|
2021-10-05 19:21:00 -07:00
|
|
|
{NID_sha512_256, EVP_sha512_256, SN_sha512_256, LN_sha512_256},
|
2019-01-28 13:36:51 -08:00
|
|
|
{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.
|
2024-12-10 13:16:07 -06:00
|
|
|
diff --git a/crypto/fipsmodule/digest/digests.cc.inc b/crypto/fipsmodule/digest/digests.cc.inc
|
2025-02-14 11:05:01 +01:00
|
|
|
index 3c1bfac504c8f41788e429f23606a02e87ad03ae..c3a371029cd9e871ebffae5396cc2f8ae773409f 100644
|
2024-12-10 13:16:07 -06:00
|
|
|
--- a/crypto/fipsmodule/digest/digests.cc.inc
|
|
|
|
+++ b/crypto/fipsmodule/digest/digests.cc.inc
|
2025-02-14 11:05:01 +01:00
|
|
|
@@ -18,6 +18,7 @@
|
2024-09-30 14:54:44 +02:00
|
|
|
#include <string.h>
|
2024-09-25 06:19:39 -05:00
|
|
|
|
2019-01-28 13:36:51 -08:00
|
|
|
#include <openssl/nid.h>
|
|
|
|
+#include <openssl/ripemd.h>
|
|
|
|
|
2024-12-10 13:16:07 -06:00
|
|
|
#include "../../internal.h"
|
|
|
|
#include "../bcm_interface.h"
|
2025-02-14 11:05:01 +01:00
|
|
|
@@ -175,4 +176,27 @@ DEFINE_METHOD_FUNCTION(EVP_MD, EVP_sha512_256) {
|
2024-09-25 06:19:39 -05:00
|
|
|
out->ctx_size = sizeof(SHA512_CTX);
|
2019-01-28 13:36:51 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
+static void ripemd160_init(EVP_MD_CTX *ctx) {
|
2024-12-10 13:16:07 -06:00
|
|
|
+ CHECK(RIPEMD160_Init(reinterpret_cast<RIPEMD160_CTX *>(ctx->md_data)));
|
2019-01-28 13:36:51 -08:00
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static void ripemd160_update(EVP_MD_CTX *ctx, const void *data, size_t count) {
|
2024-12-10 13:16:07 -06:00
|
|
|
+ CHECK(RIPEMD160_Update(reinterpret_cast<RIPEMD160_CTX *>(ctx->md_data), data, count));
|
2019-01-28 13:36:51 -08:00
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static void ripemd160_final(EVP_MD_CTX *ctx, uint8_t *md) {
|
2024-12-10 13:16:07 -06:00
|
|
|
+ CHECK(RIPEMD160_Final(md, reinterpret_cast<RIPEMD160_CTX *>(ctx->md_data)));
|
2019-01-28 13:36:51 -08:00
|
|
|
+}
|
|
|
|
+
|
|
|
|
+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
|
2024-12-10 13:16:07 -06:00
|
|
|
diff --git a/decrepit/evp/evp_do_all.cc b/decrepit/evp/evp_do_all.cc
|
2025-02-14 11:05:01 +01:00
|
|
|
index e04b80cd6a1a215fc87f8fd8d750c3d258c3974f..8fdf1c624794f568bfc77b7b6b0c510b23905a4d 100644
|
2024-12-10 13:16:07 -06:00
|
|
|
--- a/decrepit/evp/evp_do_all.cc
|
|
|
|
+++ b/decrepit/evp/evp_do_all.cc
|
2021-10-05 19:21:00 -07:00
|
|
|
@@ -79,6 +79,7 @@ void EVP_MD_do_all_sorted(void (*callback)(const EVP_MD *cipher,
|
2019-01-28 13:36:51 -08:00
|
|
|
callback(EVP_sha384(), "SHA384", NULL, arg);
|
|
|
|
callback(EVP_sha512(), "SHA512", NULL, arg);
|
2021-10-05 19:21:00 -07:00
|
|
|
callback(EVP_sha512_256(), "SHA512-256", NULL, arg);
|
|
|
|
+ callback(EVP_ripemd160(), "ripemd160", NULL, arg);
|
2019-01-28 13:36:51 -08:00
|
|
|
|
|
|
|
callback(EVP_md4(), "md4", NULL, arg);
|
|
|
|
callback(EVP_md5(), "md5", NULL, arg);
|
2021-10-05 19:21:00 -07:00
|
|
|
@@ -88,6 +89,7 @@ void EVP_MD_do_all_sorted(void (*callback)(const EVP_MD *cipher,
|
2019-01-28 13:36:51 -08:00
|
|
|
callback(EVP_sha384(), "sha384", NULL, arg);
|
|
|
|
callback(EVP_sha512(), "sha512", NULL, arg);
|
2021-10-05 19:21:00 -07:00
|
|
|
callback(EVP_sha512_256(), "sha512-256", NULL, arg);
|
2019-01-28 13:36:51 -08:00
|
|
|
+ callback(EVP_ripemd160(), "ripemd160", NULL, arg);
|
|
|
|
}
|
2021-08-11 17:04:56 -04:00
|
|
|
|
|
|
|
void EVP_MD_do_all(void (*callback)(const EVP_MD *cipher, const char *name,
|
2019-01-28 13:36:51 -08:00
|
|
|
diff --git a/include/openssl/digest.h b/include/openssl/digest.h
|
2025-02-14 11:05:01 +01:00
|
|
|
index 5ddc2d3b4cfb8a87eb22fb707230f56dcb7ccb3e..dea3c5b3adf49e1b4aab197e822744c80964afac 100644
|
2019-01-28 13:36:51 -08:00
|
|
|
--- a/include/openssl/digest.h
|
|
|
|
+++ b/include/openssl/digest.h
|
2025-02-14 11:05:01 +01:00
|
|
|
@@ -48,6 +48,9 @@ OPENSSL_EXPORT const EVP_MD *EVP_blake2b256(void);
|
2019-01-28 13:36:51 -08:00
|
|
|
// 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);
|