Bug 1666567 - land NSS NSS_3_58_BETA1 UPGRADE_NSS_RELEASE, r=kjacobs

2020-10-12 Daiki Ueno <dueno@redhat.com> * gtests/ssl_gtest/ssl_tls13compat_unittest.cc, lib/ssl/ssl3con.c, lib/ssl/sslimpl.h: Bug 1641480, TLS 1.3: tighten CCS handling in compatibility mode, r=mt This makes the server reject CCS when the client doesn't indicate the use of the middlebox compatibility mode with a non-empty ClientHello.legacy_session_id, or it sends multiple CCS in a row. [57bbefa79323] [NSS_3_58_BETA1] 2020-10-12 Kevin Jacobs <kjacobs@mozilla.com> * automation/abi-check/expected-report-libnss3.so.txt, automation/taskcluster/scripts/build_gyp.sh, automation/taskcluster/windows/build_gyp.sh, coreconf/config.gypi, coreconf/config.mk, cpputil/nss_scoped_ptrs.h, gtests/common/testvectors/hpke-vectors.h, gtests/pk11_gtest/manifest.mn, gtests/pk11_gtest/pk11_gtest.gyp, gtests/pk11_gtest/pk11_hpke_unittest.cc, lib/nss/nss.def, lib/pk11wrap/exports.gyp, lib/pk11wrap/manifest.mn, lib/pk11wrap/pk11hpke.c, lib/pk11wrap/pk11hpke.h, lib/pk11wrap/pk11pub.h, lib/pk11wrap/pk11wrap.gyp, lib/util/SECerrs.h, lib/util/secerr.h: Bug 1631890 - Add support for Hybrid Public Key Encryption (draft- irtf-cfrg-hpke-05). r=mt This patch adds support for Hybrid Public Key Encryption (draft- irtf-cfrg-hpke-05). Because the draft number (and the eventual RFC number) is an input to the key schedule, future updates will *not* be backwards compatible in terms of key material or encryption/decryption. For this reason, a default compilation will produce stubs that simply return an "Invalid Algorithm" error. To opt into using the HPKE functionality , compile with `NSS_ENABLE_DRAFT_HPKE` defined. Once finalized, this flag will not be required to access the functions. Lastly, the `DeriveKeyPair` API is not implemented as it adds complextiy around PKCS #11 and is unnecessary for ECH. [6e3bc17f0508] 2020-10-12 Makoto Kato <m_kato@ga2.so-net.ne.jp> * automation/taskcluster/graph/src/extend.js, tests/common/cleanup.sh: Bug 1657255 - Update CI for aarch64. r=kjacobs Actually, we have the implementation of ARM Crypto extension, so CI is always run with this extension. It means that we don't run CI without ARM Crypto extension. So I would like to add NoAES and NoSHA for aarch64 CI. Also, we still run NoSSE4_1 on aarch64 CI, so we shouldn't run this on aarch64 hardware. [e8c370a8db13] Differential Revision: https://phabricator.services.mozilla.com/D93268
mozilla · Oct 12, 2020 · 8e222a7 · 8e222a7
1 parent 68c683b
commit 8e222a7
Show file tree

Hide file tree

Showing 26 changed files with 2,151 additions and 11 deletions.
diff --git a/security/nss/TAG-INFO b/security/nss/TAG-INFO
@@ -1 +1 @@
-c7d3b214dd41
+NSS_3_58_BETA1
diff --git a/security/nss/automation/abi-check/expected-report-libnss3.so.txt b/security/nss/automation/abi-check/expected-report-libnss3.so.txt
@@ -1,4 +1,15 @@
 
-1 Added function:
+12 Added functions:
 
+  [A] 'function SECStatus PK11_HPKE_Deserialize(const HpkeContext*, const PRUint8*, unsigned int, SECKEYPublicKey**)'    {PK11_HPKE_Deserialize@@NSS_3.58}
+  [A] 'function void PK11_HPKE_DestroyContext(HpkeContext*, PRBool)'    {PK11_HPKE_DestroyContext@@NSS_3.58}
+  [A] 'function SECStatus PK11_HPKE_ExportSecret(const HpkeContext*, const SECItem*, unsigned int, PK11SymKey**)'    {PK11_HPKE_ExportSecret@@NSS_3.58}
+  [A] 'function const SECItem* PK11_HPKE_GetEncapPubKey(const HpkeContext*)'    {PK11_HPKE_GetEncapPubKey@@NSS_3.58}
+  [A] 'function HpkeContext* PK11_HPKE_NewContext(HpkeKemId, HpkeKdfId, HpkeAeadId, PK11SymKey*, const SECItem*)'    {PK11_HPKE_NewContext@@NSS_3.58}
+  [A] 'function SECStatus PK11_HPKE_Open(HpkeContext*, const SECItem*, const SECItem*, SECItem**)'    {PK11_HPKE_Open@@NSS_3.58}
+  [A] 'function SECStatus PK11_HPKE_Seal(HpkeContext*, const SECItem*, const SECItem*, SECItem**)'    {PK11_HPKE_Seal@@NSS_3.58}
+  [A] 'function SECStatus PK11_HPKE_Serialize(const SECKEYPublicKey*, PRUint8*, unsigned int*, unsigned int)'    {PK11_HPKE_Serialize@@NSS_3.58}
+  [A] 'function SECStatus PK11_HPKE_SetupR(HpkeContext*, const SECKEYPublicKey*, SECKEYPrivateKey*, const SECItem*, const SECItem*)'    {PK11_HPKE_SetupR@@NSS_3.58}
+  [A] 'function SECStatus PK11_HPKE_SetupS(HpkeContext*, const SECKEYPublicKey*, SECKEYPrivateKey*, SECKEYPublicKey*, const SECItem*)'    {PK11_HPKE_SetupS@@NSS_3.58}
+  [A] 'function SECStatus PK11_HPKE_ValidateParameters(HpkeKemId, HpkeKdfId, HpkeAeadId)'    {PK11_HPKE_ValidateParameters@@NSS_3.58}
   [A] 'function PK11SymKey* PK11_ImportDataKey(PK11SlotInfo*, CK_MECHANISM_TYPE, PK11Origin, CK_ATTRIBUTE_TYPE, SECItem*, void*)'    {PK11_ImportDataKey@@NSS_3.58}
diff --git a/security/nss/automation/taskcluster/graph/src/extend.js b/security/nss/automation/taskcluster/graph/src/extend.js
@@ -100,11 +100,18 @@ queue.filter(task => {
 
   // Don't run all additional hardware tests on ARM.
   if (task.group == "Cipher" && task.platform == "aarch64" && task.env &&
-      (task.env.NSS_DISABLE_PCLMUL == "1" || task.env.NSS_DISABLE_HW_AES == "1"
+      (task.env.NSS_DISABLE_PCLMUL == "1" || task.env.NSS_DISABLE_SSE4_1 == "1"
        || task.env.NSS_DISABLE_AVX == "1" || task.env.NSS_DISABLE_AVX2 == "1")) {
     return false;
   }
 
+  // Don't run ARM specific hardware tests on non-ARM.
+  // TODO: our server that runs task cluster doesn't support Intel SHA extensions.
+  if (task.group == "Cipher" && task.platform != "aarch64" && task.env &&
+      (task.env.NSS_DISABLE_HW_SHA1 == "1" || task.env.NSS_DISABLE_HW_SHA2 == "1")) {
+    return false;
+  }
+
   // Don't run DBM builds on aarch64.
   if (task.group == "DBM" && task.platform == "aarch64") {
     return false;
@@ -1003,9 +1010,16 @@ function scheduleTests(task_build, task_cert, test_base) {
     name: "Cipher tests", symbol: "Default", tests: "cipher", group: "Cipher"
   }));
   queue.scheduleTask(merge(cert_base_long, {
-    name: "Cipher tests", symbol: "NoAESNI", tests: "cipher",
+    name: "Cipher tests", symbol: "NoAES", tests: "cipher",
     env: {NSS_DISABLE_HW_AES: "1"}, group: "Cipher"
   }));
+  queue.scheduleTask(merge(cert_base_long, {
+    name: "Cipher tests", symbol: "NoSHA", tests: "cipher",
+    env: {
+      NSS_DISABLE_HW_SHA1: "1",
+      NSS_DISABLE_HW_SHA2: "1"
+    }, group: "Cipher"
+  }));
   queue.scheduleTask(merge(cert_base_long, {
     name: "Cipher tests", symbol: "NoPCLMUL", tests: "cipher",
     env: {NSS_DISABLE_PCLMUL: "1"}, group: "Cipher"

diff --git a/security/nss/automation/taskcluster/scripts/build_gyp.sh b/security/nss/automation/taskcluster/scripts/build_gyp.sh
@@ -12,7 +12,7 @@ if [[ -f nss/nspr.patch && "$ALLOW_NSPR_PATCH" == "1" ]]; then
 fi
 
 # Build.
-nss/build.sh -g -v --enable-libpkix "$@"
+nss/build.sh -g -v --enable-libpkix -Denable_draft_hpke=1 "$@"
 
 # Package.
 if [[ $(uname) = "Darwin" ]]; then

diff --git a/security/nss/automation/taskcluster/windows/build_gyp.sh b/security/nss/automation/taskcluster/windows/build_gyp.sh
@@ -38,7 +38,7 @@ if [[ -f nss/nspr.patch && "$ALLOW_NSPR_PATCH" == "1" ]]; then
 fi
 
 # Build with gyp.
-./nss/build.sh -g -v --enable-libpkix "$@"
+./nss/build.sh -g -v --enable-libpkix -Denable_draft_hpke=1 "$@"
 
 # Package.
 7z a public/build/dist.7z dist
diff --git a/security/nss/coreconf/config.gypi b/security/nss/coreconf/config.gypi
@@ -132,6 +132,7 @@
     'mozpkix_only%': 0,
     'coverage%': 0,
     'softfp_cflags%': '',
+    'enable_draft_hpke%': 0,
   },
   'target_defaults': {
     # Settings specific to targets should go here.
@@ -568,6 +569,11 @@
               'NSS_DISABLE_DBM',
             ],
           }],
+          [ 'enable_draft_hpke==1', {
+            'defines': [
+              'NSS_ENABLE_DRAFT_HPKE',
+            ],
+          }],
           [ 'disable_libpkix==1', {
             'defines': [
               'NSS_DISABLE_LIBPKIX',

diff --git a/security/nss/coreconf/config.mk b/security/nss/coreconf/config.mk
@@ -195,6 +195,10 @@ ifdef NSS_PKIX_NO_LDAP
 DEFINES += -DNSS_PKIX_NO_LDAP
 endif
 
+ifdef NSS_ENABLE_DRAFT_HPKE
+DEFINES += -DNSS_ENABLE_DRAFT_HPKE
+endif
+
 # FIPS support requires startup tests to be executed at load time of shared modules.
 # For performance reasons, these tests are disabled by default.
 # When compiling binaries that must support FIPS mode,

diff --git a/security/nss/coreconf/coreconf.dep b/security/nss/coreconf/coreconf.dep
@@ -10,3 +10,4 @@
  */
 
 #error "Do not include this header file."
+
diff --git a/security/nss/cpputil/nss_scoped_ptrs.h b/security/nss/cpputil/nss_scoped_ptrs.h
@@ -11,6 +11,7 @@
 #include "cert.h"
 #include "keyhi.h"
 #include "p12.h"
+#include "pk11hpke.h"
 #include "pk11pqg.h"
 #include "pk11pub.h"
 #include "pkcs11uri.h"
@@ -27,6 +28,9 @@ struct ScopedDelete {
   void operator()(CERTSubjectPublicKeyInfo* spki) {
     SECKEY_DestroySubjectPublicKeyInfo(spki);
   }
+  void operator()(HpkeContext* context) {
+    PK11_HPKE_DestroyContext(context, true);
+  }
   void operator()(PK11Context* context) { PK11_DestroyContext(context, true); }
   void operator()(PK11GenericObject* obj) { PK11_DestroyGenericObject(obj); }
   void operator()(PK11SlotInfo* slot) { PK11_FreeSlot(slot); }
@@ -70,6 +74,7 @@ SCOPED(CERTCertificateList);
 SCOPED(CERTDistNames);
 SCOPED(CERTName);
 SCOPED(CERTSubjectPublicKeyInfo);
+SCOPED(HpkeContext);
 SCOPED(PK11Context);
 SCOPED(PK11GenericObject);
 SCOPED(PK11SlotInfo);

diff --git a/security/nss/gtests/common/testvectors/hpke-vectors.h b/security/nss/gtests/common/testvectors/hpke-vectors.h
@@ -0,0 +1,233 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef hpke_vectors_h__
+#define hpke_vectors_h__
+
+#include "pk11hpke.h"
+#include <vector>
+
+typedef struct hpke_encrypt_vector_str {
+  std::string pt;
+  std::string aad;
+  std::string ct;
+} hpke_encrypt_vector;
+
+typedef struct hpke_export_vector_str {
+  std::string ctxt;
+  size_t len;
+  std::string exported;
+} hpke_export_vector;
+
+/* Note: The following test vec values are implicitly checked via:
+ * shared_secret: secret derivation
+ * key_sched_context: key/nonce derivations
+ * secret: key/nonce derivations
+ * exporter_secret: export vectors */
+typedef struct hpke_vector_str {
+  uint32_t test_id;
+  HpkeModeId mode;
+  HpkeKemId kem_id;
+  HpkeKdfId kdf_id;
+  HpkeAeadId aead_id;
+  std::string info;
+  std::string pkcs8_e;
+  std::string pkcs8_r;
+  std::string psk;
+  std::string psk_id;
+  std::string enc;
+  std::string key;
+  std::string nonce;
+  std::vector<hpke_encrypt_vector> encrypt_vecs;
+  std::vector<hpke_export_vector> export_vecs;
+} hpke_vector;
+
+const hpke_vector kHpkeTestVectors[] = {
+    // A.1. DHKEM(X25519, HKDF-SHA256), HKDF-SHA256, AES-128-GCM, Base mode
+    {0,
+     static_cast<HpkeModeId>(0),
+     static_cast<HpkeKemId>(32),
+     static_cast<HpkeKdfId>(1),
+     static_cast<HpkeAeadId>(1),
+     "4f6465206f6e2061204772656369616e2055726e",
+     "3067020100301406072a8648ce3d020106092b06010401da470f01044c304a"
+     "02010104208c490e5b0c7dbe0c6d2192484d2b7a0423b3b4544f2481095a9"
+     "9dbf238fb350fa1230321008a07563949fac6232936ed6f36c4fa735930ecd"
+     "eaef6734e314aeac35a56fd0a",
+     "3067020100301406072a8648ce3d020106092b06010401da470f01044c304a"
+     "02010104205a8aa0d2476b28521588e0c704b14db82cdd4970d340d293a957"
+     "6deaee9ec1c7a1230321008756e2580c07c1d2ffcb662f5fadc6d6ff13da85"
+     "abd7adfecf984aaa102c1269",
+     "",
+     "",
+     "8a07563949fac6232936ed6f36c4fa735930ecdeaef6734e314aeac35a56fd0a",
+     "550ee0b7ec1ea2532f2e2bac87040a4c",
+     "2b855847756795a57229559a",
+     {// Encryptions
+      {"4265617574792069732074727574682c20747275746820626561757479",
+       "436f756e742d30",
+       "971ba65db526758ea30ae748cd769bc8d90579b62a037816057f24ce4274"
+       "16bd47c05ed1c2446ac8e19ec9ae79"},
+      {"4265617574792069732074727574682c20747275746820626561757479",
+       "436f756e742d31",
+       "f18f1ec397667ca069b9a6ee0bebf0890cd5caa34bb9875b3600ca0142cb"
+       "a774dd35f2aafd79a02a08ca5f2806"},
+      {"4265617574792069732074727574682c20747275746820626561757479",
+       "436f756e742d32",
+       "51a8dea350fe6e753f743ec17c956de4cbdfa35f3018fc6a12752c51d137"
+       "2c5093959f18c7253da9c953c6cfbe"}},
+     {// Exports
+      {"436f6e746578742d30", 32,
+       "0df04ac640d34a56561419bab20a68e6b7331070208004f89c7b973f4c47"
+       "2e92"},
+      {"436f6e746578742d31", 32,
+       "723c2c8f80e6b827e72bd8e80973a801a05514afe3d4bc46e82e505dceb9"
+       "53aa"},
+      {"436f6e746578742d32", 32,
+       "38010c7d5d81093a11b55e2403a258e9a195bcf066817b332dd996b0a9bc"
+       "bc9a"},
+      {"436f6e746578742d33", 32,
+       "ebf6ab4c3186131de9b2c3c0bc3e2ad21dfcbc4efaf050cd0473f5b1535a"
+       "8b6d"},
+      {"436f6e746578742d34", 32,
+       "c4823eeb3efd2d5216b2d3b16e542bf57470dc9b9ea9af6bce85b151a358"
+       "9d90"}}},
+
+    // A.1. DHKEM(X25519, HKDF-SHA256), HKDF-SHA256, AES-128-GCM, PSK mode
+    {1,
+     static_cast<HpkeModeId>(1),
+     static_cast<HpkeKemId>(32),
+     static_cast<HpkeKdfId>(1),
+     static_cast<HpkeAeadId>(1),
+     "4f6465206f6e2061204772656369616e2055726e",
+     "3067020100301406072a8648ce3d020106092b06010401da470f01044c304a020"
+     "1010420e7d2b539792a48a24451303ccd0cfe77176b6cb06823c439edfd217458"
+     "a1398aa12303210008d39d3e7f9b586341b6004dafba9679d2bd9340066edb247"
+     "e3e919013efcd0f",
+     "3067020100301406072a8648ce3d020106092b06010401da470f01044c304a020"
+     "10104204b41ef269169090551fcea177ecdf622bca86d82298e21cd93119b804c"
+     "cc5eaba123032100a5c85773bed3a831e7096f7df4ff5d1d8bac48fc97bfac366"
+     "141efab91892a3a",
+     "5db3b80a81cb63ca59470c83414ef70a",
+     "456e6e796e20447572696e206172616e204d6f726961",
+     "08d39d3e7f9b586341b6004dafba9679d2bd9340066edb247e3e919013efcd0f",
+     "811e9b2d7a10f4f9d58786bf8a534ca6",
+     "b79b0c5a8c3808e238b10411",
+     {// Encryptions
+      {"4265617574792069732074727574682c20747275746820626561757479",
+       "436f756e742d30",
+       "fb68f911b4e4033d1547f646ea30c9cee987fb4b4a8c30918e5de6e96de32fc"
+       "63466f2fc05e09aeff552489741"},
+      {"4265617574792069732074727574682c20747275746820626561757479",
+       "436f756e742d31",
+       "85e7472fbb7e2341af35fb2a0795df9a85caa99a8f584056b11d452bc160470"
+       "672e297f9892ce2c5020e794ae1"},
+      {"4265617574792069732074727574682c20747275746820626561757479",
+       "436f756e742d32",
+       "74229b7491102bcf94cf7633888bc48baa4e5a73cc544bfad4ff61585506fac"
+       "b44b359ade03c0b2b35c6430e4c"}},
+     {// Exports
+      {"436f6e746578742d30", 32,
+       "bd292b132fae00243851451c3f3a87e9e11c3293c14d61b114b7e12e07245ffd"},
+      {"436f6e746578742d31", 32,
+       "695de26bc9336caee01cb04826f6e224f4d2108066ab17fc18f0c993dce05f24"},
+      {"436f6e746578742d32", 32,
+       "c53f26ef1bf4f5fd5469d807c418a0e103d035c76ccdbc6afb5bc42b24968f6c"},
+      {"436f6e746578742d33", 32,
+       "8cea4a595dfe3de84644ca8ea7ea9401a345f0db29bb4beebc2c471afc602ec4"},
+      {"436f6e746578742d34", 32,
+       "e6313f12f6c2054c69018f273211c54fcf2439d90173392eaa34b4caac929068"}}},
+
+    // A.2. DHKEM(X25519, HKDF-SHA256), HKDF-SHA256, ChaCha20Poly1305, Base mode
+    {2,
+     static_cast<HpkeModeId>(0),
+     static_cast<HpkeKemId>(32),
+     static_cast<HpkeKdfId>(1),
+     static_cast<HpkeAeadId>(3),
+     "4f6465206f6e2061204772656369616e2055726e",
+     "3067020100301406072a8648ce3d020106092b06010401da470f01044c304a020"
+     "10104205006a9a0f0138b9b5d577ed4a67c4f795aee8fc146ac63d7a4167765be"
+     "3ad7dca123032100716281787b035b2fee90455d951fa70b3db6cc92f13bedfd7"
+     "58c3487994b7020",
+     "3067020100301406072a8648ce3d020106092b06010401da470f01044c304a020"
+     "101042062139576dcbf9878ccd56262d1b28dbea897821c03370d81971513cc74"
+     "aea3ffa1230321001ae26f65041b36ad69eb392c198bfd33df1c6ff17a910cb3e"
+     "49db7506b6a4e7f",
+     "",
+     "",
+     "716281787b035b2fee90455d951fa70b3db6cc92f13bedfd758c3487994b7020",
+     "1d5e71e2885ddadbcc479798cc65ea74d308f2a9e99c0cc7fe480adce66b5722",
+     "8354a7fcfef97d4bbef6d24e",
+     {// Encryptions
+      {"4265617574792069732074727574682c20747275746820626561757479",
+       "436f756e742d30",
+       "fa4632a400962c98143e58450e75d879365359afca81a5f5b5997c6555647ec"
+       "302045a80c57d3e2c2abe7e1ced"},
+      {"4265617574792069732074727574682c20747275746820626561757479",
+       "436f756e742d31",
+       "8313fcbf760714f5a93b6864820e48dcec3ddd476ad4408ff1c1a1f7bfb8cb8"
+       "699fada4a9e59bf8086eb1c0635"},
+      {"4265617574792069732074727574682c20747275746820626561757479",
+       "436f756e742d32",
+       "020f2856d95b85e1def9549bf327c484d327616f1e213045f117be4c287571a"
+       "b983958f74766cbc6f8197c8d8d"}},
+     {// Exports
+      {"436f6e746578742d30", 32,
+       "22bbe971392c685b55e13544cdaf976f36b89dc1dbe1296c2884971a5aa9e331"},
+      {"436f6e746578742d31", 32,
+       "5c0fa72053a2622d8999b726446db9ef743e725e2cb040afac2d83eae0d41981"},
+      {"436f6e746578742d32", 32,
+       "72b0f9999fd37ac2b948a07dadd01132587501a5a9460d596c1f7383299a2442"},
+      {"436f6e746578742d33", 32,
+       "73d2308ed5bdd63aacd236effa0db2d3a30742b6293a924d95a372e76d90486b"},
+      {"436f6e746578742d34", 32,
+       "d4f8878dbc471935e86cdee08746e53837bbb4b6013003bebb0bc1cc3e074085"}}},
+
+    // A.2. DHKEM(X25519, HKDF-SHA256), HKDF-SHA256, ChaCha20Poly1305, PSK mode
+    {3,
+     static_cast<HpkeModeId>(1),
+     static_cast<HpkeKemId>(32),
+     static_cast<HpkeKdfId>(1),
+     static_cast<HpkeAeadId>(3),
+     "4f6465206f6e2061204772656369616e2055726e",
+     "3067020100301406072a8648ce3d020106092b06010401da470f01044c304a020"
+     "10104204bfdb62b95ae2a1f29f20ea49e24aa2673e0d240c6e967f668f55ed5de"
+     "e996dca123032100f4639297e3305b03d34dd5d86522ddc6ba11a608a0003670a"
+     "30734823cdd3763",
+     "3067020100301406072a8648ce3d020106092b06010401da470f01044c304a020"
+     "1010420a6ab4e1bb782d580d837843089d65ebe271a0ee9b5a951777cecf1293c"
+     "58c150a123032100c49b46ed73ecb7d3a6a3e44f54b8f00f9ab872b57dd79ded6"
+     "6d7231a14c64144",
+     "5db3b80a81cb63ca59470c83414ef70a",
+     "456e6e796e20447572696e206172616e204d6f726961",
+     "f4639297e3305b03d34dd5d86522ddc6ba11a608a0003670a30734823cdd3763",
+     "396c06a52b39d0930594aa2c6944561cc1741f638557a12bef1c1cad349157c9",
+     "baa4ecf96b5d6d536d0d7210",
+     {// Encryptions
+      {"4265617574792069732074727574682c20747275746820626561757479",
+       "436f756e742d30",
+       "f97ca72675b8199e8ffec65b4c200d901110b177b246f241b6f9716fb60b35b"
+       "32a6d452675534b591e8141468a"},
+      {"4265617574792069732074727574682c20747275746820626561757479",
+       "436f756e742d31",
+       "57796e2b9dd0ddf807f1a7cb5884dfc50e61468c4fd69fa03963731e51674ca"
+       "88fee94eeac3290734e1627ded6"},
+      {"4265617574792069732074727574682c20747275746820626561757479",
+       "436f756e742d32",
+       "b514150af1057151687d0036a9b4a3ad50fb186253f839d8433622baa85719e"
+       "d5d2532017a0ce7b9ca0007f276"}},
+     {// Exports
+      {"436f6e746578742d30", 32,
+       "735400cd9b9193daffe840f412074728ade6b1978e9ae27957aacd588dbd7c9e"},
+      {"436f6e746578742d31", 32,
+       "cf4e351e1943d171ff2d88726f18160086ecbec52a8151dba8cf5ba0737a6097"},
+      {"436f6e746578742d32", 32,
+       "8e23b44d4f23dd906d1c100580a670d171132c9786212c4ca2876a1541a84fae"},
+      {"436f6e746578742d33", 32,
+       "56252a940ece53d4013eb619b444ee1d019a08eec427ded2b6dbf24be624a4a0"},
+      {"436f6e746578742d34", 32,
+       "fc6cdca9ce8ab062401478ffd16ee1c07e2b15d7c781d4227f07c6043d937fad"}}}};
+
+#endif  // hpke_vectors_h__
diff --git a/security/nss/gtests/pk11_gtest/manifest.mn b/security/nss/gtests/pk11_gtest/manifest.mn
@@ -21,6 +21,7 @@ CPPSRCS = \
       pk11_encrypt_derive_unittest.cc \
       pk11_export_unittest.cc \
       pk11_find_certs_unittest.cc \
+      pk11_hpke_unittest.cc \
       pk11_hkdf_unittest.cc \
       pk11_import_unittest.cc \
       pk11_kbkdf.cc \

diff --git a/security/nss/gtests/pk11_gtest/pk11_gtest.gyp b/security/nss/gtests/pk11_gtest/pk11_gtest.gyp
@@ -27,6 +27,7 @@
         'pk11_encrypt_derive_unittest.cc',
         'pk11_find_certs_unittest.cc',
         'pk11_hkdf_unittest.cc',
+        'pk11_hpke_unittest.cc',
         'pk11_import_unittest.cc',
         'pk11_kbkdf.cc',
         'pk11_keygen.cc',
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,4 @@
		*/

		#error "Do not include this header file."