summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2020-11-18 17:00:59 +0000
committertb <>2020-11-18 17:00:59 +0000
commit602015baf6c8447f8d9f3fccd7808d7d5723f794 (patch)
tree5779516d8d05f60ff49265a2a2a693782d1b870e
parent4aa1ce4b39e163abed6baa39b08ca167d77ce379 (diff)
downloadopenbsd-602015baf6c8447f8d9f3fccd7808d7d5723f794.tar.gz
openbsd-602015baf6c8447f8d9f3fccd7808d7d5723f794.tar.bz2
openbsd-602015baf6c8447f8d9f3fccd7808d7d5723f794.zip
KNF (whitespace)
-rw-r--r--src/lib/libcrypto/x509/x509_constraints.c4
-rw-r--r--src/lib/libcrypto/x509/x509_internal.h6
-rw-r--r--src/lib/libcrypto/x509/x509_issuer_cache.c12
-rw-r--r--src/lib/libcrypto/x509/x509_vfy.c4
4 files changed, 13 insertions, 13 deletions
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 @@
1/* $OpenBSD: x509_constraints.c,v 1.10 2020/09/21 05:41:43 tb Exp $ */ 1/* $OpenBSD: x509_constraints.c,v 1.11 2020/11/18 17:00:59 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2020 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2020 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -700,7 +700,7 @@ x509_constraints_extract_names(struct x509_constraints_names *names,
700 *error = X509_V_ERR_OUT_OF_MEM; 700 *error = X509_V_ERR_OUT_OF_MEM;
701 goto err; 701 goto err;
702 } 702 }
703 vname->type=GEN_DNS; 703 vname->type = GEN_DNS;
704 include_cn = 0; /* don't use cn from subject */ 704 include_cn = 0; /* don't use cn from subject */
705 break; 705 break;
706 case GEN_EMAIL: 706 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 @@
1/* $OpenBSD: x509_internal.h,v 1.4 2020/11/11 18:49:34 jsing Exp $ */ 1/* $OpenBSD: x509_internal.h,v 1.5 2020/11/18 17:00:59 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2020 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2020 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -73,8 +73,8 @@ struct x509_verify_ctx {
73 size_t max_depth; /* Max chain depth for validation */ 73 size_t max_depth; /* Max chain depth for validation */
74 size_t max_sigs; /* Max number of signature checks */ 74 size_t max_sigs; /* Max number of signature checks */
75 size_t sig_checks; /* Number of signature checks done */ 75 size_t sig_checks; /* Number of signature checks done */
76 size_t error_depth; /* Depth of last error seen */ 76 size_t error_depth; /* Depth of last error seen */
77 int error; /* Last error seen */ 77 int error; /* Last error seen */
78}; 78};
79 79
80int ASN1_time_tm_clamp_notafter(struct tm *tm); 80int 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 @@
1/* $OpenBSD: x509_issuer_cache.c,v 1.1 2020/09/11 14:30:51 beck Exp $ */ 1/* $OpenBSD: x509_issuer_cache.c,v 1.2 2020/11/18 17:00:59 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2020 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2020 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -77,9 +77,9 @@ x509_issuer_cache_set_max(size_t max)
77 * Find a previous result of checking if parent signed child 77 * Find a previous result of checking if parent signed child
78 * 78 *
79 * Returns: 79 * Returns:
80 * -1 : No entry exists in the cache. signature must be checked. 80 * -1 : No entry exists in the cache. signature must be checked.
81 * 0 : The signature of parent signing child is invalid. 81 * 0 : The signature of parent signing child is invalid.
82 * 1 : The signature of parent signing child is valid. 82 * 1 : The signature of parent signing child is valid.
83 */ 83 */
84int 84int
85x509_issuer_cache_find(unsigned char *parent_md, unsigned char *child_md) 85x509_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)
98 return -1; 98 return -1;
99 if ((found = RB_FIND(x509_issuer_tree, &x509_issuer_cache, 99 if ((found = RB_FIND(x509_issuer_tree, &x509_issuer_cache,
100 &candidate)) != NULL) { 100 &candidate)) != NULL) {
101 TAILQ_REMOVE(&x509_issuer_lru, found, queue); 101 TAILQ_REMOVE(&x509_issuer_lru, found, queue);
102 TAILQ_INSERT_HEAD(&x509_issuer_lru, found, queue); 102 TAILQ_INSERT_HEAD(&x509_issuer_lru, found, queue);
103 ret = found->valid; 103 ret = found->valid;
104 } 104 }
@@ -111,7 +111,7 @@ x509_issuer_cache_find(unsigned char *parent_md, unsigned char *child_md)
111 * Attempt to add a validation result to the cache. 111 * Attempt to add a validation result to the cache.
112 * 112 *
113 * valid must be: 113 * valid must be:
114 * 0: The signature of parent signing child is invalid. 114 * 0: The signature of parent signing child is invalid.
115 * 1: The signature of parent signing child is valid. 115 * 1: The signature of parent signing child is valid.
116 * 116 *
117 * Previously added entries for the same parent and child are *not* replaced. 117 * 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 @@
1/* $OpenBSD: x509_vfy.c,v 1.81 2020/09/26 02:06:28 deraadt Exp $ */ 1/* $OpenBSD: x509_vfy.c,v 1.82 2020/11/18 17:00:59 tb 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 *
@@ -654,7 +654,7 @@ X509_verify_cert(X509_STORE_CTX *ctx)
654 654
655 CRYPTO_w_lock(CRYPTO_LOCK_X509_STORE); 655 CRYPTO_w_lock(CRYPTO_LOCK_X509_STORE);
656 if ((objs = X509_STORE_get0_objects(ctx->ctx)) == NULL) 656 if ((objs = X509_STORE_get0_objects(ctx->ctx)) == NULL)
657 good = 0; 657 good = 0;
658 for (i = 0; good && i < sk_X509_OBJECT_num(objs); i++) { 658 for (i = 0; good && i < sk_X509_OBJECT_num(objs); i++) {
659 X509_OBJECT *obj; 659 X509_OBJECT *obj;
660 X509 *root; 660 X509 *root;