Add HKDF_HMAC256_L32 and method to negate a private key #14047

jonasschnelli · 2018-08-24T09:20:37Z

This adds a limited implementation of HKDF (defined by rfc5869) that supports only HMAC-SHA256 and length output of 32 bytes (will be required for v2 transport protocol).

This PR also includes a method to negate a private key which is useful to enforce public keys starting with 0x02 (or 0x03) (a requirement for the v2 transport protocol). The new CKey::Negate() method is pretty much a wrapper around secp256k1_ec_privkey_negate().

Including tests.

This is a subset of #14032 and a pre-requirement for the v2 transport protocol.

DrahtBot · 2018-08-24T12:15:23Z

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

#15649 (Add ChaCha20Poly1305@Bitcoin AEAD by jonasschnelli)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

src/crypto/hkdf_sha256_32.cpp

src/test/crypto_tests.cpp

src/crypto/hkdf_sha256_32.h

jonasschnelli · 2019-03-05T14:48:30Z

Rebased

src/test/key_tests.cpp

src/test/crypto_tests.cpp

sipa · 2019-03-26T22:50:08Z

utACK acf3deb

jonasschnelli · 2019-03-27T16:40:29Z

rebased

sipa

utACK 65948ee, just some nits.

sipa · 2019-05-10T21:53:29Z

src/crypto/hkdf_sha256_32.cpp

+
+CHKDF_HMAC_SHA256_L32::CHKDF_HMAC_SHA256_L32(const unsigned char* ikm, size_t ikmlen, const std::string& salt)
+{
+    CHMAC_SHA256(reinterpret_cast<const unsigned char*>(salt.c_str()), salt.size()).Write(ikm, ikmlen).Finalize(m_prk);


Style nit: we don't usually use the C++ cast operators for primitive types (just (const unsigned char*)salt.c_str() works).

sipa · 2019-05-10T21:54:54Z

src/crypto/hkdf_sha256_32.cpp

+    // expand a 32byte key (single round)
+    assert(info.size() <= 128);
+    static const unsigned char one[1] = {1};
+    CHMAC_SHA256(m_prk, 32).Write(reinterpret_cast<const unsigned char*>(info.data()), info.size()).Write(one, 1).Finalize(hash);


jonasschnelli · 2019-05-11T07:14:54Z

Thanks for the review. Fixed the C++ cast nit.

promag · 2019-05-13T18:13:32Z

Restarted failed job.

promag

some nits 👼

promag · 2019-05-13T18:15:53Z

src/crypto/hkdf_sha256_32.cpp

@@ -0,0 +1,21 @@
+// Copyright (c) 2018 The Bitcoin Core developers


promag · 2019-05-13T18:16:49Z

src/test/crypto_tests.cpp

+    std::vector<unsigned char> salt = ParseHex(salt_hex);
+    std::vector<unsigned char> info = ParseHex(info_hex);
+
+


nit, remove 2nd empty line.

promag · 2019-05-13T18:17:06Z

src/test/crypto_tests.cpp

@@ -212,6 +213,22 @@ static void TestPoly1305(const std::string &hexmessage, const std::string &hexke
    BOOST_CHECK(tag == tagres);
 }

+static void TestHKDF_SHA256_32(const std::string &ikm_hex, const std::string &salt_hex, const std::string &info_hex, const std::string &okm_check_hex) {


nit, space after &, not before.

laanwj · 2019-05-16T17:24:45Z

utACK 8794a4b
Don't want to hold this up on a few last-minute style nits and empty lines.

8794a4b QA: add test for HKDF HMAC_SHA256 L32 (Jonas Schnelli) 551d489 Add HKDF HMAC_SHA256 L=32 implementations (Jonas Schnelli) 3b64f85 QA: add test for CKey::Negate() (Jonas Schnelli) 463921b CKey: add method to negate the key (Jonas Schnelli) Pull request description: This adds a limited implementation of `HKDF` (defined by rfc5869) that supports only HMAC-SHA256 and length output of 32 bytes (will be required for v2 transport protocol). This PR also includes a method to negate a private key which is useful to enforce public keys starting with 0x02 (or 0x03) (a requirement for the v2 transport protocol). The new `CKey::Negate()` method is pretty much a wrapper around `secp256k1_ec_privkey_negate()`. Including tests. This is a subset of #14032 and a pre-requirement for the v2 transport protocol. ACKs for commit 8794a4: Tree-SHA512: 5341929dfa29f5da766ec3612784baec6a3ad69972f08b5a985a8aafdae4dae36f104a2b888d1f5d1f33561456bd111f960d7e32c2cc4fd18e48358468f26c1a

…ate key 8794a4b QA: add test for HKDF HMAC_SHA256 L32 (Jonas Schnelli) 551d489 Add HKDF HMAC_SHA256 L=32 implementations (Jonas Schnelli) 3b64f85 QA: add test for CKey::Negate() (Jonas Schnelli) 463921b CKey: add method to negate the key (Jonas Schnelli) Pull request description: This adds a limited implementation of `HKDF` (defined by rfc5869) that supports only HMAC-SHA256 and length output of 32 bytes (will be required for v2 transport protocol). This PR also includes a method to negate a private key which is useful to enforce public keys starting with 0x02 (or 0x03) (a requirement for the v2 transport protocol). The new `CKey::Negate()` method is pretty much a wrapper around `secp256k1_ec_privkey_negate()`. Including tests. This is a subset of bitcoin#14032 and a pre-requirement for the v2 transport protocol. ACKs for commit 8794a4: Tree-SHA512: 5341929dfa29f5da766ec3612784baec6a3ad69972f08b5a985a8aafdae4dae36f104a2b888d1f5d1f33561456bd111f960d7e32c2cc4fd18e48358468f26c1a

…ate key 8794a4b QA: add test for HKDF HMAC_SHA256 L32 (Jonas Schnelli) 551d489 Add HKDF HMAC_SHA256 L=32 implementations (Jonas Schnelli) 3b64f85 QA: add test for CKey::Negate() (Jonas Schnelli) 463921b CKey: add method to negate the key (Jonas Schnelli) Pull request description: This adds a limited implementation of `HKDF` (defined by rfc5869) that supports only HMAC-SHA256 and length output of 32 bytes (will be required for v2 transport protocol). This PR also includes a method to negate a private key which is useful to enforce public keys starting with 0x02 (or 0x03) (a requirement for the v2 transport protocol). The new `CKey::Negate()` method is pretty much a wrapper around `secp256k1_ec_privkey_negate()`. Including tests. This is a subset of bitcoin#14032 and a pre-requirement for the v2 transport protocol. ACKs for commit 8794a4: Tree-SHA512: 5341929dfa29f5da766ec3612784baec6a3ad69972f08b5a985a8aafdae4dae36f104a2b888d1f5d1f33561456bd111f960d7e32c2cc4fd18e48358468f26c1a Signed-off-by: Pasta <pasta@dashboost.org>

Summary: bitcoin/bitcoin@463921b --- Partial backport of Core [[bitcoin/bitcoin#14047 | PR14047]] Test Plan: ninja Reviewers: #bitcoin_abc, deadalnix Reviewed By: #bitcoin_abc, deadalnix Differential Revision: https://reviews.bitcoinabc.org/D7393

Summary: bitcoin/bitcoin@3b64f85 --- Depends on D7393 Partial backport of Core [[bitcoin/bitcoin#14047 | PR14047]] Test Plan: ninja check-bitcoin-key_tests Reviewers: #bitcoin_abc, deadalnix Reviewed By: #bitcoin_abc, deadalnix Subscribers: deadalnix Differential Revision: https://reviews.bitcoinabc.org/D7394

Summary: bitcoin/bitcoin@551d489 --- Depends on D7394 Partial backport of Core [[bitcoin/bitcoin#14047 | PR14047]] Test Plan: ninja Reviewers: #bitcoin_abc, deadalnix Reviewed By: #bitcoin_abc, deadalnix Subscribers: deadalnix Differential Revision: https://reviews.bitcoinabc.org/D7395

Summary: bitcoin/bitcoin@8794a4b --- Depends on D7395 Partial backport of Core [[bitcoin/bitcoin#14047 | PR14047]] Test Plan: ninja check-bitcoin-crypto_tests Reviewers: #bitcoin_abc, deadalnix Reviewed By: #bitcoin_abc, deadalnix Differential Revision: https://reviews.bitcoinabc.org/D7396

…ate key 8794a4b QA: add test for HKDF HMAC_SHA256 L32 (Jonas Schnelli) 551d489 Add HKDF HMAC_SHA256 L=32 implementations (Jonas Schnelli) 3b64f85 QA: add test for CKey::Negate() (Jonas Schnelli) 463921b CKey: add method to negate the key (Jonas Schnelli) Pull request description: This adds a limited implementation of `HKDF` (defined by rfc5869) that supports only HMAC-SHA256 and length output of 32 bytes (will be required for v2 transport protocol). This PR also includes a method to negate a private key which is useful to enforce public keys starting with 0x02 (or 0x03) (a requirement for the v2 transport protocol). The new `CKey::Negate()` method is pretty much a wrapper around `secp256k1_ec_privkey_negate()`. Including tests. This is a subset of bitcoin#14032 and a pre-requirement for the v2 transport protocol. ACKs for commit 8794a4: Tree-SHA512: 5341929dfa29f5da766ec3612784baec6a3ad69972f08b5a985a8aafdae4dae36f104a2b888d1f5d1f33561456bd111f960d7e32c2cc4fd18e48358468f26c1a

jonasschnelli mentioned this pull request Aug 24, 2018

Add p2p layer encryption with ECDH/ChaCha20Poly1305 #14032

Closed

1 task

DrahtBot mentioned this pull request Aug 24, 2018

Add chacha20/poly1305 and chacha20poly1305_AEAD from openssh #14050

Closed

sipa reviewed Aug 26, 2018

View reviewed changes

src/crypto/hkdf_sha256_32.cpp Outdated Show resolved Hide resolved

jonasschnelli force-pushed the 2018/08/bip151_key_hkdf branch from 2130c88 to dc02f90 Compare August 27, 2018 11:42

jonasschnelli added a commit to jonasschnelli/bitcoin that referenced this pull request Aug 29, 2018

--- NEW CRYPTO (bitcoin#14047, bitcoin#14049, bitcoin#14050) ---

955ac1d

DrahtBot mentioned this pull request Aug 30, 2018

export der always compressed #14102

Closed

Sjors reviewed Sep 2, 2018

View reviewed changes

src/test/crypto_tests.cpp Outdated Show resolved Hide resolved

practicalswift reviewed Sep 10, 2018

View reviewed changes

src/crypto/hkdf_sha256_32.h Show resolved Hide resolved

jonasschnelli force-pushed the 2018/08/bip151_key_hkdf branch 2 times, most recently from 75a15a3 to a034ec2 Compare September 18, 2018 07:53

DrahtBot mentioned this pull request Oct 23, 2018

Move util files to directory #14555

Merged

DrahtBot added the Needs rebase label Nov 5, 2018

jonasschnelli force-pushed the 2018/08/bip151_key_hkdf branch from a034ec2 to 32633ff Compare March 5, 2019 14:48

DrahtBot removed the Needs rebase label Mar 5, 2019

DrahtBot added Build system Tests Utils/log/libs labels Mar 19, 2019

sipa reviewed Mar 25, 2019

View reviewed changes

src/test/key_tests.cpp Show resolved Hide resolved

src/test/crypto_tests.cpp Outdated Show resolved Hide resolved

jonasschnelli force-pushed the 2018/08/bip151_key_hkdf branch from 32633ff to acf3deb Compare March 26, 2019 17:07

DrahtBot added the Needs rebase label Mar 27, 2019

jonasschnelli added 2 commits March 27, 2019 13:59

CKey: add method to negate the key

463921b

QA: add test for CKey::Negate()

3b64f85

jonasschnelli force-pushed the 2018/08/bip151_key_hkdf branch from acf3deb to 65948ee Compare March 27, 2019 16:25

DrahtBot removed the Needs rebase label Mar 27, 2019

sipa reviewed May 10, 2019

View reviewed changes

Add HKDF HMAC_SHA256 L=32 implementations

551d489

QA: add test for HKDF HMAC_SHA256 L32

8794a4b

jonasschnelli force-pushed the 2018/08/bip151_key_hkdf branch from 65948ee to 8794a4b Compare May 11, 2019 07:14

promag mentioned this pull request May 13, 2019

Failure in wallet_balance.py #16020

Closed

promag reviewed May 13, 2019

View reviewed changes

laanwj merged commit 8794a4b into bitcoin:master May 16, 2019

bitcoin locked as resolved and limited conversation to collaborators Dec 16, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add HKDF_HMAC256_L32 and method to negate a private key #14047

Add HKDF_HMAC256_L32 and method to negate a private key #14047

jonasschnelli commented Aug 24, 2018 •

edited

Loading

DrahtBot commented Aug 24, 2018 •

edited

Loading

jonasschnelli commented Mar 5, 2019

sipa commented Mar 26, 2019

jonasschnelli commented Mar 27, 2019

sipa left a comment

sipa May 10, 2019

sipa May 10, 2019

jonasschnelli commented May 11, 2019

promag commented May 13, 2019

promag left a comment

promag May 13, 2019

promag May 13, 2019

promag May 13, 2019

laanwj commented May 16, 2019

		@@ -0,0 +1,21 @@
		// Copyright (c) 2018 The Bitcoin Core developers

		std::vector<unsigned char> salt = ParseHex(salt_hex);
		std::vector<unsigned char> info = ParseHex(info_hex);

Add HKDF_HMAC256_L32 and method to negate a private key #14047

Add HKDF_HMAC256_L32 and method to negate a private key #14047

Conversation

jonasschnelli commented Aug 24, 2018 • edited Loading

DrahtBot commented Aug 24, 2018 • edited Loading

Conflicts

jonasschnelli commented Mar 5, 2019

sipa commented Mar 26, 2019

jonasschnelli commented Mar 27, 2019

sipa left a comment

Choose a reason for hiding this comment

sipa May 10, 2019

Choose a reason for hiding this comment

sipa May 10, 2019

Choose a reason for hiding this comment

jonasschnelli commented May 11, 2019

promag commented May 13, 2019

promag left a comment

Choose a reason for hiding this comment

promag May 13, 2019

Choose a reason for hiding this comment

promag May 13, 2019

Choose a reason for hiding this comment

promag May 13, 2019

Choose a reason for hiding this comment

laanwj commented May 16, 2019

jonasschnelli commented Aug 24, 2018 •

edited

Loading

DrahtBot commented Aug 24, 2018 •

edited

Loading