From 602015baf6c8447f8d9f3fccd7808d7d5723f794 Mon Sep 17 00:00:00 2001 From: tb <> Date: Wed, 18 Nov 2020 17:00:59 +0000 Subject: KNF (whitespace) --- src/lib/libcrypto/x509/x509_constraints.c | 4 ++-- src/lib/libcrypto/x509/x509_internal.h | 6 +++--- src/lib/libcrypto/x509/x509_issuer_cache.c | 12 ++++++------ src/lib/libcrypto/x509/x509_vfy.c | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/lib') diff --git a/src/lib/libcrypto/x509/x509_constraints.c b/src/lib/libcrypto/x509/x509_constraints.c index 5659d6e6a7..dc91c00345 100644 --- a/src/lib/libcrypto/x509/x509_constraints.c +++ b/src/lib/libcrypto/x509/x509_constraints.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_constraints.c,v 1.10 2020/09/21 05:41:43 tb Exp $ */ +/* $OpenBSD: x509_constraints.c,v 1.11 2020/11/18 17:00:59 tb Exp $ */ /* * Copyright (c) 2020 Bob Beck * @@ -700,7 +700,7 @@ x509_constraints_extract_names(struct x509_constraints_names *names, *error = X509_V_ERR_OUT_OF_MEM; goto err; } - vname->type=GEN_DNS; + vname->type = GEN_DNS; include_cn = 0; /* don't use cn from subject */ break; case GEN_EMAIL: diff --git a/src/lib/libcrypto/x509/x509_internal.h b/src/lib/libcrypto/x509/x509_internal.h index f6887be5fb..2f2fe47a8f 100644 --- a/src/lib/libcrypto/x509/x509_internal.h +++ b/src/lib/libcrypto/x509/x509_internal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_internal.h,v 1.4 2020/11/11 18:49:34 jsing Exp $ */ +/* $OpenBSD: x509_internal.h,v 1.5 2020/11/18 17:00:59 tb Exp $ */ /* * Copyright (c) 2020 Bob Beck * @@ -73,8 +73,8 @@ struct x509_verify_ctx { size_t max_depth; /* Max chain depth for validation */ size_t max_sigs; /* Max number of signature checks */ size_t sig_checks; /* Number of signature checks done */ - size_t error_depth; /* Depth of last error seen */ - int error; /* Last error seen */ + size_t error_depth; /* Depth of last error seen */ + int error; /* Last error seen */ }; int ASN1_time_tm_clamp_notafter(struct tm *tm); diff --git a/src/lib/libcrypto/x509/x509_issuer_cache.c b/src/lib/libcrypto/x509/x509_issuer_cache.c index 6831c18986..26cde17239 100644 --- a/src/lib/libcrypto/x509/x509_issuer_cache.c +++ b/src/lib/libcrypto/x509/x509_issuer_cache.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_issuer_cache.c,v 1.1 2020/09/11 14:30:51 beck Exp $ */ +/* $OpenBSD: x509_issuer_cache.c,v 1.2 2020/11/18 17:00:59 tb Exp $ */ /* * Copyright (c) 2020 Bob Beck * @@ -77,9 +77,9 @@ x509_issuer_cache_set_max(size_t max) * Find a previous result of checking if parent signed child * * Returns: - * -1 : No entry exists in the cache. signature must be checked. - * 0 : The signature of parent signing child is invalid. - * 1 : The signature of parent signing child is valid. + * -1 : No entry exists in the cache. signature must be checked. + * 0 : The signature of parent signing child is invalid. + * 1 : The signature of parent signing child is valid. */ int x509_issuer_cache_find(unsigned char *parent_md, unsigned char *child_md) @@ -98,7 +98,7 @@ x509_issuer_cache_find(unsigned char *parent_md, unsigned char *child_md) return -1; if ((found = RB_FIND(x509_issuer_tree, &x509_issuer_cache, &candidate)) != NULL) { - TAILQ_REMOVE(&x509_issuer_lru, found, queue); + TAILQ_REMOVE(&x509_issuer_lru, found, queue); TAILQ_INSERT_HEAD(&x509_issuer_lru, found, queue); ret = found->valid; } @@ -111,7 +111,7 @@ x509_issuer_cache_find(unsigned char *parent_md, unsigned char *child_md) * Attempt to add a validation result to the cache. * * valid must be: - * 0: The signature of parent signing child is invalid. + * 0: The signature of parent signing child is invalid. * 1: The signature of parent signing child is valid. * * Previously added entries for the same parent and child are *not* replaced. diff --git a/src/lib/libcrypto/x509/x509_vfy.c b/src/lib/libcrypto/x509/x509_vfy.c index fe1431ce49..38ae515871 100644 --- a/src/lib/libcrypto/x509/x509_vfy.c +++ b/src/lib/libcrypto/x509/x509_vfy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_vfy.c,v 1.81 2020/09/26 02:06:28 deraadt Exp $ */ +/* $OpenBSD: x509_vfy.c,v 1.82 2020/11/18 17:00:59 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -654,7 +654,7 @@ X509_verify_cert(X509_STORE_CTX *ctx) CRYPTO_w_lock(CRYPTO_LOCK_X509_STORE); if ((objs = X509_STORE_get0_objects(ctx->ctx)) == NULL) - good = 0; + good = 0; for (i = 0; good && i < sk_X509_OBJECT_num(objs); i++) { X509_OBJECT *obj; X509 *root; -- cgit v1.2.3-55-g6feb