diff options
author | jsing <> | 2022-07-02 19:36:07 +0000 |
---|---|---|
committer | jsing <> | 2022-07-02 19:36:07 +0000 |
commit | d82f91577dd90497c70c3ed9c9138c349cde1ed3 (patch) | |
tree | 5fcdca687c836408ba763a99376d4a8e017e9f8f | |
parent | 963c47667fc47c301ad45580a2b27b25cf2a3c6d (diff) | |
download | openbsd-d82f91577dd90497c70c3ed9c9138c349cde1ed3.tar.gz openbsd-d82f91577dd90497c70c3ed9c9138c349cde1ed3.tar.bz2 openbsd-d82f91577dd90497c70c3ed9c9138c349cde1ed3.zip |
Call certificate variables cert and certs, rather than x and sk
ok tb@
-rw-r--r-- | src/lib/libssl/ssl_cert.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c index b5db579489..fc45e6b10d 100644 --- a/src/lib/libssl/ssl_cert.c +++ b/src/lib/libssl/ssl_cert.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_cert.c,v 1.101 2022/06/29 21:18:04 tb Exp $ */ | 1 | /* $OpenBSD: ssl_cert.c,v 1.102 2022/07/02 19:36:07 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -397,21 +397,21 @@ ssl_cert_add1_chain_cert(SSL_CTX *ctx, SSL *ssl, X509 *cert) | |||
397 | } | 397 | } |
398 | 398 | ||
399 | int | 399 | int |
400 | ssl_verify_cert_chain(SSL *s, STACK_OF(X509) *sk) | 400 | ssl_verify_cert_chain(SSL *s, STACK_OF(X509) *certs) |
401 | { | 401 | { |
402 | X509_STORE_CTX *ctx = NULL; | 402 | X509_STORE_CTX *ctx = NULL; |
403 | X509_VERIFY_PARAM *param; | 403 | X509_VERIFY_PARAM *param; |
404 | X509 *x; | 404 | X509 *cert; |
405 | int ret = 0; | 405 | int ret = 0; |
406 | 406 | ||
407 | if ((sk == NULL) || (sk_X509_num(sk) == 0)) | 407 | if (sk_X509_num(certs) < 1) |
408 | goto err; | 408 | goto err; |
409 | 409 | ||
410 | if ((ctx = X509_STORE_CTX_new()) == NULL) | 410 | if ((ctx = X509_STORE_CTX_new()) == NULL) |
411 | goto err; | 411 | goto err; |
412 | 412 | ||
413 | x = sk_X509_value(sk, 0); | 413 | cert = sk_X509_value(certs, 0); |
414 | if (!X509_STORE_CTX_init(ctx, s->ctx->cert_store, x, sk)) { | 414 | if (!X509_STORE_CTX_init(ctx, s->ctx->cert_store, cert, certs)) { |
415 | SSLerror(s, ERR_R_X509_LIB); | 415 | SSLerror(s, ERR_R_X509_LIB); |
416 | goto err; | 416 | goto err; |
417 | } | 417 | } |