This is an automated email from the ASF dual-hosted git repository.
maskit pushed a commit to branch quic-latest
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/quic-latest by this push:
new d6cac6a Extract HKDF logic to use it for cleartext packet validation
d6cac6a is described below
commit d6cac6a7024077486a3408be10392fa2716e3bc2
Author: Masakazu Kitajo <mas...@apache.org>
AuthorDate: Mon Nov 13 17:54:10 2017 +0900
Extract HKDF logic to use it for cleartext packet validation
---
iocore/net/quic/QUICCrypto.cc | 32 ++--
iocore/net/quic/QUICCrypto.h | 20 ++-
iocore/net/quic/QUICCrypto_openssl.cc | 34 ----
lib/ts/HKDF.cc | 44 +++++
lib/ts/HKDF.h | 48 ++++++
lib/ts/HKDF_openssl.cc | 80 +++++++++
lib/ts/Makefile.am | 12 +-
lib/ts/unit-tests/test_HKDF.cc | 311 ++++++++++++++++++++++++++++++++++
8 files changed, 517 insertions(+), 64 deletions(-)
diff --git a/iocore/net/quic/QUICCrypto.cc b/iocore/net/quic/QUICCrypto.cc
index 20414c6..3c6446d 100644
--- a/iocore/net/quic/QUICCrypto.cc
+++ b/iocore/net/quic/QUICCrypto.cc
@@ -27,6 +27,7 @@
#include <openssl/ssl.h>
#include <openssl/bio.h>
+#include "ts/HKDF.h"
#include "ts/Diags.h"
#include "ts/string_view.h"
#include "QUICTypes.h"
@@ -99,6 +100,7 @@ QUICCrypto::QUICCrypto(SSL *ssl, NetVConnectionContext_t
nvc_ctx) : _ssl(ssl), _
QUICCrypto::~QUICCrypto()
{
+ delete this->_hkdf;
delete this->_client_pp;
delete this->_server_pp;
}
@@ -163,6 +165,7 @@ QUICCrypto::setup_session()
const SSL_CIPHER *cipher = SSL_get_current_cipher(this->_ssl);
this->_digest = _get_handshake_digest(cipher);
this->_aead = _get_evp_aead(cipher);
+ this->_hkdf = new HKDF(this->_digest);
size_t secret_len = EVP_MD_size(this->_digest);
size_t key_len = _get_aead_key_len(this->_aead);
@@ -316,13 +319,15 @@ QUICCrypto::_export_client_keymaterial(size_t secret_len,
size_t key_len, size_t
return r;
}
- r = _hkdf_expand_label(km->key, key_len, km->secret, secret_len,
expand_label_key.data(), expand_label_key.size(), this->_digest);
+ r = this->_hkdf->expand_label(km->key, &key_len, km->secret, secret_len,
expand_label_key.data(), expand_label_key.size(),
+ EVP_MD_size(this->_digest));
if (r != 1) {
Debug(tag, "Failed to expand label for key");
return r;
}
- r = _hkdf_expand_label(km->iv, iv_len, km->secret, secret_len,
expand_label_iv.data(), expand_label_iv.size(), this->_digest);
+ r = this->_hkdf->expand_label(km->iv, &iv_len, km->secret, secret_len,
expand_label_iv.data(), expand_label_iv.size(),
+ EVP_MD_size(this->_digest));
if (r != 1) {
Debug(tag, "Failed to expand label for iv");
return r;
@@ -347,13 +352,15 @@ QUICCrypto::_export_server_keymaterial(size_t secret_len,
size_t key_len, size_t
return r;
}
- r = _hkdf_expand_label(km->key, key_len, km->secret, secret_len,
expand_label_key.data(), expand_label_key.size(), this->_digest);
+ r = this->_hkdf->expand_label(km->key, &key_len, km->secret, secret_len,
expand_label_key.data(), expand_label_key.size(),
+ EVP_MD_size(this->_digest));
if (r != 1) {
Debug(tag, "Failed to expand label for key");
return r;
}
- r = _hkdf_expand_label(km->iv, iv_len, km->secret, secret_len,
expand_label_iv.data(), expand_label_iv.size(), this->_digest);
+ r = this->_hkdf->expand_label(km->iv, &iv_len, km->secret, secret_len,
expand_label_iv.data(), expand_label_iv.size(),
+ EVP_MD_size(this->_digest));
if (r != 1) {
Debug(tag, "Failed to expand label for iv");
return r;
@@ -391,20 +398,3 @@ QUICCrypto::_gen_nonce(uint8_t *nonce, size_t &nonce_len,
uint64_t pkt_num, cons
nonce[iv_len - 8 + i] ^= p[i];
}
}
-
-bool
-QUICCrypto::_gen_info(uint8_t *info, size_t &info_len, const char *label,
size_t label_len, size_t length) const
-{
- info[0] = length / 256;
- info[1] = length % 256;
- info[2] = label_len;
- info_len += 3;
-
- memcpy(info + info_len, label, label_len);
- info_len += label_len;
-
- info[info_len] = 0x00;
- ++info_len;
-
- return true;
-}
diff --git a/iocore/net/quic/QUICCrypto.h b/iocore/net/quic/QUICCrypto.h
index 1eb24ac..3e8e0fd 100644
--- a/iocore/net/quic/QUICCrypto.h
+++ b/iocore/net/quic/QUICCrypto.h
@@ -23,6 +23,7 @@
#pragma once
+#include "ts/HKDF.h"
#include <openssl/ssl.h>
#ifdef OPENSSL_IS_BORINGSSL
@@ -39,11 +40,14 @@
struct KeyMaterial {
KeyMaterial(size_t secret_len, size_t key_len, size_t iv_len) :
secret_len(secret_len), key_len(key_len), iv_len(iv_len) {}
uint8_t secret[EVP_MAX_MD_SIZE] = {0};
- uint8_t key[EVP_MAX_KEY_LENGTH] = {0};
- uint8_t iv[EVP_MAX_IV_LENGTH] = {0};
- size_t secret_len = 0;
- size_t key_len = 0;
- size_t iv_len = 0;
+ // These constant sizes are not enough somehow
+ // uint8_t key[EVP_MAX_KEY_LENGTH] = {0};
+ // uint8_t iv[EVP_MAX_IV_LENGTH] = {0};
+ uint8_t key[512] = {0};
+ uint8_t iv[512] = {0};
+ size_t secret_len = 0;
+ size_t key_len = 0;
+ size_t iv_len = 0;
};
class QUICPacketProtection
@@ -81,13 +85,13 @@ public:
SSL *ssl_handle();
private:
+ HKDF *_hkdf = nullptr;
int _export_secret(uint8_t *dst, size_t dst_len, const char *label, size_t
label_len) const;
int _export_client_keymaterial(size_t secret_len, size_t key_len, size_t
iv_len);
int _export_server_keymaterial(size_t secret_len, size_t key_len, size_t
iv_len);
void _gen_nonce(uint8_t *nonce, size_t &nonce_len, uint64_t pkt_num, const
uint8_t *iv, size_t iv_len) const;
- bool _gen_info(uint8_t *info, size_t &info_len, const char *label, size_t
label_len, size_t length) const;
- int _hkdf_expand_label(uint8_t *dst, size_t dst_len, const uint8_t *secret,
size_t secret_len, const char *label,
- size_t label_len, const EVP_MD *digest) const;
+ int _hkdf_expand_label(const uint8_t *dst, size_t dst_len, const uint8_t
*secret, size_t secret_len, const char *label,
+ size_t label_len, const EVP_MD *digest);
#ifdef OPENSSL_IS_BORINGSSL
const EVP_AEAD *_get_evp_aead(const SSL_CIPHER *cipher) const;
size_t _get_aead_key_len(const EVP_AEAD *aead) const;
diff --git a/iocore/net/quic/QUICCrypto_openssl.cc
b/iocore/net/quic/QUICCrypto_openssl.cc
index 511db00..b2858f3 100644
--- a/iocore/net/quic/QUICCrypto_openssl.cc
+++ b/iocore/net/quic/QUICCrypto_openssl.cc
@@ -97,40 +97,6 @@ QUICCrypto::_get_aead_nonce_len(const EVP_CIPHER *aead) const
return EVP_CIPHER_iv_length(aead);
}
-int
-QUICCrypto::_hkdf_expand_label(uint8_t *dst, size_t dst_len, const uint8_t
*secret, size_t secret_len, const char *label,
- size_t label_len, const EVP_MD *digest) const
-{
- uint8_t info[256] = {0};
- size_t info_len = 0;
- _gen_info(info, info_len, label, label_len, dst_len);
-
- EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_HKDF, nullptr);
- if (!EVP_PKEY_derive_init(pctx)) {
- return -1;
- }
- if (!EVP_PKEY_CTX_hkdf_mode(pctx, EVP_PKEY_HKDEF_MODE_EXPAND_ONLY)) {
- return -1;
- }
- if (!EVP_PKEY_CTX_set_hkdf_md(pctx, digest)) {
- return -1;
- }
- if (!EVP_PKEY_CTX_set1_hkdf_salt(pctx, "", 0)) {
- return -1;
- }
- if (!EVP_PKEY_CTX_set1_hkdf_key(pctx, secret, secret_len)) {
- return -1;
- }
- if (!EVP_PKEY_CTX_add1_hkdf_info(pctx, info, info_len)) {
- return -1;
- }
- if (!EVP_PKEY_derive(pctx, dst, &dst_len)) {
- return -1;
- }
-
- return 1;
-}
-
bool
QUICCrypto::_encrypt(uint8_t *cipher, size_t &cipher_len, size_t
max_cipher_len, const uint8_t *plain, size_t plain_len,
uint64_t pkt_num, const uint8_t *ad, size_t ad_len, const
uint8_t *key, size_t key_len, const uint8_t *iv,
diff --git a/lib/ts/HKDF.cc b/lib/ts/HKDF.cc
new file mode 100644
index 0000000..fe01117
--- /dev/null
+++ b/lib/ts/HKDF.cc
@@ -0,0 +1,44 @@
+/** @file
+ *
+ * HKDF utility (common part)
+ *
+ * @section license License
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "HKDF.h"
+#include <cstdio>
+#include <cstring>
+
+int
+HKDF::expand_label(uint8_t *dst, size_t *dst_len, const uint8_t *secret,
size_t secret_len, const char *label, size_t label_len,
+ uint16_t length)
+{
+ // Create HKDF label
+ uint8_t hkdf_label[512]; // 2 + 255 + 255
+ // Length
+ hkdf_label[0] = (length >> 8) & 0xFF;
+ hkdf_label[1] = length & 0xFF;
+ // "tls13 " + Label
+ int hkdf_label_len = sprintf(reinterpret_cast<char *>(hkdf_label + 2),
"tls13 %.*s", static_cast<int>(label_len), label);
+ // Always 0
+ hkdf_label[hkdf_label_len] = 0;
+ ++hkdf_label_len;
+
+ this->expand(dst, dst_len, secret, secret_len, hkdf_label, hkdf_label_len,
length);
+ return 1;
+}
diff --git a/lib/ts/HKDF.h b/lib/ts/HKDF.h
new file mode 100644
index 0000000..e659ada
--- /dev/null
+++ b/lib/ts/HKDF.h
@@ -0,0 +1,48 @@
+/** @file
+
+ HKDF utility
+
+ @section license License
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+#pragma once
+
+#ifdef OPENSSL_IS_BORINGSSL
+#include <openssl/digest.h>
+#include <openssl/cipher.h>
+#else
+#include <openssl/evp.h>
+#endif
+
+class HKDF
+{
+public:
+ HKDF(const EVP_MD *digest);
+ int extract(uint8_t *dst, size_t *dst_len, const uint8_t *salt, size_t
salt_len, const uint8_t *ikm, size_t ikm_len);
+ int expand(uint8_t *dst, size_t *dst_len, const uint8_t *prk, size_t
prk_len, const uint8_t *info, size_t info_len,
+ uint16_t length);
+
+ // This function is technically a part of TLS 1.3
+ int expand_label(uint8_t *dst, size_t *dst_len, const uint8_t *secret,
size_t secret_len, const char *label, size_t label_len,
+ uint16_t length);
+
+private:
+ const EVP_MD *_digest = nullptr;
+ EVP_PKEY_CTX *_pctx = nullptr;
+};
diff --git a/lib/ts/HKDF_openssl.cc b/lib/ts/HKDF_openssl.cc
new file mode 100644
index 0000000..af0e87f
--- /dev/null
+++ b/lib/ts/HKDF_openssl.cc
@@ -0,0 +1,80 @@
+/** @file
+ *
+ * HKDF utility (OpenSSL version)
+ *
+ * @section license License
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "HKDF.h"
+#include <openssl/kdf.h>
+
+HKDF::HKDF(const EVP_MD *digest) : _digest(digest)
+{
+ this->_pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_HKDF, nullptr);
+}
+
+int
+HKDF::extract(uint8_t *dst, size_t *dst_len, const uint8_t *salt, size_t
salt_len, const uint8_t *ikm, size_t ikm_len)
+{
+ if (EVP_PKEY_derive_init(this->_pctx) != 1) {
+ return -1;
+ }
+ if (EVP_PKEY_CTX_hkdf_mode(this->_pctx, EVP_PKEY_HKDEF_MODE_EXTRACT_ONLY) !=
1) {
+ return -2;
+ }
+ if (EVP_PKEY_CTX_set_hkdf_md(this->_pctx, this->_digest) != 1) {
+ return -3;
+ }
+ if (EVP_PKEY_CTX_set1_hkdf_salt(this->_pctx, salt, salt_len) != 1) {
+ return -4;
+ }
+ if (EVP_PKEY_CTX_set1_hkdf_key(this->_pctx, ikm, ikm_len) != 1) {
+ return -5;
+ }
+ if (EVP_PKEY_derive(this->_pctx, dst, dst_len) != 1) {
+ return -6;
+ }
+ return 1;
+}
+
+int
+HKDF::expand(uint8_t *dst, size_t *dst_len, const uint8_t *prk, size_t
prk_len, const uint8_t *info, size_t info_len,
+ uint16_t length)
+{
+ if (EVP_PKEY_derive_init(this->_pctx) != 1) {
+ return -1;
+ }
+ if (EVP_PKEY_CTX_hkdf_mode(this->_pctx, EVP_PKEY_HKDEF_MODE_EXPAND_ONLY) !=
1) {
+ return -2;
+ }
+ if (EVP_PKEY_CTX_set_hkdf_md(this->_pctx, this->_digest) != 1) {
+ return -3;
+ }
+ if (EVP_PKEY_CTX_set1_hkdf_key(this->_pctx, prk, prk_len) != 1) {
+ return -5;
+ }
+ if (EVP_PKEY_CTX_add1_hkdf_info(this->_pctx, info, info_len) != 1) {
+ return -6;
+ }
+ *dst_len = length;
+ if (EVP_PKEY_derive(this->_pctx, dst, dst_len) != 1) {
+ return -7;
+ }
+
+ return 1;
+}
diff --git a/lib/ts/Makefile.am b/lib/ts/Makefile.am
index cf4f82d..5062644 100644
--- a/lib/ts/Makefile.am
+++ b/lib/ts/Makefile.am
@@ -44,6 +44,12 @@ libtsutil_la_LIBADD = \
@LIBCAP@ \
-lc
+if OPENSSL_IS_BORINGSSL
+HKDF_impl = HKDF_boringssl.cc
+else
+HKDF_impl = HKDF_openssl.cc
+endif
+
libtsutil_la_SOURCES = \
Allocator.h \
Arena.cc \
@@ -73,6 +79,9 @@ libtsutil_la_SOURCES = \
HashSip.cc \
HashSip.h \
History.h \
+ HKDF.h \
+ HKDF.cc \
+ $(HKDF_impl) \
HostLookup.cc \
HostLookup.h \
hugepages.cc \
@@ -259,7 +268,8 @@ test_tslib_SOURCES = \
unit-tests/test_IpMap.cc \
unit-tests/test_layout.cc \
unit-tests/test_string_view.cc \
- unit-tests/test_TextView.cc
+ unit-tests/test_TextView.cc \
+ unit-tests/test_HKDF.cc
CompileParseRules_SOURCES = CompileParseRules.cc
diff --git a/lib/ts/unit-tests/test_HKDF.cc b/lib/ts/unit-tests/test_HKDF.cc
new file mode 100644
index 0000000..1c4ab5c
--- /dev/null
+++ b/lib/ts/unit-tests/test_HKDF.cc
@@ -0,0 +1,311 @@
+/** @file
+
+ Tests for HKDF
+
+ @section license License
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+#include "catch.hpp"
+#include <cstring>
+#include "ts/HKDF.h"
+
+TEST_CASE("HKDF tests", "[hkdf]")
+{
+ SECTION("Basic test case with SHA-256")
+ {
+ uint8_t ikm[] = {
+ 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+ 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+ };
+ uint8_t salt[] = {
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,
0x0c,
+ };
+ uint8_t info[] = {
+ 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9,
+ };
+ uint16_t length = 42;
+ uint8_t expected_prk[] = {
+ 0x07, 0x77, 0x09, 0x36, 0x2c, 0x2e, 0x32, 0xdf, 0x0d, 0xdc, 0x3f, 0x0d,
0xc4, 0x7b, 0xba, 0x63,
+ 0x90, 0xb6, 0xc7, 0x3b, 0xb5, 0x0f, 0x9c, 0x31, 0x22, 0xec, 0x84, 0x4a,
0xd7, 0xc2, 0xb3, 0xe5,
+ };
+ uint8_t expected_okm[] = {
+ 0x3c, 0xb2, 0x5f, 0x25, 0xfa, 0xac, 0xd5, 0x7a, 0x90, 0x43, 0x4f, 0x64,
0xd0, 0x36, 0x2f, 0x2a, 0x2d, 0x2d, 0x0a, 0x90, 0xcf,
+ 0x1a, 0x5a, 0x4c, 0x5d, 0xb0, 0x2d, 0x56, 0xec, 0xc4, 0xc5, 0xbf, 0x34,
0x00, 0x72, 0x08, 0xd5, 0xb8, 0x87, 0x18, 0x58, 0x65,
+ };
+
+ uint8_t prk[256] = {0};
+ size_t prk_len = sizeof(prk);
+ uint8_t okm[256] = {0};
+ size_t okm_len = sizeof(okm);
+
+ HKDF hkdf(EVP_sha256());
+
+ // Extract
+ CHECK(hkdf.extract(prk, &prk_len, salt, sizeof(salt), ikm, sizeof(ikm)) ==
1);
+ CHECK(prk_len == sizeof(expected_prk));
+ CHECK(memcmp(prk, expected_prk, sizeof(expected_prk)) == 0);
+
+ // Expand
+ CHECK(hkdf.expand(okm, &okm_len, prk, prk_len, info, sizeof(info), length)
== 1);
+ CHECK(okm_len == sizeof(expected_okm));
+ CHECK(memcmp(okm, expected_okm, sizeof(expected_okm)) == 0);
+ }
+
+ SECTION("Test with SHA-256 and longer inputs/outputs")
+ {
+ uint8_t ikm[] = {
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,
0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13,
+ 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33,
0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b,
+ 0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+ };
+ uint8_t salt[] = {
+ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b,
0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73,
+ 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+ 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93,
0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b,
+ 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
+ };
+ uint8_t info[] = {
+ 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb,
0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3,
+ 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
+ 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3,
0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb,
+ 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
+ };
+ uint16_t length = 82;
+ uint8_t expected_prk[] = {
+ 0x06, 0xa6, 0xb8, 0x8c, 0x58, 0x53, 0x36, 0x1a, 0x06, 0x10, 0x4c, 0x9c,
0xeb, 0x35, 0xb4, 0x5c,
+ 0xef, 0x76, 0x00, 0x14, 0x90, 0x46, 0x71, 0x01, 0x4a, 0x19, 0x3f, 0x40,
0xc1, 0x5f, 0xc2, 0x44,
+ };
+ uint8_t expected_okm[] = {
+ 0xb1, 0x1e, 0x39, 0x8d, 0xc8, 0x03, 0x27, 0xa1, 0xc8, 0xe7, 0xf7, 0x8c,
0x59, 0x6a, 0x49, 0x34, 0x4f, 0x01, 0x2e, 0xda, 0x2d,
+ 0x4e, 0xfa, 0xd8, 0xa0, 0x50, 0xcc, 0x4c, 0x19, 0xaf, 0xa9, 0x7c, 0x59,
0x04, 0x5a, 0x99, 0xca, 0xc7, 0x82, 0x72, 0x71, 0xcb,
+ 0x41, 0xc6, 0x5e, 0x59, 0x0e, 0x09, 0xda, 0x32, 0x75, 0x60, 0x0c, 0x2f,
0x09, 0xb8, 0x36, 0x77, 0x93, 0xa9, 0xac, 0xa3, 0xdb,
+ 0x71, 0xcc, 0x30, 0xc5, 0x81, 0x79, 0xec, 0x3e, 0x87, 0xc1, 0x4c, 0x01,
0xd5, 0xc1, 0xf3, 0x43, 0x4f, 0x1d, 0x87,
+ };
+
+ uint8_t prk[256] = {0};
+ size_t prk_len = sizeof(prk);
+ uint8_t okm[256] = {0};
+ size_t okm_len = sizeof(okm);
+
+ HKDF hkdf(EVP_sha256());
+
+ // Extract
+ CHECK(hkdf.extract(prk, &prk_len, salt, sizeof(salt), ikm, sizeof(ikm)) ==
1);
+ CHECK(prk_len == sizeof(expected_prk));
+ CHECK(memcmp(prk, expected_prk, sizeof(expected_prk)) == 0);
+
+ // Expand
+ CHECK(hkdf.expand(okm, &okm_len, prk, prk_len, info, sizeof(info), length)
== 1);
+ CHECK(okm_len == sizeof(expected_okm));
+ CHECK(memcmp(okm, expected_okm, sizeof(expected_okm)) == 0);
+ }
+
+ SECTION("Test with SHA-256 and zero-length salt/info")
+ {
+ uint8_t ikm[] = {
+ 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+ 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+ };
+ uint8_t salt[] = {};
+ uint8_t info[] = {};
+ uint16_t length = 42;
+ uint8_t expected_prk[] = {
+ 0x19, 0xef, 0x24, 0xa3, 0x2c, 0x71, 0x7b, 0x16, 0x7f, 0x33, 0xa9, 0x1d,
0x6f, 0x64, 0x8b, 0xdf,
+ 0x96, 0x59, 0x67, 0x76, 0xaf, 0xdb, 0x63, 0x77, 0xac, 0x43, 0x4c, 0x1c,
0x29, 0x3c, 0xcb, 0x04,
+ };
+ uint8_t expected_okm[] = {
+ 0x8d, 0xa4, 0xe7, 0x75, 0xa5, 0x63, 0xc1, 0x8f, 0x71, 0x5f, 0x80, 0x2a,
0x06, 0x3c, 0x5a, 0x31, 0xb8, 0xa1, 0x1f, 0x5c, 0x5e,
+ 0xe1, 0x87, 0x9e, 0xc3, 0x45, 0x4e, 0x5f, 0x3c, 0x73, 0x8d, 0x2d, 0x9d,
0x20, 0x13, 0x95, 0xfa, 0xa4, 0xb6, 0x1a, 0x96, 0xc8,
+ };
+
+ uint8_t prk[256] = {0};
+ size_t prk_len = sizeof(prk);
+ uint8_t okm[256] = {0};
+ size_t okm_len = sizeof(okm);
+
+ HKDF hkdf(EVP_sha256());
+
+ // Extract
+ CHECK(hkdf.extract(prk, &prk_len, salt, sizeof(salt), ikm, sizeof(ikm)) ==
1);
+ CHECK(prk_len == sizeof(expected_prk));
+ CHECK(memcmp(prk, expected_prk, sizeof(expected_prk)) == 0);
+
+ // Expand
+ CHECK(hkdf.expand(okm, &okm_len, prk, prk_len, info, sizeof(info), length)
== 1);
+ CHECK(okm_len == sizeof(expected_okm));
+ CHECK(memcmp(okm, expected_okm, sizeof(expected_okm)) == 0);
+ }
+
+ SECTION("Basic test case with SHA-1")
+ {
+ uint8_t ikm[] = {
+ 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+ };
+ uint8_t salt[] = {
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,
0x0c,
+ };
+ uint8_t info[] = {
+ 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9,
+ };
+ uint16_t length = 42;
+ uint8_t expected_prk[] = {
+ 0x9b, 0x6c, 0x18, 0xc4, 0x32, 0xa7, 0xbf, 0x8f, 0x0e, 0x71, 0xc8, 0xeb,
0x88, 0xf4, 0xb3, 0x0b, 0xaa, 0x2b, 0xa2, 0x43,
+ };
+ uint8_t expected_okm[] = {
+ 0x08, 0x5a, 0x01, 0xea, 0x1b, 0x10, 0xf3, 0x69, 0x33, 0x06, 0x8b, 0x56,
0xef, 0xa5, 0xad, 0x81, 0xa4, 0xf1, 0x4b, 0x82, 0x2f,
+ 0x5b, 0x09, 0x15, 0x68, 0xa9, 0xcd, 0xd4, 0xf1, 0x55, 0xfd, 0xa2, 0xc2,
0x2e, 0x42, 0x24, 0x78, 0xd3, 0x05, 0xf3, 0xf8, 0x96,
+ };
+
+ uint8_t prk[256] = {0};
+ size_t prk_len = sizeof(prk);
+ uint8_t okm[256] = {0};
+ size_t okm_len = sizeof(okm);
+
+ HKDF hkdf(EVP_sha1());
+
+ // Extract
+ CHECK(hkdf.extract(prk, &prk_len, salt, sizeof(salt), ikm, sizeof(ikm)) ==
1);
+ CHECK(prk_len == sizeof(expected_prk));
+ CHECK(memcmp(prk, expected_prk, sizeof(expected_prk)) == 0);
+
+ // Expand
+ CHECK(hkdf.expand(okm, &okm_len, prk, prk_len, info, sizeof(info), length)
== 1);
+ CHECK(okm_len == sizeof(expected_okm));
+ CHECK(memcmp(okm, expected_okm, sizeof(expected_okm)) == 0);
+ }
+
+ SECTION("Test with SHA-1 and longer inputs/outputs")
+ {
+ uint8_t ikm[] = {
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,
0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13,
+ 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33,
0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b,
+ 0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+ };
+ uint8_t salt[] = {
+ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b,
0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73,
+ 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+ 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93,
0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b,
+ 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
+ };
+ uint8_t info[] = {
+ 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb,
0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3,
+ 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
+ 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3,
0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb,
+ 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
+ };
+ uint16_t length = 82;
+ uint8_t expected_prk[] = {0x8a, 0xda, 0xe0, 0x9a, 0x2a, 0x30, 0x70, 0x59,
0x47, 0x8d,
+ 0x30, 0x9b, 0x26, 0xc4, 0x11, 0x5a, 0x22, 0x4c,
0xfa, 0xf6};
+ uint8_t expected_okm[] = {
+ 0x0b, 0xd7, 0x70, 0xa7, 0x4d, 0x11, 0x60, 0xf7, 0xc9, 0xf1, 0x2c, 0xd5,
0x91, 0x2a, 0x06, 0xeb, 0xff, 0x6a, 0xdc, 0xae, 0x89,
+ 0x9d, 0x92, 0x19, 0x1f, 0xe4, 0x30, 0x56, 0x73, 0xba, 0x2f, 0xfe, 0x8f,
0xa3, 0xf1, 0xa4, 0xe5, 0xad, 0x79, 0xf3, 0xf3, 0x34,
+ 0xb3, 0xb2, 0x02, 0xb2, 0x17, 0x3c, 0x48, 0x6e, 0xa3, 0x7c, 0xe3, 0xd3,
0x97, 0xed, 0x03, 0x4c, 0x7f, 0x9d, 0xfe, 0xb1, 0x5c,
+ 0x5e, 0x92, 0x73, 0x36, 0xd0, 0x44, 0x1f, 0x4c, 0x43, 0x00, 0xe2, 0xcf,
0xf0, 0xd0, 0x90, 0x0b, 0x52, 0xd3, 0xb4,
+ };
+
+ uint8_t prk[256] = {0};
+ size_t prk_len = sizeof(prk);
+ uint8_t okm[256] = {0};
+ size_t okm_len = sizeof(okm);
+
+ HKDF hkdf(EVP_sha1());
+
+ // Extract
+ CHECK(hkdf.extract(prk, &prk_len, salt, sizeof(salt), ikm, sizeof(ikm)) ==
1);
+ CHECK(prk_len == sizeof(expected_prk));
+ CHECK(memcmp(prk, expected_prk, sizeof(expected_prk)) == 0);
+
+ // Expand
+ CHECK(hkdf.expand(okm, &okm_len, prk, prk_len, info, sizeof(info), length)
== 1);
+ CHECK(okm_len == sizeof(expected_okm));
+ CHECK(memcmp(okm, expected_okm, sizeof(expected_okm)) == 0);
+ }
+
+ SECTION("Test with SHA-1 and zero-length salt/info")
+ {
+ uint8_t ikm[] = {
+ 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+ 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+ };
+ uint8_t salt[] = {};
+ uint8_t info[] = {};
+ uint16_t length = 42;
+ uint8_t expected_prk[] = {
+ 0xda, 0x8c, 0x8a, 0x73, 0xc7, 0xfa, 0x77, 0x28, 0x8e, 0xc6, 0xf5, 0xe7,
0xc2, 0x97, 0x78, 0x6a, 0xa0, 0xd3, 0x2d, 0x01,
+ };
+ uint8_t expected_okm[] = {
+ 0x0a, 0xc1, 0xaf, 0x70, 0x02, 0xb3, 0xd7, 0x61, 0xd1, 0xe5, 0x52, 0x98,
0xda, 0x9d, 0x05, 0x06, 0xb9, 0xae, 0x52, 0x05, 0x72,
+ 0x20, 0xa3, 0x06, 0xe0, 0x7b, 0x6b, 0x87, 0xe8, 0xdf, 0x21, 0xd0, 0xea,
0x00, 0x03, 0x3d, 0xe0, 0x39, 0x84, 0xd3, 0x49, 0x18,
+ };
+
+ uint8_t prk[256] = {0};
+ size_t prk_len = sizeof(prk);
+ uint8_t okm[256] = {0};
+ size_t okm_len = sizeof(okm);
+
+ HKDF hkdf(EVP_sha1());
+
+ // Extract
+ CHECK(hkdf.extract(prk, &prk_len, salt, sizeof(salt), ikm, sizeof(ikm)) ==
1);
+ CHECK(prk_len == sizeof(expected_prk));
+ CHECK(memcmp(prk, expected_prk, sizeof(expected_prk)) == 0);
+
+ // Expand
+ CHECK(hkdf.expand(okm, &okm_len, prk, prk_len, info, sizeof(info), length)
== 1);
+ CHECK(okm_len == sizeof(expected_okm));
+ CHECK(memcmp(okm, expected_okm, sizeof(expected_okm)) == 0);
+ }
+
+ SECTION("Test with SHA-1, salt not provided (defaults to HashLen zero
octets)")
+ {
+ uint8_t ikm[] = {
+ 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+ 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+ };
+ uint8_t salt[] = {};
+ uint8_t info[] = {};
+ uint16_t length = 42;
+ uint8_t expected_prk[] = {
+ 0x2a, 0xdc, 0xca, 0xda, 0x18, 0x77, 0x9e, 0x7c, 0x20, 0x77, 0xad, 0x2e,
0xb1, 0x9d, 0x3f, 0x3e, 0x73, 0x13, 0x85, 0xdd,
+ };
+ uint8_t expected_okm[] = {
+ 0x2c, 0x91, 0x11, 0x72, 0x04, 0xd7, 0x45, 0xf3, 0x50, 0x0d, 0x63, 0x6a,
0x62, 0xf6, 0x4f, 0x0a, 0xb3, 0xba, 0xe5, 0x48, 0xaa,
+ 0x53, 0xd4, 0x23, 0xb0, 0xd1, 0xf2, 0x7e, 0xbb, 0xa6, 0xf5, 0xe5, 0x67,
0x3a, 0x08, 0x1d, 0x70, 0xcc, 0xe7, 0xac, 0xfc, 0x48,
+ };
+
+ uint8_t prk[256] = {0};
+ size_t prk_len = sizeof(prk);
+ uint8_t okm[256] = {0};
+ size_t okm_len = sizeof(okm);
+
+ HKDF hkdf(EVP_sha1());
+
+ // Extract
+ CHECK(hkdf.extract(prk, &prk_len, salt, sizeof(salt), ikm, sizeof(ikm)) ==
1);
+ CHECK(prk_len == sizeof(expected_prk));
+ CHECK(memcmp(prk, expected_prk, sizeof(expected_prk)) == 0);
+
+ // Expand
+ CHECK(hkdf.expand(okm, &okm_len, prk, prk_len, info, sizeof(info), length)
== 1);
+ CHECK(okm_len == sizeof(expected_okm));
+ CHECK(memcmp(okm, expected_okm, sizeof(expected_okm)) == 0);
+ }
+}
--
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <commits@trafficserver.apache.org>'].
