|
 |
5f1c2b |
diff -up nss/gtests/pk11_gtest/pk11_export_unittest.cc.disable_unsupported_gtests nss/gtests/pk11_gtest/pk11_export_unittest.cc
|
|
|
5f1c2b |
--- nss/gtests/pk11_gtest/pk11_export_unittest.cc.disable_unsupported_gtests 2017-01-30 02:06:08.000000000 +0100
|
|
|
5f1c2b |
+++ nss/gtests/pk11_gtest/pk11_export_unittest.cc 2017-02-17 12:02:00.023957459 +0100
|
|
|
5f1c2b |
@@ -61,6 +61,4 @@ class Pkcs11ExportTest : public ::testin
|
|
|
5f1c2b |
|
|
|
5f1c2b |
TEST_F(Pkcs11ExportTest, DeriveNonExport) { Derive(false); }
|
|
|
5f1c2b |
|
|
|
5f1c2b |
-TEST_F(Pkcs11ExportTest, DeriveExport) { Derive(true); }
|
|
|
5f1c2b |
-
|
|
|
5f1c2b |
} // namespace nss_test
|
|
|
5f1c2b |
diff -up nss/gtests/pk11_gtest/pk11_pbkdf2_unittest.cc.disable_unsupported_gtests nss/gtests/pk11_gtest/pk11_pbkdf2_unittest.cc
|
|
|
5f1c2b |
--- nss/gtests/pk11_gtest/pk11_pbkdf2_unittest.cc.disable_unsupported_gtests 2017-02-17 12:09:06.448036028 +0100
|
|
|
5f1c2b |
+++ nss/gtests/pk11_gtest/pk11_pbkdf2_unittest.cc 2017-02-17 12:10:03.479842833 +0100
|
|
|
5f1c2b |
@@ -72,25 +72,4 @@ class Pkcs11Pbkdf2Test : public ::testin
|
|
|
5f1c2b |
}
|
|
|
5f1c2b |
};
|
|
|
5f1c2b |
|
|
|
5f1c2b |
-// RFC 6070 <http://tools.ietf.org/html/rfc6070>
|
|
|
5f1c2b |
-TEST_F(Pkcs11Pbkdf2Test, DeriveKnown1) {
|
|
|
5f1c2b |
- std::vector<uint8_t> derived = {0x3d, 0x2e, 0xec, 0x4f, 0xe4, 0x1c, 0x84,
|
|
|
5f1c2b |
- 0x9b, 0x80, 0xc8, 0xd8, 0x36, 0x62, 0xc0,
|
|
|
5f1c2b |
- 0xe4, 0x4a, 0x8b, 0x29, 0x1a, 0x96, 0x4c,
|
|
|
5f1c2b |
- 0xf2, 0xf0, 0x70, 0x38};
|
|
|
5f1c2b |
-
|
|
|
5f1c2b |
- Derive(derived, SEC_OID_HMAC_SHA1);
|
|
|
5f1c2b |
-}
|
|
|
5f1c2b |
-
|
|
|
5f1c2b |
-// https://stackoverflow.com/questions/5130513/pbkdf2-hmac-sha2-test-vectors
|
|
|
5f1c2b |
-TEST_F(Pkcs11Pbkdf2Test, DeriveKnown2) {
|
|
|
5f1c2b |
- std::vector<uint8_t> derived = {
|
|
|
5f1c2b |
- 0x34, 0x8c, 0x89, 0xdb, 0xcb, 0xd3, 0x2b, 0x2f, 0x32, 0xd8,
|
|
|
5f1c2b |
- 0x14, 0xb8, 0x11, 0x6e, 0x84, 0xcf, 0x2b, 0x17, 0x34, 0x7e,
|
|
|
5f1c2b |
- 0xbc, 0x18, 0x00, 0x18, 0x1c, 0x4e, 0x2a, 0x1f, 0xb8, 0xdd,
|
|
|
5f1c2b |
- 0x53, 0xe1, 0xc6, 0x35, 0x51, 0x8c, 0x7d, 0xac, 0x47, 0xe9};
|
|
|
5f1c2b |
-
|
|
|
5f1c2b |
- Derive(derived, SEC_OID_HMAC_SHA256);
|
|
|
5f1c2b |
-}
|
|
|
5f1c2b |
-
|
|
|
5f1c2b |
} // namespace nss_test
|