From dc6c56e417f73129ab2e1f477f2816f0cb654ff5 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Sat, 8 Jan 2022 12:43:45 +0000 Subject: Rename CERT to SSL_CERT and CERT_PKEY to SSL_CERT_PKEY. Nearly all structs in libssl start with an SSL_ suffix, rename CERT and CERT_PKEY for consistency. ok inoguchi@ tb@ --- src/lib/libssl/tls13_server.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/lib/libssl/tls13_server.c') diff --git a/src/lib/libssl/tls13_server.c b/src/lib/libssl/tls13_server.c index c32ae22779..4edf3881c2 100644 --- a/src/lib/libssl/tls13_server.c +++ b/src/lib/libssl/tls13_server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls13_server.c,v 1.91 2022/01/07 15:46:30 jsing Exp $ */ +/* $OpenBSD: tls13_server.c,v 1.92 2022/01/08 12:43:45 jsing Exp $ */ /* * Copyright (c) 2019, 2020 Joel Sing * Copyright (c) 2020 Bob Beck @@ -545,7 +545,7 @@ tls13_server_certificate_request_send(struct tls13_ctx *ctx, CBB *cbb) } static int -tls13_server_check_certificate(struct tls13_ctx *ctx, CERT_PKEY *cpk, +tls13_server_check_certificate(struct tls13_ctx *ctx, SSL_CERT_PKEY *cpk, int *ok, const struct ssl_sigalg **out_sigalg) { const struct ssl_sigalg *sigalg; @@ -575,12 +575,12 @@ tls13_server_check_certificate(struct tls13_ctx *ctx, CERT_PKEY *cpk, } static int -tls13_server_select_certificate(struct tls13_ctx *ctx, CERT_PKEY **out_cpk, +tls13_server_select_certificate(struct tls13_ctx *ctx, SSL_CERT_PKEY **out_cpk, const struct ssl_sigalg **out_sigalg) { SSL *s = ctx->ssl; const struct ssl_sigalg *sigalg; - CERT_PKEY *cpk; + SSL_CERT_PKEY *cpk; int cert_ok; *out_cpk = NULL; @@ -616,7 +616,7 @@ tls13_server_certificate_send(struct tls13_ctx *ctx, CBB *cbb) const struct ssl_sigalg *sigalg; X509_STORE_CTX *xsc = NULL; STACK_OF(X509) *chain; - CERT_PKEY *cpk; + SSL_CERT_PKEY *cpk; X509 *cert; int i, ret = 0; @@ -697,7 +697,7 @@ tls13_server_certificate_verify_send(struct tls13_ctx *ctx, CBB *cbb) EVP_MD_CTX *mdctx = NULL; EVP_PKEY_CTX *pctx; EVP_PKEY *pkey; - const CERT_PKEY *cpk; + const SSL_CERT_PKEY *cpk; CBB sig_cbb; int ret = 0; -- cgit v1.2.3-55-g6feb