Skip to content

Commit

Permalink
expanded test coverage for EVP_PKEY_check and public_check
Browse files Browse the repository at this point in the history
  • Loading branch information
@smittals2
smittals2 committed Apr 25, 2024
1 parent eaef8f4 commit 3b05290
Show file tree
Hide file tree
Showing 3 changed files with 136 additions and 0 deletions.
19 changes: 19 additions & 0 deletions crypto/fipsmodule/ec/ec_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <openssl/ec.h>
#include <openssl/ec_key.h>
#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/mem.h>
#include <openssl/nid.h>
#include <openssl/obj.h>
Expand Down Expand Up @@ -1023,6 +1024,16 @@ TEST(ECTest, ArbitraryCurve) {
// The key must be valid according to the new group too.
EXPECT_TRUE(EC_KEY_check_key(key2.get()));

EVP_PKEY *ec_pkey = EVP_PKEY_new();
ASSERT_TRUE(ec_pkey);
ASSERT_TRUE(EVP_PKEY_assign_EC_KEY(ec_pkey, key2.get()));

EVP_PKEY_CTX *ec_key_ctx = EVP_PKEY_CTX_new(ec_pkey, NULL);
ASSERT_TRUE(ec_key_ctx);

ASSERT_TRUE(EVP_PKEY_check(ec_key_ctx));
ASSERT_TRUE(EVP_PKEY_public_check((ec_key_ctx)));

// Make a second instance of |group|.
bssl::UniquePtr<EC_GROUP> group2(
EC_GROUP_new_curve_GFp(p.get(), a.get(), b.get(), ctx.get()));
Expand Down Expand Up @@ -1889,6 +1900,14 @@ TEST(ECTest, LargeXCoordinateVectors) {
ASSERT_TRUE(EC_KEY_set_public_key(key.get(), pub_key.get()));
ASSERT_TRUE(EC_KEY_check_fips(key.get()));

EVP_PKEY *ec_pkey = EVP_PKEY_new();
ASSERT_TRUE(ec_pkey);
ASSERT_TRUE(EVP_PKEY_assign_EC_KEY(ec_pkey, key.get()));
EVP_PKEY_CTX *ec_key_ctx = EVP_PKEY_CTX_new(ec_pkey, NULL);
ASSERT_TRUE(ec_key_ctx);
ASSERT_TRUE(EVP_PKEY_check(ec_key_ctx));
ASSERT_TRUE(EVP_PKEY_public_check((ec_key_ctx)));

// Set the raw point directly with the BIGNUM coordinates.
// Note that both are in little-endian byte order.
OPENSSL_memcpy(key.get()->pub_key->raw.X.words,
Expand Down
15 changes: 15 additions & 0 deletions crypto/fipsmodule/ecdsa/ecdsa_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
#include <openssl/crypto.h>
#include <openssl/ec.h>
#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/mem.h>
#include <openssl/nid.h>
#include <openssl/rand.h>
Expand Down Expand Up @@ -221,6 +222,13 @@ TEST(ECDSATest, BuiltinCurves) {

// Check the key.
EXPECT_TRUE(EC_KEY_check_key(eckey.get()));
EVP_PKEY *ec_pkey = EVP_PKEY_new();
ASSERT_TRUE(ec_pkey);
ASSERT_TRUE(EVP_PKEY_assign_EC_KEY(ec_pkey, eckey.get()));
EVP_PKEY_CTX *ec_key_ctx = EVP_PKEY_CTX_new(ec_pkey, NULL);
ASSERT_TRUE(ec_key_ctx);
EXPECT_TRUE(EVP_PKEY_check(ec_key_ctx));
EXPECT_TRUE(EVP_PKEY_public_check(ec_key_ctx));

// Test ASN.1-encoded signatures.
// Create a signature.
Expand Down Expand Up @@ -455,6 +463,13 @@ TEST(ECDSATest, SignTestVectors) {
group.get(), pub_key.get(), x.get(), y.get(), nullptr));
ASSERT_TRUE(EC_KEY_set_public_key(key.get(), pub_key.get()));
ASSERT_TRUE(EC_KEY_check_key(key.get()));
EVP_PKEY *ec_pkey = EVP_PKEY_new();
ASSERT_TRUE(ec_pkey);
ASSERT_TRUE(EVP_PKEY_assign_EC_KEY(ec_pkey, key.get()));
EVP_PKEY_CTX *ec_key_ctx = EVP_PKEY_CTX_new(ec_pkey, NULL);
ASSERT_TRUE(ec_key_ctx);
EXPECT_TRUE(EVP_PKEY_check(ec_key_ctx));
EXPECT_TRUE(EVP_PKEY_public_check(ec_key_ctx));

bssl::UniquePtr<ECDSA_SIG> sig(
ECDSA_sign_with_nonce_and_leak_private_key_for_testing(
Expand Down
102 changes: 102 additions & 0 deletions crypto/rsa_extra/rsa_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,13 @@ TEST_P(RSAEncryptTest, TestKey) {
for (RSA *key :
{parsed.get(), constructed.get(), no_crt.get(), no_e.get(), pub.get()}) {
EXPECT_TRUE(RSA_check_key(key));
EVP_PKEY *rsa_pkey = EVP_PKEY_new();
ASSERT_TRUE(rsa_pkey);
ASSERT_TRUE(EVP_PKEY_assign_RSA(rsa_pkey, key));
EVP_PKEY_CTX *rsa_key_ctx = EVP_PKEY_CTX_new(rsa_pkey, NULL);
ASSERT_TRUE(rsa_key_ctx);
ASSERT_TRUE(EVP_PKEY_check(rsa_key_ctx));
ASSERT_TRUE(EVP_PKEY_public_check((rsa_key_ctx)));

uint8_t ciphertext[256], plaintext[256];
size_t ciphertext_len = 0, plaintext_len = 0;
Expand Down Expand Up @@ -515,6 +522,14 @@ TEST(RSATest, TestDecrypt) {

EXPECT_TRUE(RSA_check_key(rsa.get()));

EVP_PKEY *rsa_pkey = EVP_PKEY_new();
ASSERT_TRUE(rsa_pkey);
ASSERT_TRUE(EVP_PKEY_assign_RSA(rsa_pkey, rsa.get()));
EVP_PKEY_CTX *rsa_key_ctx = EVP_PKEY_CTX_new(rsa_pkey, NULL);
ASSERT_TRUE(rsa_key_ctx);
ASSERT_TRUE(EVP_PKEY_check(rsa_key_ctx));
ASSERT_TRUE(EVP_PKEY_public_check((rsa_key_ctx)));

uint8_t out[256];
size_t out_len;
ASSERT_TRUE(RSA_decrypt(
Expand Down Expand Up @@ -578,6 +593,14 @@ TEST(RSATest, BadKey) {
EXPECT_FALSE(RSA_check_key(key.get()));
EXPECT_FALSE(RSA_check_fips(key.get()));

EVP_PKEY *rsa_pkey = EVP_PKEY_new();
ASSERT_TRUE(rsa_pkey);
ASSERT_TRUE(EVP_PKEY_assign_RSA(rsa_pkey, key.get()));
EVP_PKEY_CTX *rsa_key_ctx = EVP_PKEY_CTX_new(rsa_pkey, NULL);
ASSERT_TRUE(rsa_key_ctx);
ASSERT_FALSE(EVP_PKEY_check(rsa_key_ctx));
ASSERT_FALSE(EVP_PKEY_public_check((rsa_key_ctx)));

// Bad keys may not be parsed.
uint8_t *der;
size_t der_len;
Expand Down Expand Up @@ -841,52 +864,79 @@ TEST(RSATest, CheckKey) {
bssl::UniquePtr<RSA> rsa(RSA_new());
ASSERT_TRUE(rsa);

EVP_PKEY *rsa_pkey = EVP_PKEY_new();
ASSERT_TRUE(rsa_pkey);

// Missing n or e does not pass.
ASSERT_TRUE(BN_hex2bn(&rsa->n, kN));
EXPECT_FALSE(RSA_check_key(rsa.get()));

ASSERT_TRUE(EVP_PKEY_assign_RSA(rsa_pkey, rsa.get()));
EVP_PKEY_CTX *rsa_key_ctx = EVP_PKEY_CTX_new(rsa_pkey, NULL);
ASSERT_TRUE(rsa_key_ctx);
EXPECT_FALSE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_FALSE(EVP_PKEY_public_check((rsa_key_ctx)));
ERR_clear_error();

BN_free(rsa->n);
rsa->n = nullptr;
ASSERT_TRUE(BN_hex2bn(&rsa->e, kE));
EXPECT_FALSE(RSA_check_key(rsa.get()));
EXPECT_FALSE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_FALSE(EVP_PKEY_public_check((rsa_key_ctx)));
ERR_clear_error();

// Public keys pass.
ASSERT_TRUE(BN_hex2bn(&rsa->n, kN));
EXPECT_TRUE(RSA_check_key(rsa.get()));
EXPECT_TRUE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_TRUE(EVP_PKEY_public_check((rsa_key_ctx)));

// Invalid e values (e = 1 or e odd).
ASSERT_TRUE(BN_hex2bn(&rsa->e, "1"));
EXPECT_FALSE(RSA_check_key(rsa.get()));
EXPECT_FALSE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_FALSE(EVP_PKEY_public_check((rsa_key_ctx)));

// Restore the valid public key values.
ASSERT_TRUE(BN_hex2bn(&rsa->n, kN));
ASSERT_TRUE(BN_hex2bn(&rsa->e, kE));
EXPECT_TRUE(RSA_check_key(rsa.get()));
EXPECT_TRUE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_TRUE(EVP_PKEY_public_check((rsa_key_ctx)));

// Configuring d also passes.
ASSERT_TRUE(BN_hex2bn(&rsa->d, kD));
EXPECT_TRUE(RSA_check_key(rsa.get()));
EXPECT_TRUE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_TRUE(EVP_PKEY_public_check((rsa_key_ctx)));

// p and q must be provided together.
ASSERT_TRUE(BN_hex2bn(&rsa->p, kP));
EXPECT_FALSE(RSA_check_key(rsa.get()));
EXPECT_FALSE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_FALSE(EVP_PKEY_public_check((rsa_key_ctx)));
ERR_clear_error();

BN_free(rsa->p);
rsa->p = nullptr;
ASSERT_TRUE(BN_hex2bn(&rsa->q, kQ));
EXPECT_FALSE(RSA_check_key(rsa.get()));
EXPECT_FALSE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_FALSE(EVP_PKEY_public_check((rsa_key_ctx)));
ERR_clear_error();

// Supplying p and q without CRT parameters passes.
ASSERT_TRUE(BN_hex2bn(&rsa->p, kP));
EXPECT_TRUE(RSA_check_key(rsa.get()));
EXPECT_TRUE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_TRUE(EVP_PKEY_public_check((rsa_key_ctx)));

// With p and q together, it is sufficient to check d against e.
ASSERT_TRUE(BN_add_word(rsa->d, 1));
EXPECT_FALSE(RSA_check_key(rsa.get()));
EXPECT_FALSE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_FALSE(EVP_PKEY_public_check((rsa_key_ctx)));
ERR_clear_error();

// Test another invalid d. p-1 is divisible by 3, so there is no valid value
Expand All @@ -904,6 +954,9 @@ TEST(RSATest, CheckKey) {
ASSERT_TRUE(BN_set_word(rsa->e, 111));
ASSERT_TRUE(BN_hex2bn(&rsa->d, kDBogus));
EXPECT_FALSE(RSA_check_key(rsa.get()));
EXPECT_FALSE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_FALSE(EVP_PKEY_public_check((rsa_key_ctx)));

ERR_clear_error();
ASSERT_TRUE(BN_hex2bn(&rsa->e, kE));

Expand All @@ -920,6 +973,8 @@ TEST(RSATest, CheckKey) {
"c62bbe81";
ASSERT_TRUE(BN_hex2bn(&rsa->d, kDEuler));
EXPECT_TRUE(RSA_check_key(rsa.get()));
EXPECT_TRUE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_TRUE(EVP_PKEY_public_check((rsa_key_ctx)));

// If d is out of range, d > n, but otherwise valid, it is accepted.
static const char kDgtN[] =
Expand All @@ -933,59 +988,81 @@ TEST(RSATest, CheckKey) {
"42e770c1";
ASSERT_TRUE(BN_hex2bn(&rsa->d, kDgtN));
EXPECT_TRUE(RSA_check_key(rsa.get()));
EXPECT_TRUE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_TRUE(EVP_PKEY_public_check((rsa_key_ctx)));
ASSERT_TRUE(BN_hex2bn(&rsa->d, kD));

// CRT value must either all be provided or all missing.
ASSERT_TRUE(BN_hex2bn(&rsa->dmp1, kDMP1));
EXPECT_FALSE(RSA_check_key(rsa.get()));
EXPECT_FALSE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_FALSE(EVP_PKEY_public_check((rsa_key_ctx)));
ERR_clear_error();
BN_free(rsa->dmp1);
rsa->dmp1 = nullptr;

ASSERT_TRUE(BN_hex2bn(&rsa->dmq1, kDMQ1));
EXPECT_FALSE(RSA_check_key(rsa.get()));
EXPECT_FALSE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_FALSE(EVP_PKEY_public_check((rsa_key_ctx)));
ERR_clear_error();
BN_free(rsa->dmq1);
rsa->dmq1 = nullptr;

ASSERT_TRUE(BN_hex2bn(&rsa->iqmp, kIQMP));
EXPECT_FALSE(RSA_check_key(rsa.get()));
EXPECT_FALSE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_FALSE(EVP_PKEY_public_check((rsa_key_ctx)));
ERR_clear_error();

// The full key is accepted.
ASSERT_TRUE(BN_hex2bn(&rsa->dmp1, kDMP1));
ASSERT_TRUE(BN_hex2bn(&rsa->dmq1, kDMQ1));
EXPECT_TRUE(RSA_check_key(rsa.get()));
EXPECT_TRUE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_TRUE(EVP_PKEY_public_check((rsa_key_ctx)));

// Incorrect CRT values are rejected.
ASSERT_TRUE(BN_add_word(rsa->dmp1, 1));
EXPECT_FALSE(RSA_check_key(rsa.get()));
EXPECT_FALSE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_FALSE(EVP_PKEY_public_check((rsa_key_ctx)));
ERR_clear_error();
ASSERT_TRUE(BN_sub_word(rsa->dmp1, 1));

ASSERT_TRUE(BN_add_word(rsa->dmq1, 1));
EXPECT_FALSE(RSA_check_key(rsa.get()));
EXPECT_FALSE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_FALSE(EVP_PKEY_public_check((rsa_key_ctx)));
ERR_clear_error();
ASSERT_TRUE(BN_sub_word(rsa->dmq1, 1));

ASSERT_TRUE(BN_add_word(rsa->iqmp, 1));
EXPECT_FALSE(RSA_check_key(rsa.get()));
EXPECT_FALSE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_FALSE(EVP_PKEY_public_check((rsa_key_ctx)));
ERR_clear_error();
ASSERT_TRUE(BN_sub_word(rsa->iqmp, 1));

// Non-reduced CRT values are rejected.
ASSERT_TRUE(BN_add(rsa->dmp1, rsa->dmp1, rsa->p));
EXPECT_FALSE(RSA_check_key(rsa.get()));
EXPECT_FALSE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_FALSE(EVP_PKEY_public_check((rsa_key_ctx)));
ERR_clear_error();
ASSERT_TRUE(BN_sub(rsa->dmp1, rsa->dmp1, rsa->p));

ASSERT_TRUE(BN_add(rsa->dmq1, rsa->dmq1, rsa->q));
EXPECT_FALSE(RSA_check_key(rsa.get()));
EXPECT_FALSE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_FALSE(EVP_PKEY_public_check((rsa_key_ctx)));
ERR_clear_error();
ASSERT_TRUE(BN_sub(rsa->dmq1, rsa->dmq1, rsa->q));

ASSERT_TRUE(BN_add(rsa->iqmp, rsa->iqmp, rsa->p));
EXPECT_FALSE(RSA_check_key(rsa.get()));
EXPECT_FALSE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_FALSE(EVP_PKEY_public_check((rsa_key_ctx)));
ERR_clear_error();
ASSERT_TRUE(BN_sub(rsa->iqmp, rsa->iqmp, rsa->p));
}
Expand Down Expand Up @@ -1046,6 +1123,15 @@ TEST(RSATest, KeygenFail) {
// Generating a key over an existing key works, despite any cached state.
EXPECT_TRUE(RSA_generate_key_ex(rsa.get(), 2048, e.get(), nullptr));
EXPECT_TRUE(RSA_check_key(rsa.get()));

EVP_PKEY *rsa_pkey = EVP_PKEY_new();
ASSERT_TRUE(rsa_pkey);
ASSERT_TRUE(EVP_PKEY_assign_RSA(rsa_pkey, rsa.get()));
EVP_PKEY_CTX *rsa_key_ctx = EVP_PKEY_CTX_new(rsa_pkey, NULL);
ASSERT_TRUE(rsa_key_ctx);
EXPECT_TRUE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_TRUE(EVP_PKEY_public_check((rsa_key_ctx)));

uint8_t *der3;
size_t der3_len;
ASSERT_TRUE(RSA_private_key_to_bytes(&der3, &der3_len, rsa.get()));
Expand Down Expand Up @@ -1140,6 +1226,14 @@ TEST(RSADeathTest, KeygenFailAndDie) {
// Generating a key over an existing key works, despite any cached state.
EXPECT_TRUE(RSA_generate_key_ex(rsa.get(), 2048, e.get(), nullptr));
EXPECT_TRUE(RSA_check_key(rsa.get()));
EVP_PKEY *rsa_pkey = EVP_PKEY_new();
ASSERT_TRUE(rsa_pkey);
ASSERT_TRUE(EVP_PKEY_assign_RSA(rsa_pkey, rsa.get()));
EVP_PKEY_CTX *rsa_key_ctx = EVP_PKEY_CTX_new(rsa_pkey, NULL);
ASSERT_TRUE(rsa_key_ctx);
EXPECT_TRUE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_TRUE(EVP_PKEY_public_check((rsa_key_ctx)));

uint8_t *der3;
size_t der3_len;
ASSERT_TRUE(RSA_private_key_to_bytes(&der3, &der3_len, rsa.get()));
Expand Down Expand Up @@ -1266,6 +1360,14 @@ TEST(RSATest, OverwriteKey) {
ASSERT_TRUE(key1);

ASSERT_TRUE(RSA_check_key(key1.get()));
EVP_PKEY *rsa_pkey = EVP_PKEY_new();
ASSERT_TRUE(rsa_pkey);
ASSERT_TRUE(EVP_PKEY_assign_RSA(rsa_pkey, key1.get()));
EVP_PKEY_CTX *rsa_key_ctx = EVP_PKEY_CTX_new(rsa_pkey, NULL);
ASSERT_TRUE(rsa_key_ctx);
EXPECT_TRUE(EVP_PKEY_check(rsa_key_ctx));
EXPECT_TRUE(EVP_PKEY_public_check((rsa_key_ctx)));

size_t len;
std::vector<uint8_t> ciphertext(RSA_size(key1.get()));
ASSERT_TRUE(RSA_encrypt(key1.get(), &len, ciphertext.data(),
Expand Down

0 comments on commit 3b05290

Please sign in to comment.