mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-28 11:27:32 +09:00
re-introduce old nss im too tired for this
This commit is contained in:
wuggy
parent
3c46be320d
commit
3a838106b9
2871 changed files with 1374431 additions and 1762417 deletions
|
|
@ -6,43 +6,19 @@
|
|||
#include "nss.h"
|
||||
#include "pk11pub.h"
|
||||
#include "sechash.h"
|
||||
#include "cryptohi.h"
|
||||
|
||||
#include "cpputil.h"
|
||||
#include "gtest/gtest.h"
|
||||
#include "json_reader.h"
|
||||
#include "nss_scoped_ptrs.h"
|
||||
#include "testvectors/curve25519-vectors.h"
|
||||
|
||||
#include "pk11_ecdsa_vectors.h"
|
||||
#include "pk11_signature_test.h"
|
||||
#include "pk11_keygen.h"
|
||||
|
||||
namespace nss_test {
|
||||
|
||||
CK_MECHANISM_TYPE
|
||||
EcHashToComboMech(SECOidTag hash) {
|
||||
switch (hash) {
|
||||
case SEC_OID_SHA1:
|
||||
return CKM_ECDSA_SHA1;
|
||||
case SEC_OID_SHA224:
|
||||
return CKM_ECDSA_SHA224;
|
||||
case SEC_OID_SHA256:
|
||||
return CKM_ECDSA_SHA256;
|
||||
case SEC_OID_SHA384:
|
||||
return CKM_ECDSA_SHA384;
|
||||
case SEC_OID_SHA512:
|
||||
return CKM_ECDSA_SHA512;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return CKM_INVALID_MECHANISM;
|
||||
}
|
||||
|
||||
class Pkcs11EcdsaTestBase : public Pk11SignatureTest {
|
||||
protected:
|
||||
Pkcs11EcdsaTestBase(SECOidTag hash_oid)
|
||||
: Pk11SignatureTest(CKM_ECDSA, hash_oid, EcHashToComboMech(hash_oid)) {}
|
||||
: Pk11SignatureTest(CKM_ECDSA, hash_oid) {}
|
||||
};
|
||||
|
||||
struct Pkcs11EcdsaTestParams {
|
||||
|
|
@ -63,10 +39,6 @@ TEST_P(Pkcs11EcdsaTest, SignAndVerify) {
|
|||
SignAndVerify(GetParam().sig_params_);
|
||||
}
|
||||
|
||||
TEST_P(Pkcs11EcdsaTest, ImportExport) {
|
||||
ImportExport(GetParam().sig_params_.pkcs8_);
|
||||
}
|
||||
|
||||
static const Pkcs11EcdsaTestParams kEcdsaVectors[] = {
|
||||
{SEC_OID_SHA256,
|
||||
{DataBuffer(kP256Pkcs8, sizeof(kP256Pkcs8)),
|
||||
|
|
@ -89,8 +61,8 @@ static const Pkcs11EcdsaTestParams kEcdsaVectors[] = {
|
|||
DataBuffer(kP521Data, sizeof(kP521Data)),
|
||||
DataBuffer(kP521Signature, sizeof(kP521Signature))}}};
|
||||
|
||||
INSTANTIATE_TEST_SUITE_P(EcdsaSignVerify, Pkcs11EcdsaTest,
|
||||
::testing::ValuesIn(kEcdsaVectors));
|
||||
INSTANTIATE_TEST_CASE_P(EcdsaSignVerify, Pkcs11EcdsaTest,
|
||||
::testing::ValuesIn(kEcdsaVectors));
|
||||
|
||||
class Pkcs11EcdsaSha256Test : public Pkcs11EcdsaTestBase {
|
||||
public:
|
||||
|
|
@ -112,8 +84,7 @@ TEST_F(Pkcs11EcdsaSha256Test, ImportOnlyAlgorithmParams) {
|
|||
sizeof(kP256Pkcs8OnlyAlgorithmParams));
|
||||
DataBuffer data(kP256Data, sizeof(kP256Data));
|
||||
DataBuffer sig;
|
||||
DataBuffer sig2;
|
||||
EXPECT_TRUE(ImportPrivateKeyAndSignHashedData(k, data, &sig, &sig2));
|
||||
EXPECT_TRUE(ImportPrivateKeyAndSignHashedData(k, data, &sig));
|
||||
};
|
||||
|
||||
// Importing a private key in PKCS#8 format must succeed when the outer AlgID
|
||||
|
|
@ -124,8 +95,7 @@ TEST_F(Pkcs11EcdsaSha256Test, ImportMatchingCurveOIDAndAlgorithmParams) {
|
|||
sizeof(kP256Pkcs8MatchingCurveOIDAndAlgorithmParams));
|
||||
DataBuffer data(kP256Data, sizeof(kP256Data));
|
||||
DataBuffer sig;
|
||||
DataBuffer sig2;
|
||||
EXPECT_TRUE(ImportPrivateKeyAndSignHashedData(k, data, &sig, &sig2));
|
||||
EXPECT_TRUE(ImportPrivateKeyAndSignHashedData(k, data, &sig));
|
||||
};
|
||||
|
||||
// Importing a private key in PKCS#8 format must succeed when the outer AlgID
|
||||
|
|
@ -136,8 +106,7 @@ TEST_F(Pkcs11EcdsaSha256Test, ImportDissimilarCurveOIDAndAlgorithmParams) {
|
|||
sizeof(kP256Pkcs8DissimilarCurveOIDAndAlgorithmParams));
|
||||
DataBuffer data(kP256Data, sizeof(kP256Data));
|
||||
DataBuffer sig;
|
||||
DataBuffer sig2;
|
||||
EXPECT_TRUE(ImportPrivateKeyAndSignHashedData(k, data, &sig, &sig2));
|
||||
EXPECT_TRUE(ImportPrivateKeyAndSignHashedData(k, data, &sig));
|
||||
};
|
||||
|
||||
// Importing a private key in PKCS#8 format must fail when the outer ASN.1
|
||||
|
|
@ -203,127 +172,4 @@ TEST_F(Pkcs11EcdsaSha256Test, ImportSpkiPointNotOnCurve) {
|
|||
EXPECT_EQ(handle, static_cast<decltype(handle)>(CK_INVALID_HANDLE));
|
||||
}
|
||||
|
||||
class Pkcs11EcdsaWycheproofTest : public ::testing::Test {
|
||||
protected:
|
||||
void Run(const std::string& name) {
|
||||
WycheproofHeader(name, "ECDSA", "ecdsa_verify_schema.json",
|
||||
[this](JsonReader& r) { RunGroup(r); });
|
||||
}
|
||||
|
||||
private:
|
||||
void RunGroup(JsonReader& r) {
|
||||
std::vector<EcdsaTestVector> tests;
|
||||
std::vector<uint8_t> public_key;
|
||||
SECOidTag hash_oid = SEC_OID_UNKNOWN;
|
||||
|
||||
while (r.NextItem()) {
|
||||
std::string n = r.ReadLabel();
|
||||
if (n == "") {
|
||||
break;
|
||||
}
|
||||
|
||||
if (n == "key" || n == "keyPem") {
|
||||
r.SkipValue();
|
||||
} else if (n == "keyDer") {
|
||||
public_key = r.ReadHex();
|
||||
} else if (n == "sha") {
|
||||
hash_oid = r.ReadHash();
|
||||
} else if (n == "type") {
|
||||
ASSERT_EQ("EcdsaVerify", r.ReadString());
|
||||
} else if (n == "tests") {
|
||||
WycheproofReadTests(r, &tests, ReadTestAttr);
|
||||
} else {
|
||||
FAIL() << "unknown label in group: " << n;
|
||||
}
|
||||
}
|
||||
|
||||
for (auto& t : tests) {
|
||||
std::cout << "Running test " << t.id << std::endl;
|
||||
t.public_key = public_key;
|
||||
t.hash_oid = hash_oid;
|
||||
Derive(t);
|
||||
}
|
||||
}
|
||||
|
||||
static void ReadTestAttr(EcdsaTestVector& t, const std::string& n,
|
||||
JsonReader& r) {
|
||||
if (n == "msg") {
|
||||
t.msg = r.ReadHex();
|
||||
} else if (n == "sig") {
|
||||
t.sig = r.ReadHex();
|
||||
} else {
|
||||
FAIL() << "unknown test key: " << n;
|
||||
}
|
||||
}
|
||||
|
||||
void Derive(const EcdsaTestVector& vec) {
|
||||
SECItem spki_item = {siBuffer, toUcharPtr(vec.public_key.data()),
|
||||
static_cast<unsigned int>(vec.public_key.size())};
|
||||
SECItem sig_item = {siBuffer, toUcharPtr(vec.sig.data()),
|
||||
static_cast<unsigned int>(vec.sig.size())};
|
||||
|
||||
DataBuffer hash;
|
||||
hash.Allocate(static_cast<size_t>(HASH_ResultLenByOidTag(vec.hash_oid)));
|
||||
SECStatus rv = PK11_HashBuf(vec.hash_oid, toUcharPtr(hash.data()),
|
||||
toUcharPtr(vec.msg.data()), vec.msg.size());
|
||||
ASSERT_EQ(rv, SECSuccess);
|
||||
SECItem hash_item = {siBuffer, toUcharPtr(hash.data()),
|
||||
static_cast<unsigned int>(hash.len())};
|
||||
|
||||
ScopedCERTSubjectPublicKeyInfo cert_spki(
|
||||
SECKEY_DecodeDERSubjectPublicKeyInfo(&spki_item));
|
||||
ASSERT_TRUE(cert_spki);
|
||||
ScopedSECKEYPublicKey pub_key(SECKEY_ExtractPublicKey(cert_spki.get()));
|
||||
ASSERT_TRUE(pub_key);
|
||||
|
||||
rv = VFY_VerifyDigestDirect(&hash_item, pub_key.get(), &sig_item,
|
||||
SEC_OID_ANSIX962_EC_PUBLIC_KEY, vec.hash_oid,
|
||||
nullptr);
|
||||
EXPECT_EQ(rv, vec.valid ? SECSuccess : SECFailure);
|
||||
};
|
||||
};
|
||||
|
||||
TEST_F(Pkcs11EcdsaWycheproofTest, P256) { Run("ecdsa_secp256r1_sha256"); }
|
||||
TEST_F(Pkcs11EcdsaWycheproofTest, P256Sha512) { Run("ecdsa_secp256r1_sha512"); }
|
||||
TEST_F(Pkcs11EcdsaWycheproofTest, P384) { Run("ecdsa_secp384r1_sha384"); }
|
||||
TEST_F(Pkcs11EcdsaWycheproofTest, P384Sha512) { Run("ecdsa_secp384r1_sha512"); }
|
||||
TEST_F(Pkcs11EcdsaWycheproofTest, P521) { Run("ecdsa_secp521r1_sha512"); }
|
||||
|
||||
class Pkcs11EcdsaRoundtripTest
|
||||
: public Pkcs11EcdsaTestBase,
|
||||
public ::testing::WithParamInterface<SECOidTag> {
|
||||
public:
|
||||
Pkcs11EcdsaRoundtripTest() : Pkcs11EcdsaTestBase(SEC_OID_SHA256) {}
|
||||
|
||||
protected:
|
||||
void GenerateExportImportSignVerify(SECOidTag tag) {
|
||||
Pkcs11KeyPairGenerator generator(CKM_EC_KEY_PAIR_GEN, tag);
|
||||
ScopedSECKEYPrivateKey priv;
|
||||
ScopedSECKEYPublicKey pub;
|
||||
generator.GenerateKey(&priv, &pub, false);
|
||||
|
||||
DataBuffer exported;
|
||||
ExportPrivateKey(&priv, exported);
|
||||
|
||||
if (tag != SEC_OID_CURVE25519) {
|
||||
DataBuffer sig;
|
||||
DataBuffer sig2;
|
||||
DataBuffer data(kP256Data, sizeof(kP256Data));
|
||||
ASSERT_TRUE(
|
||||
ImportPrivateKeyAndSignHashedData(exported, data, &sig, &sig2));
|
||||
|
||||
Verify(pub, data, sig);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
TEST_P(Pkcs11EcdsaRoundtripTest, GenerateExportImportSignVerify) {
|
||||
GenerateExportImportSignVerify(GetParam());
|
||||
}
|
||||
INSTANTIATE_TEST_SUITE_P(Pkcs11EcdsaRoundtripTest, Pkcs11EcdsaRoundtripTest,
|
||||
::testing::Values(SEC_OID_SECG_EC_SECP256R1,
|
||||
SEC_OID_SECG_EC_SECP384R1,
|
||||
SEC_OID_SECG_EC_SECP521R1,
|
||||
SEC_OID_CURVE25519));
|
||||
|
||||
} // namespace nss_test
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue