diff options
-rw-r--r-- | CHANGES.md | 14 | ||||
-rw-r--r-- | crypto/ec/ec_ameth.c | 4 | ||||
-rw-r--r-- | doc/man7/EVP_PKEY-EC.pod | 24 | ||||
-rw-r--r-- | providers/implementations/keymgmt/ec_kmgmt.c | 4 | ||||
-rw-r--r-- | test/evp_pkey_provided_test.c | 33 |
5 files changed, 65 insertions, 14 deletions
diff --git a/CHANGES.md b/CHANGES.md index 1e91bcda2d..bb0170f5ca 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -92,6 +92,20 @@ OpenSSL 3.2 *Darshan Sen* + * Our provider implementations of `OSSL_FUNC_KEYMGMT_EXPORT` and + `OSSL_FUNC_KEYMGMT_GET_PARAMS` for EC and SM2 keys now honor + `OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT` as set (and + default to `POINT_CONVERSION_UNCOMPRESSED`) when exporting + `OSSL_PKEY_PARAM_PUB_KEY`, instead of unconditionally using + `POINT_CONVERSION_COMPRESSED` as in previous 3.x releases. + For symmetry, our implementation of `EVP_PKEY_ASN1_METHOD->export_to` + for legacy EC and SM2 keys is also changed similarly to honor the + equivalent conversion format flag as specified in the underlying + `EC_KEY` object being exported to a provider, when this function is + called through `EVP_PKEY_export()`. + + *Nicola Tuveri* + * RNDR and RNDRRS support in provider functions to provide random number generation for Arm CPUs (aarch64). diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c index 290838b18c..ad28ba6827 100644 --- a/crypto/ec/ec_ameth.c +++ b/crypto/ec/ec_ameth.c @@ -513,8 +513,10 @@ int ec_pkey_export_to(const EVP_PKEY *from, void *to_keydata, if (pub_point != NULL) { /* convert pub_point to a octet string according to the SECG standard */ + point_conversion_form_t format = EC_KEY_get_conv_form(eckey); + if ((pub_key_buflen = EC_POINT_point2buf(ecg, pub_point, - POINT_CONVERSION_COMPRESSED, + format, &pub_key_buf, bnctx)) == 0 || !OSSL_PARAM_BLD_push_octet_string(tmpl, OSSL_PKEY_PARAM_PUB_KEY, diff --git a/doc/man7/EVP_PKEY-EC.pod b/doc/man7/EVP_PKEY-EC.pod index 0d32c67b43..143ec4e82f 100644 --- a/doc/man7/EVP_PKEY-EC.pod +++ b/doc/man7/EVP_PKEY-EC.pod @@ -79,6 +79,10 @@ Enable Cofactor DH (ECC CDH) if this value is 1, otherwise it uses normal EC DH if the value is zero. The cofactor variant multiplies the shared secret by the EC curve's cofactor (note for some curves the cofactor is 1). +See also L<EVP_KEYEXCH-ECDH(7)> for the related +B<OSSL_EXCHANGE_PARAM_EC_ECDH_COFACTOR_MODE> parameter that can be set on a +per-operation basis. + =item "encoding" (B<OSSL_PKEY_PARAM_EC_ENCODING>) <UTF8 string> Set the format used for serializing the EC group parameters. @@ -104,15 +108,21 @@ but is equivalent to "named-nist" for the OpenSSL FIPS provider. Setting this value to 0 indicates that the public key should not be included when encoding the private key. The default value of 1 will include the public key. -See also L<EVP_KEYEXCH-ECDH(7)> for the related -B<OSSL_EXCHANGE_PARAM_EC_ECDH_COFACTOR_MODE> parameter that can be set on a -per-operation basis. - =item "pub" (B<OSSL_PKEY_PARAM_PUB_KEY>) <octet string> -The public key value in encoded EC point format. This parameter is used -when importing or exporting the public key value with the EVP_PKEY_fromdata() -and EVP_PKEY_todata() functions. +The public key value in encoded EC point format conforming to Sec. 2.3.3 and +2.3.4 of the SECG SEC 1 ("Elliptic Curve Cryptography") standard. +This parameter is used when importing or exporting the public key value with the +EVP_PKEY_fromdata() and EVP_PKEY_todata() functions. + +Note, in particular, that the choice of point compression format used for +encoding the exported value via EVP_PKEY_todata() depends on the underlying +provider implementation. +Before OpenSSL 3.1, the implementation of providers included with OpenSSL always +opted for an encoding in compressed format, unconditionally. +Since OpenSSL 3.1, the implementation has been changed to honor the +B<OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT> parameter, if set, or to default +to uncompressed format. =item "priv" (B<OSSL_PKEY_PARAM_PRIV_KEY>) <unsigned integer> diff --git a/providers/implementations/keymgmt/ec_kmgmt.c b/providers/implementations/keymgmt/ec_kmgmt.c index fe2465a64b..b23fab5fde 100644 --- a/providers/implementations/keymgmt/ec_kmgmt.c +++ b/providers/implementations/keymgmt/ec_kmgmt.c @@ -147,8 +147,10 @@ int key_to_params(const EC_KEY *eckey, OSSL_PARAM_BLD *tmpl, if (p != NULL || tmpl != NULL) { /* convert pub_point to a octet string according to the SECG standard */ + point_conversion_form_t format = EC_KEY_get_conv_form(eckey); + if ((pub_key_len = EC_POINT_point2buf(ecg, pub_point, - POINT_CONVERSION_COMPRESSED, + format, pub_key, bnctx)) == 0 || !ossl_param_build_set_octet_string(tmpl, p, OSSL_PKEY_PARAM_PUB_KEY, diff --git a/test/evp_pkey_provided_test.c b/test/evp_pkey_provided_test.c index 3237884d7c..3f490954ab 100644 --- a/test/evp_pkey_provided_test.c +++ b/test/evp_pkey_provided_test.c @@ -1185,13 +1185,20 @@ static int test_fromdata_ec(void) 0x7f, 0x59, 0x5f, 0x8c, 0xd1, 0x96, 0x0b, 0xdf, 0x29, 0x3e, 0x49, 0x07, 0x88, 0x3f, 0x9a, 0x29 }; + /* SAME BUT COMPRESSED FORMAT */ + static const unsigned char ec_pub_keydata_compressed[] = { + POINT_CONVERSION_COMPRESSED+1, + 0x1b, 0x93, 0x67, 0x55, 0x1c, 0x55, 0x9f, 0x63, + 0xd1, 0x22, 0xa4, 0xd8, 0xd1, 0x0a, 0x60, 0x6d, + 0x02, 0xa5, 0x77, 0x57, 0xc8, 0xa3, 0x47, 0x73, + 0x3a, 0x6a, 0x08, 0x28, 0x39, 0xbd, 0xc9, 0xd2 + }; static const unsigned char ec_priv_keydata[] = { 0x33, 0xd0, 0x43, 0x83, 0xa9, 0x89, 0x56, 0x03, 0xd2, 0xd7, 0xfe, 0x6b, 0x01, 0x6f, 0xe4, 0x59, 0xcc, 0x0d, 0x9a, 0x24, 0x6c, 0x86, 0x1b, 0x2e, 0xdc, 0x4b, 0x4d, 0x35, 0x43, 0xe1, 0x1b, 0xad }; - const int compressed_sz = 1 + (sizeof(ec_pub_keydata) - 1) / 2; unsigned char out_pub[sizeof(ec_pub_keydata)]; char out_curve_name[80]; const OSSL_PARAM *gettable = NULL; @@ -1214,9 +1221,17 @@ static int test_fromdata_ec(void) if (OSSL_PARAM_BLD_push_utf8_string(bld, OSSL_PKEY_PARAM_GROUP_NAME, curve, 0) <= 0) goto err; + /* + * We intentionally provide the input point in compressed format, + * and avoid setting `OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT`. + * + * Later on we check what format is used when exporting the + * `OSSL_PKEY_PARAM_PUB_KEY` and expect to default to uncompressed + * format. + */ if (OSSL_PARAM_BLD_push_octet_string(bld, OSSL_PKEY_PARAM_PUB_KEY, - ec_pub_keydata, - sizeof(ec_pub_keydata)) <= 0) + ec_pub_keydata_compressed, + sizeof(ec_pub_keydata_compressed)) <= 0) goto err; if (OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PRIV_KEY, ec_priv_bn) <= 0) goto err; @@ -1287,9 +1302,17 @@ static int test_fromdata_ec(void) || !TEST_str_eq(out_curve_name, curve) || !EVP_PKEY_get_octet_string_param(pk, OSSL_PKEY_PARAM_PUB_KEY, out_pub, sizeof(out_pub), &len) - || !TEST_true(out_pub[0] == (POINT_CONVERSION_COMPRESSED + 1)) + + /* + * Our providers use uncompressed format by default if + * `OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT` was not + * explicitly set, irrespective of the format used for the + * input point given as a param to create this key. + */ + || !TEST_true(out_pub[0] == POINT_CONVERSION_UNCOMPRESSED) || !TEST_mem_eq(out_pub + 1, len - 1, - ec_pub_keydata + 1, compressed_sz - 1) + ec_pub_keydata + 1, sizeof(ec_pub_keydata) - 1) + || !TEST_true(EVP_PKEY_get_bn_param(pk, OSSL_PKEY_PARAM_PRIV_KEY, &bn_priv)) || !TEST_BN_eq(ec_priv_bn, bn_priv)) |