Skip to content

Commit

Permalink
Merge pull request #1374 from nebeid/upstream-merge-2024-01-02
Browse files Browse the repository at this point in the history 
Upstream merge 2024 01 02
  • Loading branch information
@nebeid
nebeid authored Jan 8, 2024
2 parents e240d43 + 6d8c8f3 commit b239ff6
Show file tree
Hide file tree
Showing 27 changed files with 555 additions and 648 deletions.
1 change: 1 addition & 0 deletions crypto/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,7 @@ add_library(
rand_extra/fuchsia.c
rand_extra/rand_extra.c
rand_extra/pq_custom_randombytes.c
rand_extra/trusty.c
rand_extra/windows.c
rc4/rc4.c
refcount_c11.c
Expand Down
13 changes: 2 additions & 11 deletions crypto/ec_extra/ec_asn1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ EC_KEY *EC_KEY_parse_private_key(CBS *cbs, const EC_GROUP *group) {
}

// Parse the optional parameters field.
EC_GROUP *inner_group = NULL;
EC_KEY *ret = NULL;
BIGNUM *priv_key = NULL;
if (CBS_peek_asn1_tag(&ec_private_key, kParametersTag)) {
Expand All @@ -108,7 +107,7 @@ EC_KEY *EC_KEY_parse_private_key(CBS *cbs, const EC_GROUP *group) {
OPENSSL_PUT_ERROR(EC, EC_R_DECODE_ERROR);
goto err;
}
inner_group = EC_KEY_parse_parameters(&child);
const EC_GROUP *inner_group = EC_KEY_parse_parameters(&child);
if (inner_group == NULL) {
goto err;
}
Expand Down Expand Up @@ -190,13 +189,11 @@ EC_KEY *EC_KEY_parse_private_key(CBS *cbs, const EC_GROUP *group) {
}

BN_free(priv_key);
EC_GROUP_free(inner_group);
return ret;

err:
EC_KEY_free(ret);
BN_free(priv_key);
EC_GROUP_free(inner_group);
return NULL;
}

Expand Down Expand Up @@ -354,8 +351,6 @@ EC_GROUP *EC_KEY_parse_curve_name(CBS *cbs) {
for (size_t i = 0; i < OPENSSL_ARRAY_SIZE(kAllGroups); i++) {
const EC_GROUP *group = kAllGroups[i]();
if (CBS_mem_equal(&named_curve, group->oid, group->oid_len)) {
// TODO(davidben): Remove unnecessary calls to |EC_GROUP_free| within the
// library.
return (EC_GROUP *)group;
}
}
Expand Down Expand Up @@ -434,8 +429,6 @@ EC_GROUP *EC_KEY_parse_parameters(CBS *cbs) {
BN_free(b);
BN_free(x);
BN_free(y);
// TODO(davidben): Remove unnecessary calls to |EC_GROUP_free| within the
// library.
return (EC_GROUP *)ret;
}

Expand Down Expand Up @@ -493,18 +486,16 @@ EC_KEY *d2i_ECParameters(EC_KEY **out_key, const uint8_t **inp, long len) {

CBS cbs;
CBS_init(&cbs, *inp, (size_t)len);
EC_GROUP *group = EC_KEY_parse_parameters(&cbs);
const EC_GROUP *group = EC_KEY_parse_parameters(&cbs);
if (group == NULL) {
return NULL;
}

EC_KEY *ret = EC_KEY_new();
if (ret == NULL || !EC_KEY_set_group(ret, group)) {
EC_GROUP_free(group);
EC_KEY_free(ret);
return NULL;
}
EC_GROUP_free(group);

if (out_key != NULL) {
EC_KEY_free(*out_key);
Expand Down
48 changes: 24 additions & 24 deletions crypto/ecdh_extra/ecdh_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,27 +36,27 @@
#include "../test/test_util.h"
#include "../test/wycheproof_util.h"

static bssl::UniquePtr<EC_GROUP> GetCurve(FileTest *t, const char *key) {

static const EC_GROUP *GetCurve(FileTest *t, const char *key) {
std::string curve_name;
if (!t->GetAttribute(&curve_name, key)) {
return nullptr;
}

if (curve_name == "P-224") {
return bssl::UniquePtr<EC_GROUP>(EC_GROUP_new_by_curve_name(NID_secp224r1));
return EC_group_p224();
}
if (curve_name == "P-256") {
return bssl::UniquePtr<EC_GROUP>(EC_GROUP_new_by_curve_name(
NID_X9_62_prime256v1));
return EC_group_p256();
}
if (curve_name == "P-384") {
return bssl::UniquePtr<EC_GROUP>(EC_GROUP_new_by_curve_name(NID_secp384r1));
return EC_group_p384();
}
if (curve_name == "P-521") {
return bssl::UniquePtr<EC_GROUP>(EC_GROUP_new_by_curve_name(NID_secp521r1));
return EC_group_p521();
}
if (curve_name == "secp256k1") {
return bssl::UniquePtr<EC_GROUP>(EC_GROUP_new_by_curve_name(NID_secp256k1));
return EC_group_secp256k1();
}

t->PrintLine("Unknown curve '%s'", curve_name.c_str());
Expand All @@ -74,7 +74,7 @@ static bssl::UniquePtr<BIGNUM> GetBIGNUM(FileTest *t, const char *key) {

TEST(ECDHTest, TestVectors) {
FileTestGTest("crypto/ecdh_extra/ecdh_tests.txt", [](FileTest *t) {
bssl::UniquePtr<EC_GROUP> group = GetCurve(t, "Curve");
const EC_GROUP *group = GetCurve(t, "Curve");
ASSERT_TRUE(group);
bssl::UniquePtr<BIGNUM> priv_key = GetBIGNUM(t, "Private");
ASSERT_TRUE(priv_key);
Expand All @@ -91,16 +91,16 @@ TEST(ECDHTest, TestVectors) {

bssl::UniquePtr<EC_KEY> key(EC_KEY_new());
ASSERT_TRUE(key);
bssl::UniquePtr<EC_POINT> pub_key(EC_POINT_new(group.get()));
bssl::UniquePtr<EC_POINT> pub_key(EC_POINT_new(group));
ASSERT_TRUE(pub_key);
bssl::UniquePtr<EC_POINT> peer_pub_key(EC_POINT_new(group.get()));
bssl::UniquePtr<EC_POINT> peer_pub_key(EC_POINT_new(group));
ASSERT_TRUE(peer_pub_key);
ASSERT_TRUE(EC_KEY_set_group(key.get(), group.get()));
ASSERT_TRUE(EC_KEY_set_group(key.get(), group));
ASSERT_TRUE(EC_KEY_set_private_key(key.get(), priv_key.get()));
ASSERT_TRUE(EC_POINT_set_affine_coordinates_GFp(group.get(), pub_key.get(),
ASSERT_TRUE(EC_POINT_set_affine_coordinates_GFp(group, pub_key.get(),
x.get(), y.get(), nullptr));
ASSERT_TRUE(EC_POINT_set_affine_coordinates_GFp(
group.get(), peer_pub_key.get(), peer_x.get(), peer_y.get(), nullptr));
group, peer_pub_key.get(), peer_x.get(), peer_y.get(), nullptr));
ASSERT_TRUE(EC_KEY_set_public_key(key.get(), pub_key.get()));
ASSERT_TRUE(EC_KEY_check_key(key.get()));

Expand Down Expand Up @@ -153,7 +153,7 @@ TEST(ECDHTest, InvalidPubKeyLargeCoord) {
FileTestGTest("crypto/fipsmodule/ec/large_x_coordinate_points.txt",
[&](FileTest *t) {
int ret;
bssl::UniquePtr<EC_GROUP> group = GetCurve(t, "Curve");
const EC_GROUP *group = GetCurve(t, "Curve");
ASSERT_TRUE(group);
bssl::UniquePtr<BIGNUM> x = GetBIGNUM(t, "X");
ASSERT_TRUE(x);
Expand All @@ -163,26 +163,26 @@ TEST(ECDHTest, InvalidPubKeyLargeCoord) {
ASSERT_TRUE(y);
bssl::UniquePtr<EC_KEY> peer_key(EC_KEY_new());
ASSERT_TRUE(peer_key);
bssl::UniquePtr<EC_POINT> pub_key(EC_POINT_new(group.get()));
bssl::UniquePtr<EC_POINT> pub_key(EC_POINT_new(group));
ASSERT_TRUE(pub_key);
bssl::UniquePtr<EC_KEY> priv_key(EC_KEY_new());
// Own private key
ASSERT_TRUE(priv_key);
ASSERT_TRUE(EC_KEY_set_group(priv_key.get(), group.get()));
ASSERT_TRUE(EC_KEY_set_group(priv_key.get(), group));
// Generate a generic ec key.
EC_KEY_generate_key(priv_key.get());

size_t len = BN_num_bytes(&group.get()->field.N); // Modulus byte-length
std::vector<uint8_t> shared_key((group.get()->curve_name == NID_secp521r1) ?
size_t len = BN_num_bytes(&group->field.N); // Modulus byte-length
std::vector<uint8_t> shared_key((group->curve_name == NID_secp521r1) ?
SHA512_DIGEST_LENGTH : len);

ASSERT_TRUE(EC_KEY_set_group(peer_key.get(), group.get()));
ASSERT_TRUE(EC_KEY_set_group(peer_key.get(), group));

// |EC_POINT_set_affine_coordinates_GFp| sets given (x, y) according to the
// form the curve is using. If the curve is using Montgomery form, |x| and
// |y| will be converted to Montgomery form.
ASSERT_TRUE(EC_POINT_set_affine_coordinates_GFp(
group.get(), pub_key.get(), x.get(), y.get(), nullptr));
group, pub_key.get(), x.get(), y.get(), nullptr));
ASSERT_TRUE(EC_KEY_set_public_key(peer_key.get(), pub_key.get()));
ASSERT_TRUE(ECDH_compute_key_fips(
shared_key.data(), shared_key.size(),
Expand Down Expand Up @@ -210,7 +210,7 @@ TEST(ECDHTest, InvalidPubKeyLargeCoord) {
EC_KEY_get0_public_key(peer_key.get()),
priv_key.get());

int curve_nid = group.get()->curve_name;
int curve_nid = group->curve_name;
if (!is_curve_using_mont_felem_impl(curve_nid)) {
ASSERT_TRUE(ret);
} else {
Expand Down Expand Up @@ -240,7 +240,7 @@ TEST(ECDHTest, InvalidPubKeyLargeCoord) {
static void RunWycheproofTest(FileTest *t) {
t->IgnoreInstruction("encoding");

bssl::UniquePtr<EC_GROUP> group = GetWycheproofCurve(t, "curve", true);
const EC_GROUP *group = GetWycheproofCurve(t, "curve", true);
ASSERT_TRUE(group);
bssl::UniquePtr<BIGNUM> priv_key = GetWycheproofBIGNUM(t, "private", false);
ASSERT_TRUE(priv_key);
Expand All @@ -267,10 +267,10 @@ static void RunWycheproofTest(FileTest *t) {

bssl::UniquePtr<EC_KEY> key(EC_KEY_new());
ASSERT_TRUE(key);
ASSERT_TRUE(EC_KEY_set_group(key.get(), group.get()));
ASSERT_TRUE(EC_KEY_set_group(key.get(), group));
ASSERT_TRUE(EC_KEY_set_private_key(key.get(), priv_key.get()));

std::vector<uint8_t> actual((EC_GROUP_get_degree(group.get()) + 7) / 8);
std::vector<uint8_t> actual((EC_GROUP_get_degree(group) + 7) / 8);
int ret =
ECDH_compute_key(actual.data(), actual.size(),
EC_KEY_get0_public_key(peer_ec), key.get(), nullptr);
Expand Down
1 change: 0 additions & 1 deletion crypto/err/ssl.errordata
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ SSL,253,NO_COMMON_SIGNATURE_ALGORITHMS
SSL,178,NO_COMPRESSION_SPECIFIED
SSL,265,NO_GROUPS_SPECIFIED
SSL,179,NO_METHOD_SPECIFIED
SSL,180,NO_P256_SUPPORT
SSL,181,NO_PRIVATE_KEY_ASSIGNED
SSL,182,NO_RENEGOTIATION
SSL,183,NO_REQUIRED_DIGEST
Expand Down
8 changes: 2 additions & 6 deletions crypto/evp_extra/p_ec_asn1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ static int eckey_pub_decode(EVP_PKEY *out, CBS *params, CBS *key) {
// The parameters are a named curve.
EC_POINT *point = NULL;
EC_KEY *eckey = NULL;
EC_GROUP *group = EC_KEY_parse_curve_name(params);
const EC_GROUP *group = EC_KEY_parse_curve_name(params);
if (group == NULL || CBS_len(params) != 0) {
OPENSSL_PUT_ERROR(EVP, EVP_R_DECODE_ERROR);
goto err;
Expand All @@ -114,13 +114,11 @@ static int eckey_pub_decode(EVP_PKEY *out, CBS *params, CBS *key) {
goto err;
}

EC_GROUP_free(group);
EC_POINT_free(point);
EVP_PKEY_assign_EC_KEY(out, eckey);
return 1;

err:
EC_GROUP_free(group);
EC_POINT_free(point);
EC_KEY_free(eckey);
return 0;
Expand Down Expand Up @@ -148,15 +146,13 @@ static int eckey_priv_decode(EVP_PKEY *out, CBS *params, CBS *key, CBS *pubkey)
return 0;
}

EC_GROUP *group = EC_KEY_parse_parameters(params);
const EC_GROUP *group = EC_KEY_parse_parameters(params);
if (group == NULL || CBS_len(params) != 0) {
OPENSSL_PUT_ERROR(EVP, EVP_R_DECODE_ERROR);
EC_GROUP_free(group);
return 0;
}

EC_KEY *ec_key = EC_KEY_parse_private_key(key, group);
EC_GROUP_free(group);
if (ec_key == NULL || CBS_len(key) != 0) {
OPENSSL_PUT_ERROR(EVP, EVP_R_DECODE_ERROR);
EC_KEY_free(ec_key);
Expand Down
Loading

0 comments on commit b239ff6

Please sign in to comment.