diff options
Diffstat (limited to 'src/lib/libtls/tls.c')
-rw-r--r-- | src/lib/libtls/tls.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libtls/tls.c b/src/lib/libtls/tls.c index 989339dc03..8444169bdc 100644 --- a/src/lib/libtls/tls.c +++ b/src/lib/libtls/tls.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls.c,v 1.96 2023/05/25 07:46:21 op Exp $ */ | 1 | /* $OpenBSD: tls.c,v 1.97 2023/06/18 11:43:03 op Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -389,7 +389,7 @@ static int | |||
389 | tls_keypair_setup_pkey(struct tls *ctx, struct tls_keypair *keypair, EVP_PKEY *pkey) | 389 | tls_keypair_setup_pkey(struct tls *ctx, struct tls_keypair *keypair, EVP_PKEY *pkey) |
390 | { | 390 | { |
391 | RSA_METHOD *rsa_method; | 391 | RSA_METHOD *rsa_method; |
392 | ECDSA_METHOD *ecdsa_method; | 392 | EC_KEY_METHOD *ecdsa_method; |
393 | RSA *rsa = NULL; | 393 | RSA *rsa = NULL; |
394 | EC_KEY *eckey = NULL; | 394 | EC_KEY *eckey = NULL; |
395 | int ret = -1; | 395 | int ret = -1; |
@@ -427,15 +427,15 @@ tls_keypair_setup_pkey(struct tls *ctx, struct tls_keypair *keypair, EVP_PKEY *p | |||
427 | break; | 427 | break; |
428 | case EVP_PKEY_EC: | 428 | case EVP_PKEY_EC: |
429 | if ((eckey = EVP_PKEY_get1_EC_KEY(pkey)) == NULL || | 429 | if ((eckey = EVP_PKEY_get1_EC_KEY(pkey)) == NULL || |
430 | ECDSA_set_ex_data(eckey, 0, keypair->pubkey_hash) == 0) { | 430 | EC_KEY_set_ex_data(eckey, 0, keypair->pubkey_hash) == 0) { |
431 | tls_set_errorx(ctx, "EC key setup failure"); | 431 | tls_set_errorx(ctx, "EC key setup failure"); |
432 | goto err; | 432 | goto err; |
433 | } | 433 | } |
434 | if (ctx->config->sign_cb != NULL) { | 434 | if (ctx->config->sign_cb != NULL) { |
435 | ecdsa_method = tls_signer_ecdsa_method(); | 435 | ecdsa_method = tls_signer_ecdsa_method(); |
436 | if (ecdsa_method == NULL || | 436 | if (ecdsa_method == NULL || |
437 | ECDSA_set_ex_data(eckey, 1, ctx->config) == 0 || | 437 | EC_KEY_set_ex_data(eckey, 1, ctx->config) == 0 || |
438 | ECDSA_set_method(eckey, ecdsa_method) == 0) { | 438 | EC_KEY_set_method(eckey, ecdsa_method) == 0) { |
439 | tls_set_errorx(ctx, "failed to setup EC key"); | 439 | tls_set_errorx(ctx, "failed to setup EC key"); |
440 | goto err; | 440 | goto err; |
441 | } | 441 | } |