summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto')
-rw-r--r--src/lib/libcrypto/aes/aes.c4
-rw-r--r--src/lib/libcrypto/pem/pem_info.c6
-rw-r--r--src/lib/libcrypto/x509/x509_constraints.c12
-rw-r--r--src/lib/libcrypto/x509/x509_policy.c4
-rw-r--r--src/lib/libcrypto/x509/x509_verify.c6
5 files changed, 16 insertions, 16 deletions
diff --git a/src/lib/libcrypto/aes/aes.c b/src/lib/libcrypto/aes/aes.c
index 027cb84064..db693d2dd8 100644
--- a/src/lib/libcrypto/aes/aes.c
+++ b/src/lib/libcrypto/aes/aes.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: aes.c,v 1.18 2026/07/31 00:50:52 kenjiro Exp $ */ 1/* $OpenBSD: aes.c,v 1.19 2026/07/31 03:59:50 kenjiro Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 2002-2006 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 2002-2006 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -136,7 +136,7 @@ aes_encrypt_block128(const unsigned char *in, unsigned char *out, const void *ke
136 aes_encrypt_internal(in, out, key); 136 aes_encrypt_internal(in, out, key);
137} 137}
138 138
139void 139static void
140aes_decrypt_block128(const unsigned char *in, unsigned char *out, const void *key) 140aes_decrypt_block128(const unsigned char *in, unsigned char *out, const void *key)
141{ 141{
142 aes_decrypt_internal(in, out, key); 142 aes_decrypt_internal(in, out, key);
diff --git a/src/lib/libcrypto/pem/pem_info.c b/src/lib/libcrypto/pem/pem_info.c
index 26061f6f08..24f0ddb011 100644
--- a/src/lib/libcrypto/pem/pem_info.c
+++ b/src/lib/libcrypto/pem/pem_info.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pem_info.c,v 1.33 2025/07/16 15:59:26 tb Exp $ */ 1/* $OpenBSD: pem_info.c,v 1.34 2026/07/31 03:59:50 kenjiro 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 *
@@ -77,7 +77,7 @@
77#include "err_local.h" 77#include "err_local.h"
78#include "evp_local.h" 78#include "evp_local.h"
79 79
80X509_PKEY * 80static X509_PKEY *
81X509_PKEY_new(void) 81X509_PKEY_new(void)
82{ 82{
83 X509_PKEY *x_pkey; 83 X509_PKEY *x_pkey;
@@ -90,7 +90,7 @@ X509_PKEY_new(void)
90 return x_pkey; 90 return x_pkey;
91} 91}
92 92
93void 93static void
94X509_PKEY_free(X509_PKEY *x_pkey) 94X509_PKEY_free(X509_PKEY *x_pkey)
95{ 95{
96 if (x_pkey == NULL) 96 if (x_pkey == NULL)
diff --git a/src/lib/libcrypto/x509/x509_constraints.c b/src/lib/libcrypto/x509/x509_constraints.c
index 61a08cacef..be93f3fd6c 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.34 2026/07/14 15:52:52 jsing Exp $ */ 1/* $OpenBSD: x509_constraints.c,v 1.35 2026/07/31 03:59:50 kenjiro Exp $ */
2/* 2/*
3 * Copyright (c) 2020 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2020 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -76,7 +76,7 @@ host_is_ip_address(CBS *cbs, int *is_ip)
76 return 1; 76 return 1;
77} 77}
78 78
79struct x509_constraints_name * 79static struct x509_constraints_name *
80x509_constraints_name_new(void) 80x509_constraints_name_new(void)
81{ 81{
82 return (calloc(1, sizeof(struct x509_constraints_name))); 82 return (calloc(1, sizeof(struct x509_constraints_name)));
@@ -100,7 +100,7 @@ x509_constraints_name_free(struct x509_constraints_name *name)
100 free(name); 100 free(name);
101} 101}
102 102
103struct x509_constraints_name * 103static struct x509_constraints_name *
104x509_constraints_name_dup(struct x509_constraints_name *name) 104x509_constraints_name_dup(struct x509_constraints_name *name)
105{ 105{
106 struct x509_constraints_name *new; 106 struct x509_constraints_name *new;
@@ -724,7 +724,7 @@ x509_constraints_uri(uint8_t *uri, size_t ulen, uint8_t *constraint,
724 * respectively for ipv4 addresses and constraints, and a length of 724 * respectively for ipv4 addresses and constraints, and a length of
725 * 16 and 32 respectively for ipv6 address constraints by the caller. 725 * 16 and 32 respectively for ipv6 address constraints by the caller.
726 */ 726 */
727int 727static int
728x509_constraints_ipaddr(uint8_t *address, size_t alen, uint8_t *constraint, 728x509_constraints_ipaddr(uint8_t *address, size_t alen, uint8_t *constraint,
729 size_t len) 729 size_t len)
730{ 730{
@@ -746,7 +746,7 @@ x509_constraints_ipaddr(uint8_t *address, size_t alen, uint8_t *constraint,
746 * Verify a canonicalized der encoded constraint dirname 746 * Verify a canonicalized der encoded constraint dirname
747 * a canonicalized der encoded constraint. 747 * a canonicalized der encoded constraint.
748 */ 748 */
749int 749static int
750x509_constraints_dirname(uint8_t *dirname, size_t dlen, 750x509_constraints_dirname(uint8_t *dirname, size_t dlen,
751 uint8_t *constraint, size_t len) 751 uint8_t *constraint, size_t len)
752{ 752{
@@ -1194,7 +1194,7 @@ x509_constraints_extract_constraints(X509 *cert,
1194 * Match a validated name in "name" against a validated constraint in 1194 * Match a validated name in "name" against a validated constraint in
1195 * "constraint" return 1 if then name matches, 0 otherwise. 1195 * "constraint" return 1 if then name matches, 0 otherwise.
1196 */ 1196 */
1197int 1197static int
1198x509_constraints_match(struct x509_constraints_name *name, 1198x509_constraints_match(struct x509_constraints_name *name,
1199 struct x509_constraints_name *constraint) 1199 struct x509_constraints_name *constraint)
1200{ 1200{
diff --git a/src/lib/libcrypto/x509/x509_policy.c b/src/lib/libcrypto/x509/x509_policy.c
index 2df965aad1..addd4b29ef 100644
--- a/src/lib/libcrypto/x509/x509_policy.c
+++ b/src/lib/libcrypto/x509/x509_policy.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_policy.c,v 1.33 2025/08/10 06:36:45 beck Exp $ */ 1/* $OpenBSD: x509_policy.c,v 1.34 2026/07/31 03:59:50 kenjiro Exp $ */
2/* 2/*
3 * Copyright (c) 2022, Google Inc. 3 * Copyright (c) 2022, Google Inc.
4 * 4 *
@@ -158,7 +158,7 @@ DECLARE_STACK_OF(X509_POLICY_LEVEL)
158 * this the OpenSSL way either, and we are not using this boringsslism 158 * this the OpenSSL way either, and we are not using this boringsslism
159 * anywhere else. Callers should ensure that the stack in data is sorted. 159 * anywhere else. Callers should ensure that the stack in data is sorted.
160 */ 160 */
161void 161static void
162sk_X509_POLICY_NODE_delete_if(STACK_OF(X509_POLICY_NODE) *nodes, 162sk_X509_POLICY_NODE_delete_if(STACK_OF(X509_POLICY_NODE) *nodes,
163 int (*delete_if)(X509_POLICY_NODE *, void *), void *data) 163 int (*delete_if)(X509_POLICY_NODE *, void *), void *data)
164{ 164{
diff --git a/src/lib/libcrypto/x509/x509_verify.c b/src/lib/libcrypto/x509/x509_verify.c
index af35cb0007..e0efa9ffc5 100644
--- a/src/lib/libcrypto/x509/x509_verify.c
+++ b/src/lib/libcrypto/x509/x509_verify.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_verify.c,v 1.77 2026/06/10 04:26:58 tb Exp $ */ 1/* $OpenBSD: x509_verify.c,v 1.78 2026/07/31 03:59:50 kenjiro Exp $ */
2/* 2/*
3 * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -83,7 +83,7 @@ x509_verify_asn1_time_to_time_t(const ASN1_TIME *atime, int notAfter,
83 return asn1_time_tm_to_time_t(&tm, out); 83 return asn1_time_tm_to_time_t(&tm, out);
84} 84}
85 85
86struct x509_verify_chain * 86static struct x509_verify_chain *
87x509_verify_chain_new(void) 87x509_verify_chain_new(void)
88{ 88{
89 struct x509_verify_chain *chain; 89 struct x509_verify_chain *chain;
@@ -199,7 +199,7 @@ x509_verify_chain_last(struct x509_verify_chain *chain)
199 return sk_X509_value(chain->certs, last); 199 return sk_X509_value(chain->certs, last);
200} 200}
201 201
202X509 * 202static X509 *
203x509_verify_chain_leaf(struct x509_verify_chain *chain) 203x509_verify_chain_leaf(struct x509_verify_chain *chain)
204{ 204{
205 if (chain->certs == NULL) 205 if (chain->certs == NULL)