diff options
| author | June McEnroe <june@causal.agency> | 2022-02-27 10:45:37 -0500 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2022-02-27 11:12:54 -0500 |
| commit | 4c03fbdd28a3781fb876a9d6b674ce243fbb035c (patch) | |
| tree | 5bee8b7ac37a08f002fd0d75c0a5c3c30ea3f1e7 | |
| parent | Merge LibreSSL 3.5.0 (diff) | |
| download | libretls-4c03fbdd28a3781fb876a9d6b674ce243fbb035c.tar.gz libretls-4c03fbdd28a3781fb876a9d6b674ce243fbb035c.zip | |
tls: Replace ECDSA_METHOD with EC_KEY_METHOD
| -rw-r--r-- | tls.c | 6 | ||||
| -rw-r--r-- | tls_internal.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tls.c b/tls.c index 1dcf933..6883c58 100644 --- a/tls.c +++ b/tls.c @@ -449,7 +449,7 @@ static int tls_keypair_setup_pkey(struct tls *ctx, struct tls_keypair *keypair, EVP_PKEY *pkey) { RSA_METHOD *rsa_method; - ECDSA_METHOD *ecdsa_method; + EC_KEY_METHOD *ecdsa_method; RSA *rsa = NULL; EC_KEY *eckey = NULL; int ret = -1; @@ -488,8 +488,8 @@ tls_keypair_setup_pkey(struct tls *ctx, struct tls_keypair *keypair, EVP_PKEY *p if (ctx->config->sign_cb == NULL) break; if ((ecdsa_method = tls_signer_ecdsa_method()) == NULL || - ECDSA_set_ex_data(eckey, 1, ctx->config) == 0 || - ECDSA_set_method(eckey, ecdsa_method) == 0) { + EC_KEY_set_ex_data(eckey, 1, ctx->config) == 0 || + EC_KEY_set_method(eckey, ecdsa_method) == 0) { tls_set_errorx(ctx, "failed to setup EC key"); goto err; } diff --git a/tls_internal.h b/tls_internal.h index c4e62b3..e3f177d 100644 --- a/tls_internal.h +++ b/tls_internal.h @@ -290,7 +290,7 @@ int tls_cert_pubkey_hash(X509 *_cert, char **_hash); int tls_password_cb(char *_buf, int _size, int _rwflag, void *_u); RSA_METHOD *tls_signer_rsa_method(void); -ECDSA_METHOD *tls_signer_ecdsa_method(void); +EC_KEY_METHOD *tls_signer_ecdsa_method(void); __END_HIDDEN_DECLS |