1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530
|
/*
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
* A copy of the License is located at
*
* http://aws.amazon.com/apache2.0
*
* or in the "license" file accompanying this file. This file is distributed
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
* express or implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
#include "crypto/s2n_ecc_evp.h"
#include <openssl/ecdh.h>
#include <openssl/evp.h>
#if defined(OPENSSL_IS_AWSLC)
#include <openssl/mem.h>
#endif
#include <stdint.h>
#include "tls/s2n_connection.h"
#include "tls/s2n_ecc_preferences.h"
#include "tls/s2n_tls_parameters.h"
#include "utils/s2n_mem.h"
#include "utils/s2n_safety.h"
#define TLS_EC_CURVE_TYPE_NAMED 3
DEFINE_POINTER_CLEANUP_FUNC(EVP_PKEY *, EVP_PKEY_free);
DEFINE_POINTER_CLEANUP_FUNC(EVP_PKEY_CTX *, EVP_PKEY_CTX_free);
DEFINE_POINTER_CLEANUP_FUNC(EC_KEY *, EC_KEY_free);
#if !EVP_APIS_SUPPORTED
DEFINE_POINTER_CLEANUP_FUNC(EC_POINT *, EC_POINT_free);
#endif
#if EVP_APIS_SUPPORTED
static int s2n_ecc_evp_generate_key_x25519(const struct s2n_ecc_named_curve *named_curve, EVP_PKEY **evp_pkey);
#else
static int s2n_ecc_evp_write_point_data_snug(const EC_POINT *point, const EC_GROUP *group, struct s2n_blob *out);
static int s2n_ecc_evp_calculate_point_length(const EC_POINT *point, const EC_GROUP *group, uint8_t *length);
static EC_POINT *s2n_ecc_evp_blob_to_point(struct s2n_blob *blob, const EC_KEY *ec_key);
#endif
static int s2n_ecc_evp_generate_key_nist_curves(const struct s2n_ecc_named_curve *named_curve, EVP_PKEY **evp_pkey);
static int s2n_ecc_evp_generate_own_key(const struct s2n_ecc_named_curve *named_curve, EVP_PKEY **evp_pkey);
static int s2n_ecc_evp_compute_shared_secret(EVP_PKEY *own_key, EVP_PKEY *peer_public, uint16_t iana_id, struct s2n_blob *shared_secret);
/* IANA values can be found here: https://tools.ietf.org/html/rfc8446#appendix-B.3.1.4 */
const struct s2n_ecc_named_curve s2n_ecc_curve_secp256r1 = {
.iana_id = TLS_EC_CURVE_SECP_256_R1,
.libcrypto_nid = NID_X9_62_prime256v1,
.name = "secp256r1",
.share_size = SECP256R1_SHARE_SIZE,
.generate_key = s2n_ecc_evp_generate_key_nist_curves,
};
const struct s2n_ecc_named_curve s2n_ecc_curve_secp384r1 = {
.iana_id = TLS_EC_CURVE_SECP_384_R1,
.libcrypto_nid = NID_secp384r1,
.name = "secp384r1",
.share_size = SECP384R1_SHARE_SIZE,
.generate_key = s2n_ecc_evp_generate_key_nist_curves,
};
const struct s2n_ecc_named_curve s2n_ecc_curve_secp521r1 = {
.iana_id = TLS_EC_CURVE_SECP_521_R1,
.libcrypto_nid = NID_secp521r1,
.name = "secp521r1",
.share_size = SECP521R1_SHARE_SIZE,
.generate_key = s2n_ecc_evp_generate_key_nist_curves,
};
#if EVP_APIS_SUPPORTED
const struct s2n_ecc_named_curve s2n_ecc_curve_x25519 = {
.iana_id = TLS_EC_CURVE_ECDH_X25519,
.libcrypto_nid = NID_X25519,
.name = "x25519",
.share_size = X25519_SHARE_SIZE,
.generate_key = s2n_ecc_evp_generate_key_x25519,
};
#else
const struct s2n_ecc_named_curve s2n_ecc_curve_x25519 = { 0 };
#endif
/* A fake / unsupported curve for use in triggering retries
* during testing.
*/
const struct s2n_ecc_named_curve s2n_unsupported_curve = {
.iana_id = 0,
.name = "unsupported",
.libcrypto_nid = NID_X9_62_prime256v1,
.share_size = SECP256R1_SHARE_SIZE,
.generate_key = s2n_ecc_evp_generate_key_nist_curves,
};
/* All curves that s2n supports. New curves MUST be added here.
* This list is a super set of all the curves present in s2n_ecc_preferences list.
*/
const struct s2n_ecc_named_curve *const s2n_all_supported_curves_list[] = {
&s2n_ecc_curve_secp256r1,
&s2n_ecc_curve_secp384r1,
#if EVP_APIS_SUPPORTED
&s2n_ecc_curve_x25519,
#endif
&s2n_ecc_curve_secp521r1,
};
const size_t s2n_all_supported_curves_list_len = s2n_array_len(s2n_all_supported_curves_list);
int s2n_is_evp_apis_supported()
{
return EVP_APIS_SUPPORTED;
}
#if EVP_APIS_SUPPORTED
static int s2n_ecc_evp_generate_key_x25519(const struct s2n_ecc_named_curve *named_curve, EVP_PKEY **evp_pkey)
{
DEFER_CLEANUP(EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new_id(named_curve->libcrypto_nid, NULL),
EVP_PKEY_CTX_free_pointer);
S2N_ERROR_IF(pctx == NULL, S2N_ERR_ECDHE_GEN_KEY);
POSIX_GUARD_OSSL(EVP_PKEY_keygen_init(pctx), S2N_ERR_ECDHE_GEN_KEY);
POSIX_GUARD_OSSL(EVP_PKEY_keygen(pctx, evp_pkey), S2N_ERR_ECDHE_GEN_KEY);
S2N_ERROR_IF(evp_pkey == NULL, S2N_ERR_ECDHE_GEN_KEY);
return 0;
}
#endif
static int s2n_ecc_evp_generate_key_nist_curves(const struct s2n_ecc_named_curve *named_curve, EVP_PKEY **evp_pkey)
{
DEFER_CLEANUP(EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_EC, NULL), EVP_PKEY_CTX_free_pointer);
S2N_ERROR_IF(pctx == NULL, S2N_ERR_ECDHE_GEN_KEY);
POSIX_GUARD_OSSL(EVP_PKEY_paramgen_init(pctx), S2N_ERR_ECDHE_GEN_KEY);
POSIX_GUARD_OSSL(EVP_PKEY_CTX_set_ec_paramgen_curve_nid(pctx, named_curve->libcrypto_nid), S2N_ERR_ECDHE_GEN_KEY);
DEFER_CLEANUP(EVP_PKEY *params = NULL, EVP_PKEY_free_pointer);
POSIX_GUARD_OSSL(EVP_PKEY_paramgen(pctx, ¶ms), S2N_ERR_ECDHE_GEN_KEY);
S2N_ERROR_IF(params == NULL, S2N_ERR_ECDHE_GEN_KEY);
DEFER_CLEANUP(EVP_PKEY_CTX *kctx = EVP_PKEY_CTX_new(params, NULL), EVP_PKEY_CTX_free_pointer);
S2N_ERROR_IF(kctx == NULL, S2N_ERR_ECDHE_GEN_KEY);
POSIX_GUARD_OSSL(EVP_PKEY_keygen_init(kctx), S2N_ERR_ECDHE_GEN_KEY);
POSIX_GUARD_OSSL(EVP_PKEY_keygen(kctx, evp_pkey), S2N_ERR_ECDHE_GEN_KEY);
S2N_ERROR_IF(evp_pkey == NULL, S2N_ERR_ECDHE_GEN_KEY);
return 0;
}
static int s2n_ecc_evp_generate_own_key(const struct s2n_ecc_named_curve *named_curve, EVP_PKEY **evp_pkey)
{
POSIX_ENSURE_REF(named_curve);
S2N_ERROR_IF(named_curve->generate_key == NULL, S2N_ERR_ECDHE_GEN_KEY);
return named_curve->generate_key(named_curve, evp_pkey);
}
static int s2n_ecc_evp_compute_shared_secret(EVP_PKEY *own_key, EVP_PKEY *peer_public, uint16_t iana_id, struct s2n_blob *shared_secret)
{
POSIX_ENSURE_REF(peer_public);
POSIX_ENSURE_REF(own_key);
/* From RFC 8446(TLS1.3) Section 4.2.8.2: For the curves secp256r1, secp384r1, and secp521r1, peers MUST validate
* each other's public value Q by ensuring that the point is a valid point on the elliptic curve.
* For the curve x25519 and x448 the peer public-key validation check doesn't apply.
* From RFC 8422(TLS1.2) Section 5.11: With the NIST curves, each party MUST validate the public key sent by its peer
* in the ClientKeyExchange and ServerKeyExchange messages. A receiving party MUST check that the x and y parameters from
* the peer's public value satisfy the curve equation, y^2 = x^3 + ax + b mod p.
* Note that the `EC_KEY_check_key` validation is a MUST for only NIST curves, if a non-NIST curve is added to s2n-tls
* this is an additional validation step that increases security but decreases performance.
*/
if (iana_id != TLS_EC_CURVE_ECDH_X25519 && iana_id != TLS_EC_CURVE_ECDH_X448) {
DEFER_CLEANUP(EC_KEY *ec_key = EVP_PKEY_get1_EC_KEY(peer_public), EC_KEY_free_pointer);
S2N_ERROR_IF(ec_key == NULL, S2N_ERR_ECDHE_UNSUPPORTED_CURVE);
POSIX_GUARD_OSSL(EC_KEY_check_key(ec_key), S2N_ERR_ECDHE_SHARED_SECRET);
}
size_t shared_secret_size;
DEFER_CLEANUP(EVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new(own_key, NULL), EVP_PKEY_CTX_free_pointer);
S2N_ERROR_IF(ctx == NULL, S2N_ERR_ECDHE_SHARED_SECRET);
POSIX_GUARD_OSSL(EVP_PKEY_derive_init(ctx), S2N_ERR_ECDHE_SHARED_SECRET);
POSIX_GUARD_OSSL(EVP_PKEY_derive_set_peer(ctx, peer_public), S2N_ERR_ECDHE_SHARED_SECRET);
POSIX_GUARD_OSSL(EVP_PKEY_derive(ctx, NULL, &shared_secret_size), S2N_ERR_ECDHE_SHARED_SECRET);
POSIX_GUARD(s2n_alloc(shared_secret, shared_secret_size));
if (EVP_PKEY_derive(ctx, shared_secret->data, &shared_secret_size) != 1) {
POSIX_GUARD(s2n_free(shared_secret));
POSIX_BAIL(S2N_ERR_ECDHE_SHARED_SECRET);
}
return 0;
}
int s2n_ecc_evp_generate_ephemeral_key(struct s2n_ecc_evp_params *ecc_evp_params)
{
POSIX_ENSURE_REF(ecc_evp_params->negotiated_curve);
S2N_ERROR_IF(ecc_evp_params->evp_pkey != NULL, S2N_ERR_ECDHE_GEN_KEY);
S2N_ERROR_IF(s2n_ecc_evp_generate_own_key(ecc_evp_params->negotiated_curve, &ecc_evp_params->evp_pkey) != 0,
S2N_ERR_ECDHE_GEN_KEY);
S2N_ERROR_IF(ecc_evp_params->evp_pkey == NULL, S2N_ERR_ECDHE_GEN_KEY);
return 0;
}
int s2n_ecc_evp_compute_shared_secret_from_params(struct s2n_ecc_evp_params *private_ecc_evp_params,
struct s2n_ecc_evp_params *public_ecc_evp_params,
struct s2n_blob *shared_key)
{
POSIX_ENSURE_REF(private_ecc_evp_params->negotiated_curve);
POSIX_ENSURE_REF(private_ecc_evp_params->evp_pkey);
POSIX_ENSURE_REF(public_ecc_evp_params->negotiated_curve);
POSIX_ENSURE_REF(public_ecc_evp_params->evp_pkey);
S2N_ERROR_IF(private_ecc_evp_params->negotiated_curve->iana_id != public_ecc_evp_params->negotiated_curve->iana_id,
S2N_ERR_ECDHE_UNSUPPORTED_CURVE);
POSIX_GUARD(s2n_ecc_evp_compute_shared_secret(private_ecc_evp_params->evp_pkey, public_ecc_evp_params->evp_pkey,
private_ecc_evp_params->negotiated_curve->iana_id, shared_key));
return 0;
}
int s2n_ecc_evp_compute_shared_secret_as_server(struct s2n_ecc_evp_params *ecc_evp_params,
struct s2n_stuffer *Yc_in, struct s2n_blob *shared_key)
{
POSIX_ENSURE_REF(ecc_evp_params->negotiated_curve);
POSIX_ENSURE_REF(ecc_evp_params->evp_pkey);
POSIX_ENSURE_REF(Yc_in);
uint8_t client_public_len;
struct s2n_blob client_public_blob = { 0 };
DEFER_CLEANUP(EVP_PKEY *peer_key = EVP_PKEY_new(), EVP_PKEY_free_pointer);
S2N_ERROR_IF(peer_key == NULL, S2N_ERR_BAD_MESSAGE);
POSIX_GUARD(s2n_stuffer_read_uint8(Yc_in, &client_public_len));
client_public_blob.size = client_public_len;
client_public_blob.data = s2n_stuffer_raw_read(Yc_in, client_public_blob.size);
POSIX_ENSURE_REF(client_public_blob.data);
#if EVP_APIS_SUPPORTED
if (ecc_evp_params->negotiated_curve->libcrypto_nid == NID_X25519) {
POSIX_GUARD(EVP_PKEY_set_type(peer_key, ecc_evp_params->negotiated_curve->libcrypto_nid));
} else {
DEFER_CLEANUP(EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_EC, NULL), EVP_PKEY_CTX_free_pointer);
S2N_ERROR_IF(pctx == NULL, S2N_ERR_ECDHE_SERIALIZING);
POSIX_GUARD_OSSL(EVP_PKEY_paramgen_init(pctx), S2N_ERR_ECDHE_SERIALIZING);
POSIX_GUARD_OSSL(EVP_PKEY_CTX_set_ec_paramgen_curve_nid(pctx, ecc_evp_params->negotiated_curve->libcrypto_nid), S2N_ERR_ECDHE_SERIALIZING);
POSIX_GUARD_OSSL(EVP_PKEY_paramgen(pctx, &peer_key), S2N_ERR_ECDHE_SERIALIZING);
}
POSIX_GUARD_OSSL(EVP_PKEY_set1_tls_encodedpoint(peer_key, client_public_blob.data, client_public_blob.size),
S2N_ERR_ECDHE_SERIALIZING);
#else
DEFER_CLEANUP(EC_KEY *ec_key = EC_KEY_new_by_curve_name(ecc_evp_params->negotiated_curve->libcrypto_nid),
EC_KEY_free_pointer);
S2N_ERROR_IF(ec_key == NULL, S2N_ERR_ECDHE_UNSUPPORTED_CURVE);
DEFER_CLEANUP(EC_POINT *point = s2n_ecc_evp_blob_to_point(&client_public_blob, ec_key), EC_POINT_free_pointer);
S2N_ERROR_IF(point == NULL, S2N_ERR_BAD_MESSAGE);
int success = EC_KEY_set_public_key(ec_key, point);
POSIX_GUARD_OSSL(EVP_PKEY_set1_EC_KEY(peer_key, ec_key), S2N_ERR_ECDHE_SERIALIZING);
S2N_ERROR_IF(success == 0, S2N_ERR_BAD_MESSAGE);
#endif
return s2n_ecc_evp_compute_shared_secret(ecc_evp_params->evp_pkey, peer_key,
ecc_evp_params->negotiated_curve->iana_id, shared_key);
}
int s2n_ecc_evp_compute_shared_secret_as_client(struct s2n_ecc_evp_params *ecc_evp_params,
struct s2n_stuffer *Yc_out, struct s2n_blob *shared_key)
{
DEFER_CLEANUP(struct s2n_ecc_evp_params client_params = { 0 }, s2n_ecc_evp_params_free);
POSIX_ENSURE_REF(ecc_evp_params->negotiated_curve);
client_params.negotiated_curve = ecc_evp_params->negotiated_curve;
POSIX_GUARD(s2n_ecc_evp_generate_own_key(client_params.negotiated_curve, &client_params.evp_pkey));
S2N_ERROR_IF(client_params.evp_pkey == NULL, S2N_ERR_ECDHE_GEN_KEY);
if (s2n_ecc_evp_compute_shared_secret(client_params.evp_pkey, ecc_evp_params->evp_pkey, ecc_evp_params->negotiated_curve->iana_id, shared_key)
!= S2N_SUCCESS) {
POSIX_BAIL(S2N_ERR_ECDHE_SHARED_SECRET);
}
POSIX_GUARD(s2n_stuffer_write_uint8(Yc_out, client_params.negotiated_curve->share_size));
if (s2n_ecc_evp_write_params_point(&client_params, Yc_out) != 0) {
POSIX_BAIL(S2N_ERR_ECDHE_SERIALIZING);
}
return 0;
}
#if (!EVP_APIS_SUPPORTED)
static int s2n_ecc_evp_calculate_point_length(const EC_POINT *point, const EC_GROUP *group, uint8_t *length)
{
size_t ret = EC_POINT_point2oct(group, point, POINT_CONVERSION_UNCOMPRESSED, NULL, 0, NULL);
S2N_ERROR_IF(ret == 0, S2N_ERR_ECDHE_SERIALIZING);
S2N_ERROR_IF(ret > UINT8_MAX, S2N_ERR_ECDHE_SERIALIZING);
*length = (uint8_t) ret;
return 0;
}
static int s2n_ecc_evp_write_point_data_snug(const EC_POINT *point, const EC_GROUP *group, struct s2n_blob *out)
{
size_t ret = EC_POINT_point2oct(group, point, POINT_CONVERSION_UNCOMPRESSED, out->data, out->size, NULL);
S2N_ERROR_IF(ret != out->size, S2N_ERR_ECDHE_SERIALIZING);
return 0;
}
static EC_POINT *s2n_ecc_evp_blob_to_point(struct s2n_blob *blob, const EC_KEY *ec_key)
{
const EC_GROUP *group = EC_KEY_get0_group(ec_key);
EC_POINT *point = EC_POINT_new(group);
if (point == NULL) {
PTR_BAIL(S2N_ERR_ECDHE_UNSUPPORTED_CURVE);
}
if (EC_POINT_oct2point(group, point, blob->data, blob->size, NULL) != 1) {
EC_POINT_free(point);
PTR_BAIL(S2N_ERR_BAD_MESSAGE);
}
return point;
}
#endif
int s2n_ecc_evp_read_params_point(struct s2n_stuffer *in, int point_size, struct s2n_blob *point_blob)
{
POSIX_ENSURE_REF(in);
POSIX_ENSURE_REF(point_blob);
POSIX_ENSURE_GTE(point_size, 0);
/* Extract point from stuffer */
point_blob->size = point_size;
point_blob->data = s2n_stuffer_raw_read(in, point_size);
POSIX_ENSURE_REF(point_blob->data);
return 0;
}
int s2n_ecc_evp_read_params(struct s2n_stuffer *in, struct s2n_blob *data_to_verify,
struct s2n_ecdhe_raw_server_params *raw_server_ecc_params)
{
POSIX_ENSURE_REF(in);
uint8_t curve_type;
uint8_t point_length;
/* Remember where we started reading the data */
data_to_verify->data = s2n_stuffer_raw_read(in, 0);
POSIX_ENSURE_REF(data_to_verify->data);
/* Read the curve */
POSIX_GUARD(s2n_stuffer_read_uint8(in, &curve_type));
S2N_ERROR_IF(curve_type != TLS_EC_CURVE_TYPE_NAMED, S2N_ERR_BAD_MESSAGE);
raw_server_ecc_params->curve_blob.data = s2n_stuffer_raw_read(in, 2);
POSIX_ENSURE_REF(raw_server_ecc_params->curve_blob.data);
raw_server_ecc_params->curve_blob.size = 2;
/* Read the point */
POSIX_GUARD(s2n_stuffer_read_uint8(in, &point_length));
POSIX_GUARD(s2n_ecc_evp_read_params_point(in, point_length, &raw_server_ecc_params->point_blob));
/* curve type (1) + iana (2) + key share size (1) + key share */
data_to_verify->size = point_length + 4;
return 0;
}
int s2n_ecc_evp_write_params_point(struct s2n_ecc_evp_params *ecc_evp_params, struct s2n_stuffer *out)
{
POSIX_ENSURE_REF(ecc_evp_params);
POSIX_ENSURE_REF(ecc_evp_params->negotiated_curve);
POSIX_ENSURE_REF(ecc_evp_params->evp_pkey);
POSIX_ENSURE_REF(out);
#if EVP_APIS_SUPPORTED
struct s2n_blob point_blob = { 0 };
uint8_t *encoded_point = NULL;
size_t size = EVP_PKEY_get1_tls_encodedpoint(ecc_evp_params->evp_pkey, &encoded_point);
if (size != ecc_evp_params->negotiated_curve->share_size) {
OPENSSL_free(encoded_point);
POSIX_BAIL(S2N_ERR_ECDHE_SERIALIZING);
} else {
point_blob.data = s2n_stuffer_raw_write(out, ecc_evp_params->negotiated_curve->share_size);
POSIX_ENSURE_REF(point_blob.data);
POSIX_CHECKED_MEMCPY(point_blob.data, encoded_point, size);
OPENSSL_free(encoded_point);
}
#else
uint8_t point_len;
struct s2n_blob point_blob = { 0 };
DEFER_CLEANUP(EC_KEY *ec_key = EVP_PKEY_get1_EC_KEY(ecc_evp_params->evp_pkey), EC_KEY_free_pointer);
S2N_ERROR_IF(ec_key == NULL, S2N_ERR_ECDHE_UNSUPPORTED_CURVE);
const EC_POINT *point = EC_KEY_get0_public_key(ec_key);
const EC_GROUP *group = EC_KEY_get0_group(ec_key);
S2N_ERROR_IF(point == NULL || group == NULL, S2N_ERR_ECDHE_UNSUPPORTED_CURVE);
POSIX_GUARD(s2n_ecc_evp_calculate_point_length(point, group, &point_len));
S2N_ERROR_IF(point_len != ecc_evp_params->negotiated_curve->share_size, S2N_ERR_ECDHE_SERIALIZING);
point_blob.data = s2n_stuffer_raw_write(out, point_len);
POSIX_ENSURE_REF(point_blob.data);
point_blob.size = point_len;
POSIX_GUARD(s2n_ecc_evp_write_point_data_snug(point, group, &point_blob));
#endif
return 0;
}
int s2n_ecc_evp_write_params(struct s2n_ecc_evp_params *ecc_evp_params, struct s2n_stuffer *out,
struct s2n_blob *written)
{
POSIX_ENSURE_REF(ecc_evp_params);
POSIX_ENSURE_REF(ecc_evp_params->negotiated_curve);
POSIX_ENSURE_REF(ecc_evp_params->evp_pkey);
POSIX_ENSURE_REF(out);
POSIX_ENSURE_REF(written);
uint8_t key_share_size = ecc_evp_params->negotiated_curve->share_size;
/* Remember where the written data starts */
written->data = s2n_stuffer_raw_write(out, 0);
POSIX_ENSURE_REF(written->data);
POSIX_GUARD(s2n_stuffer_write_uint8(out, TLS_EC_CURVE_TYPE_NAMED));
POSIX_GUARD(s2n_stuffer_write_uint16(out, ecc_evp_params->negotiated_curve->iana_id));
POSIX_GUARD(s2n_stuffer_write_uint8(out, key_share_size));
POSIX_GUARD(s2n_ecc_evp_write_params_point(ecc_evp_params, out));
/* key share + key share size (1) + iana (2) + curve type (1) */
written->size = key_share_size + 4;
return written->size;
}
int s2n_ecc_evp_parse_params_point(struct s2n_blob *point_blob, struct s2n_ecc_evp_params *ecc_evp_params)
{
POSIX_ENSURE_REF(point_blob->data);
POSIX_ENSURE_REF(ecc_evp_params->negotiated_curve);
S2N_ERROR_IF(point_blob->size != ecc_evp_params->negotiated_curve->share_size, S2N_ERR_ECDHE_SERIALIZING);
#if EVP_APIS_SUPPORTED
if (ecc_evp_params->negotiated_curve->libcrypto_nid == NID_X25519) {
if (ecc_evp_params->evp_pkey == NULL) {
ecc_evp_params->evp_pkey = EVP_PKEY_new();
}
S2N_ERROR_IF(ecc_evp_params->evp_pkey == NULL, S2N_ERR_BAD_MESSAGE);
POSIX_GUARD(EVP_PKEY_set_type(ecc_evp_params->evp_pkey, ecc_evp_params->negotiated_curve->libcrypto_nid));
} else {
DEFER_CLEANUP(EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_EC, NULL), EVP_PKEY_CTX_free_pointer);
S2N_ERROR_IF(pctx == NULL, S2N_ERR_ECDHE_SERIALIZING);
POSIX_GUARD_OSSL(EVP_PKEY_paramgen_init(pctx), S2N_ERR_ECDHE_SERIALIZING);
POSIX_GUARD_OSSL(EVP_PKEY_CTX_set_ec_paramgen_curve_nid(pctx, ecc_evp_params->negotiated_curve->libcrypto_nid), S2N_ERR_ECDHE_SERIALIZING);
POSIX_GUARD_OSSL(EVP_PKEY_paramgen(pctx, &ecc_evp_params->evp_pkey), S2N_ERR_ECDHE_SERIALIZING);
}
POSIX_GUARD_OSSL(EVP_PKEY_set1_tls_encodedpoint(ecc_evp_params->evp_pkey, point_blob->data, point_blob->size),
S2N_ERR_ECDHE_SERIALIZING);
#else
if (ecc_evp_params->evp_pkey == NULL) {
ecc_evp_params->evp_pkey = EVP_PKEY_new();
}
S2N_ERROR_IF(ecc_evp_params->evp_pkey == NULL, S2N_ERR_BAD_MESSAGE);
/* Create a key to store the point */
DEFER_CLEANUP(EC_KEY *ec_key = EC_KEY_new_by_curve_name(ecc_evp_params->negotiated_curve->libcrypto_nid),
EC_KEY_free_pointer);
S2N_ERROR_IF(ec_key == NULL, S2N_ERR_ECDHE_UNSUPPORTED_CURVE);
/* Parse and store the server public point */
DEFER_CLEANUP(EC_POINT *point = s2n_ecc_evp_blob_to_point(point_blob, ec_key), EC_POINT_free_pointer);
S2N_ERROR_IF(point == NULL, S2N_ERR_BAD_MESSAGE);
/* Set the point as the public key */
int success = EC_KEY_set_public_key(ec_key, point);
POSIX_GUARD_OSSL(EVP_PKEY_set1_EC_KEY(ecc_evp_params->evp_pkey, ec_key), S2N_ERR_ECDHE_SERIALIZING);
/* EC_KEY_set_public_key returns 1 on success, 0 on failure */
S2N_ERROR_IF(success == 0, S2N_ERR_BAD_MESSAGE);
#endif
return 0;
}
int s2n_ecc_evp_parse_params(struct s2n_connection *conn, struct s2n_ecdhe_raw_server_params *raw_server_ecc_params,
struct s2n_ecc_evp_params *ecc_evp_params)
{
POSIX_ENSURE(s2n_ecc_evp_find_supported_curve(conn, &raw_server_ecc_params->curve_blob, &ecc_evp_params->negotiated_curve) == 0,
S2N_ERR_ECDHE_UNSUPPORTED_CURVE);
return s2n_ecc_evp_parse_params_point(&raw_server_ecc_params->point_blob, ecc_evp_params);
}
int s2n_ecc_evp_find_supported_curve(struct s2n_connection *conn, struct s2n_blob *iana_ids, const struct s2n_ecc_named_curve **found)
{
const struct s2n_ecc_preferences *ecc_prefs = NULL;
POSIX_GUARD(s2n_connection_get_ecc_preferences(conn, &ecc_prefs));
POSIX_ENSURE_REF(ecc_prefs);
struct s2n_stuffer iana_ids_in = { 0 };
POSIX_GUARD(s2n_stuffer_init(&iana_ids_in, iana_ids));
POSIX_GUARD(s2n_stuffer_write(&iana_ids_in, iana_ids));
for (size_t i = 0; i < ecc_prefs->count; i++) {
const struct s2n_ecc_named_curve *supported_curve = ecc_prefs->ecc_curves[i];
for (uint32_t j = 0; j < iana_ids->size / 2; j++) {
uint16_t iana_id;
POSIX_GUARD(s2n_stuffer_read_uint16(&iana_ids_in, &iana_id));
if (supported_curve->iana_id == iana_id) {
*found = supported_curve;
return 0;
}
}
POSIX_GUARD(s2n_stuffer_reread(&iana_ids_in));
}
POSIX_BAIL(S2N_ERR_ECDHE_UNSUPPORTED_CURVE);
}
int s2n_ecc_evp_params_free(struct s2n_ecc_evp_params *ecc_evp_params)
{
if (ecc_evp_params->evp_pkey != NULL) {
EVP_PKEY_free(ecc_evp_params->evp_pkey);
ecc_evp_params->evp_pkey = NULL;
}
return 0;
}
|