summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/x509
diff options
context:
space:
mode:
authortb <>2022-11-26 16:08:57 +0000
committertb <>2022-11-26 16:08:57 +0000
commitd0a21970fdc0fbbfc7ad31bc135f5a8fde1d3d49 (patch)
tree556ebf909e81599dc3d8da585217d1576eabe0e4 /src/lib/libcrypto/x509
parentbcbac728558eebfaa4404c405e7dc22769585345 (diff)
downloadopenbsd-d0a21970fdc0fbbfc7ad31bc135f5a8fde1d3d49.tar.gz
openbsd-d0a21970fdc0fbbfc7ad31bc135f5a8fde1d3d49.tar.bz2
openbsd-d0a21970fdc0fbbfc7ad31bc135f5a8fde1d3d49.zip
Make internal header file names consistent
Libcrypto currently has a mess of *_lcl.h, *_locl.h, and *_local.h names used for internal headers. Move all these headers we inherited from OpenSSL to *_local.h, reserving the name *_internal.h for our own code. Similarly, move dtls_locl.h and ssl_locl.h to dtls_local and ssl_local.h. constant_time_locl.h is moved to constant_time.h since it's special. Adjust all .c files in libcrypto, libssl and regress. The diff is mechanical with the exception of tls13_quic.c, where #include <ssl_locl.h> was fixed manually. discussed with jsing, no objection bcook
Diffstat (limited to 'src/lib/libcrypto/x509')
-rw-r--r--src/lib/libcrypto/x509/by_dir.c4
-rw-r--r--src/lib/libcrypto/x509/by_file.c4
-rw-r--r--src/lib/libcrypto/x509/by_mem.c4
-rw-r--r--src/lib/libcrypto/x509/pcy_cache.c4
-rw-r--r--src/lib/libcrypto/x509/pcy_map.c4
-rw-r--r--src/lib/libcrypto/x509/pcy_tree.c4
-rw-r--r--src/lib/libcrypto/x509/x509_addr.c6
-rw-r--r--src/lib/libcrypto/x509/x509_asid.c4
-rw-r--r--src/lib/libcrypto/x509/x509_att.c4
-rw-r--r--src/lib/libcrypto/x509/x509_cmp.c6
-rw-r--r--src/lib/libcrypto/x509/x509_conf.c4
-rw-r--r--src/lib/libcrypto/x509/x509_cpols.c4
-rw-r--r--src/lib/libcrypto/x509/x509_crld.c4
-rw-r--r--src/lib/libcrypto/x509/x509_ext.c4
-rw-r--r--src/lib/libcrypto/x509/x509_internal.h4
-rw-r--r--src/lib/libcrypto/x509/x509_lib.c4
-rw-r--r--src/lib/libcrypto/x509/x509_local.h (renamed from src/lib/libcrypto/x509/x509_lcl.h)2
-rw-r--r--src/lib/libcrypto/x509/x509_lu.c4
-rw-r--r--src/lib/libcrypto/x509/x509_ncons.c4
-rw-r--r--src/lib/libcrypto/x509/x509_obj.c4
-rw-r--r--src/lib/libcrypto/x509/x509_prn.c4
-rw-r--r--src/lib/libcrypto/x509/x509_purp.c4
-rw-r--r--src/lib/libcrypto/x509/x509_r2x.c4
-rw-r--r--src/lib/libcrypto/x509/x509_req.c6
-rw-r--r--src/lib/libcrypto/x509/x509_set.c4
-rw-r--r--src/lib/libcrypto/x509/x509_skey.c4
-rw-r--r--src/lib/libcrypto/x509/x509_trs.c4
-rw-r--r--src/lib/libcrypto/x509/x509_v3.c4
-rw-r--r--src/lib/libcrypto/x509/x509_vfy.c4
-rw-r--r--src/lib/libcrypto/x509/x509_vpm.c4
-rw-r--r--src/lib/libcrypto/x509/x509cset.c4
-rw-r--r--src/lib/libcrypto/x509/x509name.c4
-rw-r--r--src/lib/libcrypto/x509/x509rset.c4
-rw-r--r--src/lib/libcrypto/x509/x509type.c6
-rw-r--r--src/lib/libcrypto/x509/x_all.c4
35 files changed, 73 insertions, 73 deletions
diff --git a/src/lib/libcrypto/x509/by_dir.c b/src/lib/libcrypto/x509/by_dir.c
index 2875a12c92..341c252ea9 100644
--- a/src/lib/libcrypto/x509/by_dir.c
+++ b/src/lib/libcrypto/x509/by_dir.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: by_dir.c,v 1.42 2022/11/14 17:48:49 beck Exp $ */ 1/* $OpenBSD: by_dir.c,v 1.43 2022/11/26 16:08:54 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 *
@@ -70,7 +70,7 @@
70#include <openssl/err.h> 70#include <openssl/err.h>
71#include <openssl/x509.h> 71#include <openssl/x509.h>
72 72
73#include "x509_lcl.h" 73#include "x509_local.h"
74 74
75typedef struct lookup_dir_hashes_st { 75typedef struct lookup_dir_hashes_st {
76 unsigned long hash; 76 unsigned long hash;
diff --git a/src/lib/libcrypto/x509/by_file.c b/src/lib/libcrypto/x509/by_file.c
index 747252d25b..70a2a62a97 100644
--- a/src/lib/libcrypto/x509/by_file.c
+++ b/src/lib/libcrypto/x509/by_file.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: by_file.c,v 1.26 2022/11/14 17:48:49 beck Exp $ */ 1/* $OpenBSD: by_file.c,v 1.27 2022/11/26 16:08:54 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 *
@@ -66,7 +66,7 @@
66#include <openssl/pem.h> 66#include <openssl/pem.h>
67#include <openssl/x509.h> 67#include <openssl/x509.h>
68 68
69#include "x509_lcl.h" 69#include "x509_local.h"
70 70
71static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, 71static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
72 long argl, char **ret); 72 long argl, char **ret);
diff --git a/src/lib/libcrypto/x509/by_mem.c b/src/lib/libcrypto/x509/by_mem.c
index fe1ac24525..8f0a93fce3 100644
--- a/src/lib/libcrypto/x509/by_mem.c
+++ b/src/lib/libcrypto/x509/by_mem.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: by_mem.c,v 1.6 2022/11/14 17:48:49 beck Exp $ */ 1/* $OpenBSD: by_mem.c,v 1.7 2022/11/26 16:08:54 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 *
@@ -68,7 +68,7 @@
68#include <openssl/lhash.h> 68#include <openssl/lhash.h>
69#include <openssl/x509.h> 69#include <openssl/x509.h>
70 70
71#include "x509_lcl.h" 71#include "x509_local.h"
72 72
73static int by_mem_ctrl(X509_LOOKUP *, int, const char *, long, char **); 73static int by_mem_ctrl(X509_LOOKUP *, int, const char *, long, char **);
74 74
diff --git a/src/lib/libcrypto/x509/pcy_cache.c b/src/lib/libcrypto/x509/pcy_cache.c
index debca30286..6424160db8 100644
--- a/src/lib/libcrypto/x509/pcy_cache.c
+++ b/src/lib/libcrypto/x509/pcy_cache.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pcy_cache.c,v 1.2 2021/11/01 20:53:08 tb Exp $ */ 1/* $OpenBSD: pcy_cache.c,v 1.3 2022/11/26 16:08:54 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2004. 3 * project 2004.
4 */ 4 */
@@ -60,7 +60,7 @@
60#include <openssl/x509v3.h> 60#include <openssl/x509v3.h>
61 61
62#include "pcy_int.h" 62#include "pcy_int.h"
63#include "x509_lcl.h" 63#include "x509_local.h"
64 64
65static int policy_data_cmp(const X509_POLICY_DATA * const *a, 65static int policy_data_cmp(const X509_POLICY_DATA * const *a,
66 const X509_POLICY_DATA * const *b); 66 const X509_POLICY_DATA * const *b);
diff --git a/src/lib/libcrypto/x509/pcy_map.c b/src/lib/libcrypto/x509/pcy_map.c
index f2e5d32552..fe21ba14d1 100644
--- a/src/lib/libcrypto/x509/pcy_map.c
+++ b/src/lib/libcrypto/x509/pcy_map.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pcy_map.c,v 1.2 2021/11/01 20:53:08 tb Exp $ */ 1/* $OpenBSD: pcy_map.c,v 1.3 2022/11/26 16:08:54 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2004. 3 * project 2004.
4 */ 4 */
@@ -60,7 +60,7 @@
60#include <openssl/x509v3.h> 60#include <openssl/x509v3.h>
61 61
62#include "pcy_int.h" 62#include "pcy_int.h"
63#include "x509_lcl.h" 63#include "x509_local.h"
64 64
65/* Set policy mapping entries in cache. 65/* Set policy mapping entries in cache.
66 * Note: this modifies the passed POLICY_MAPPINGS structure 66 * Note: this modifies the passed POLICY_MAPPINGS structure
diff --git a/src/lib/libcrypto/x509/pcy_tree.c b/src/lib/libcrypto/x509/pcy_tree.c
index 1df37c8776..be563d2677 100644
--- a/src/lib/libcrypto/x509/pcy_tree.c
+++ b/src/lib/libcrypto/x509/pcy_tree.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pcy_tree.c,v 1.3 2022/11/14 17:48:49 beck Exp $ */ 1/* $OpenBSD: pcy_tree.c,v 1.4 2022/11/26 16:08:54 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2004. 3 * project 2004.
4 */ 4 */
@@ -60,7 +60,7 @@
60#include <openssl/x509v3.h> 60#include <openssl/x509v3.h>
61 61
62#include "pcy_int.h" 62#include "pcy_int.h"
63#include "x509_lcl.h" 63#include "x509_local.h"
64 64
65/* Enable this to print out the complete policy tree at various point during 65/* Enable this to print out the complete policy tree at various point during
66 * evaluation. 66 * evaluation.
diff --git a/src/lib/libcrypto/x509/x509_addr.c b/src/lib/libcrypto/x509/x509_addr.c
index ee4e285a77..510ea4e697 100644
--- a/src/lib/libcrypto/x509/x509_addr.c
+++ b/src/lib/libcrypto/x509/x509_addr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_addr.c,v 1.84 2022/11/14 17:48:49 beck Exp $ */ 1/* $OpenBSD: x509_addr.c,v 1.85 2022/11/26 16:08:54 tb Exp $ */
2/* 2/*
3 * Contributed to the OpenSSL Project by the American Registry for 3 * Contributed to the OpenSSL Project by the American Registry for
4 * Internet Numbers ("ARIN"). 4 * Internet Numbers ("ARIN").
@@ -73,9 +73,9 @@
73#include <openssl/x509.h> 73#include <openssl/x509.h>
74#include <openssl/x509v3.h> 74#include <openssl/x509v3.h>
75 75
76#include "asn1_locl.h" 76#include "asn1_local.h"
77#include "bytestring.h" 77#include "bytestring.h"
78#include "x509_lcl.h" 78#include "x509_local.h"
79 79
80#ifndef OPENSSL_NO_RFC3779 80#ifndef OPENSSL_NO_RFC3779
81 81
diff --git a/src/lib/libcrypto/x509/x509_asid.c b/src/lib/libcrypto/x509/x509_asid.c
index c95816da04..3a37b002f2 100644
--- a/src/lib/libcrypto/x509/x509_asid.c
+++ b/src/lib/libcrypto/x509/x509_asid.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_asid.c,v 1.37 2022/11/14 17:48:50 beck Exp $ */ 1/* $OpenBSD: x509_asid.c,v 1.38 2022/11/26 16:08:54 tb Exp $ */
2/* 2/*
3 * Contributed to the OpenSSL Project by the American Registry for 3 * Contributed to the OpenSSL Project by the American Registry for
4 * Internet Numbers ("ARIN"). 4 * Internet Numbers ("ARIN").
@@ -73,7 +73,7 @@
73#include <openssl/x509.h> 73#include <openssl/x509.h>
74#include <openssl/x509v3.h> 74#include <openssl/x509v3.h>
75 75
76#include "x509_lcl.h" 76#include "x509_local.h"
77 77
78#ifndef OPENSSL_NO_RFC3779 78#ifndef OPENSSL_NO_RFC3779
79 79
diff --git a/src/lib/libcrypto/x509/x509_att.c b/src/lib/libcrypto/x509/x509_att.c
index bff412173b..e769418fd3 100644
--- a/src/lib/libcrypto/x509/x509_att.c
+++ b/src/lib/libcrypto/x509/x509_att.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_att.c,v 1.20 2022/11/14 17:48:50 beck Exp $ */ 1/* $OpenBSD: x509_att.c,v 1.21 2022/11/26 16:08:54 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 *
@@ -66,7 +66,7 @@
66#include <openssl/x509.h> 66#include <openssl/x509.h>
67#include <openssl/x509v3.h> 67#include <openssl/x509v3.h>
68 68
69#include "x509_lcl.h" 69#include "x509_local.h"
70 70
71int 71int
72X509at_get_attr_count(const STACK_OF(X509_ATTRIBUTE) *x) 72X509at_get_attr_count(const STACK_OF(X509_ATTRIBUTE) *x)
diff --git a/src/lib/libcrypto/x509/x509_cmp.c b/src/lib/libcrypto/x509/x509_cmp.c
index 542ae76c17..b76c9ea660 100644
--- a/src/lib/libcrypto/x509/x509_cmp.c
+++ b/src/lib/libcrypto/x509/x509_cmp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_cmp.c,v 1.40 2022/11/14 17:48:50 beck Exp $ */ 1/* $OpenBSD: x509_cmp.c,v 1.41 2022/11/26 16:08:54 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 *
@@ -68,8 +68,8 @@
68#include <openssl/x509.h> 68#include <openssl/x509.h>
69#include <openssl/x509v3.h> 69#include <openssl/x509v3.h>
70 70
71#include "evp_locl.h" 71#include "evp_local.h"
72#include "x509_lcl.h" 72#include "x509_local.h"
73 73
74int 74int
75X509_issuer_and_serial_cmp(const X509 *a, const X509 *b) 75X509_issuer_and_serial_cmp(const X509 *a, const X509 *b)
diff --git a/src/lib/libcrypto/x509/x509_conf.c b/src/lib/libcrypto/x509/x509_conf.c
index def1441f3f..2b3274d04d 100644
--- a/src/lib/libcrypto/x509/x509_conf.c
+++ b/src/lib/libcrypto/x509/x509_conf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_conf.c,v 1.3 2022/11/14 17:48:50 beck Exp $ */ 1/* $OpenBSD: x509_conf.c,v 1.4 2022/11/26 16:08:54 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -66,7 +66,7 @@
66#include <openssl/x509.h> 66#include <openssl/x509.h>
67#include <openssl/x509v3.h> 67#include <openssl/x509v3.h>
68 68
69#include "x509_lcl.h" 69#include "x509_local.h"
70 70
71static int v3_check_critical(const char **value); 71static int v3_check_critical(const char **value);
72static int v3_check_generic(const char **value); 72static int v3_check_generic(const char **value);
diff --git a/src/lib/libcrypto/x509/x509_cpols.c b/src/lib/libcrypto/x509/x509_cpols.c
index 8d50c0545a..12e4a55c47 100644
--- a/src/lib/libcrypto/x509/x509_cpols.c
+++ b/src/lib/libcrypto/x509/x509_cpols.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_cpols.c,v 1.5 2022/11/14 17:48:50 beck Exp $ */ 1/* $OpenBSD: x509_cpols.c,v 1.6 2022/11/26 16:08:54 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -66,7 +66,7 @@
66#include <openssl/x509v3.h> 66#include <openssl/x509v3.h>
67 67
68#include "pcy_int.h" 68#include "pcy_int.h"
69#include "x509_lcl.h" 69#include "x509_local.h"
70 70
71/* Certificate policies extension support: this one is a bit complex... */ 71/* Certificate policies extension support: this one is a bit complex... */
72 72
diff --git a/src/lib/libcrypto/x509/x509_crld.c b/src/lib/libcrypto/x509/x509_crld.c
index 43150b21a9..ef9c82bb3f 100644
--- a/src/lib/libcrypto/x509/x509_crld.c
+++ b/src/lib/libcrypto/x509/x509_crld.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_crld.c,v 1.3 2022/11/14 17:48:50 beck Exp $ */ 1/* $OpenBSD: x509_crld.c,v 1.4 2022/11/26 16:08:54 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -65,7 +65,7 @@
65#include <openssl/err.h> 65#include <openssl/err.h>
66#include <openssl/x509v3.h> 66#include <openssl/x509v3.h>
67 67
68#include "x509_lcl.h" 68#include "x509_local.h"
69 69
70static void *v2i_crld(const X509V3_EXT_METHOD *method, 70static void *v2i_crld(const X509V3_EXT_METHOD *method,
71 X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval); 71 X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
diff --git a/src/lib/libcrypto/x509/x509_ext.c b/src/lib/libcrypto/x509/x509_ext.c
index 95679265c3..c173b7c687 100644
--- a/src/lib/libcrypto/x509/x509_ext.c
+++ b/src/lib/libcrypto/x509/x509_ext.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_ext.c,v 1.14 2022/11/14 17:48:50 beck Exp $ */ 1/* $OpenBSD: x509_ext.c,v 1.15 2022/11/26 16:08:54 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 *
@@ -65,7 +65,7 @@
65#include <openssl/x509.h> 65#include <openssl/x509.h>
66#include <openssl/x509v3.h> 66#include <openssl/x509v3.h>
67 67
68#include "x509_lcl.h" 68#include "x509_local.h"
69 69
70int 70int
71X509_CRL_get_ext_count(const X509_CRL *x) 71X509_CRL_get_ext_count(const X509_CRL *x)
diff --git a/src/lib/libcrypto/x509/x509_internal.h b/src/lib/libcrypto/x509/x509_internal.h
index 472b417403..4ce6cd1e85 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.22 2022/11/17 00:42:12 beck Exp $ */ 1/* $OpenBSD: x509_internal.h,v 1.23 2022/11/26 16:08:54 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2020 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2020 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -23,7 +23,7 @@
23#include <openssl/x509_verify.h> 23#include <openssl/x509_verify.h>
24 24
25#include "bytestring.h" 25#include "bytestring.h"
26#include "x509_lcl.h" 26#include "x509_local.h"
27 27
28/* Hard limits on structure size and number of signature checks. */ 28/* Hard limits on structure size and number of signature checks. */
29#define X509_VERIFY_MAX_CHAINS 8 /* Max validated chains */ 29#define X509_VERIFY_MAX_CHAINS 8 /* Max validated chains */
diff --git a/src/lib/libcrypto/x509/x509_lib.c b/src/lib/libcrypto/x509/x509_lib.c
index e209c055b6..f27e3315aa 100644
--- a/src/lib/libcrypto/x509/x509_lib.c
+++ b/src/lib/libcrypto/x509/x509_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_lib.c,v 1.5 2022/11/14 17:48:50 beck Exp $ */ 1/* $OpenBSD: x509_lib.c,v 1.6 2022/11/26 16:08:54 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -64,7 +64,7 @@
64#include <openssl/x509v3.h> 64#include <openssl/x509v3.h>
65 65
66#include "ext_dat.h" 66#include "ext_dat.h"
67#include "x509_lcl.h" 67#include "x509_local.h"
68 68
69static STACK_OF(X509V3_EXT_METHOD) *ext_list = NULL; 69static STACK_OF(X509V3_EXT_METHOD) *ext_list = NULL;
70 70
diff --git a/src/lib/libcrypto/x509/x509_lcl.h b/src/lib/libcrypto/x509/x509_local.h
index 8aa2db5946..1b1522acaa 100644
--- a/src/lib/libcrypto/x509/x509_lcl.h
+++ b/src/lib/libcrypto/x509/x509_local.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_lcl.h,v 1.16 2022/08/15 11:52:37 tb Exp $ */ 1/* $OpenBSD: x509_local.h,v 1.1 2022/11/26 16:08:54 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2013. 3 * project 2013.
4 */ 4 */
diff --git a/src/lib/libcrypto/x509/x509_lu.c b/src/lib/libcrypto/x509/x509_lu.c
index 80ff1ed429..28cb85035b 100644
--- a/src/lib/libcrypto/x509/x509_lu.c
+++ b/src/lib/libcrypto/x509/x509_lu.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_lu.c,v 1.56 2022/11/14 17:48:50 beck Exp $ */ 1/* $OpenBSD: x509_lu.c,v 1.57 2022/11/26 16:08:54 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 *
@@ -63,7 +63,7 @@
63#include <openssl/lhash.h> 63#include <openssl/lhash.h>
64#include <openssl/x509.h> 64#include <openssl/x509.h>
65#include <openssl/x509v3.h> 65#include <openssl/x509v3.h>
66#include "x509_lcl.h" 66#include "x509_local.h"
67 67
68X509_LOOKUP * 68X509_LOOKUP *
69X509_LOOKUP_new(X509_LOOKUP_METHOD *method) 69X509_LOOKUP_new(X509_LOOKUP_METHOD *method)
diff --git a/src/lib/libcrypto/x509/x509_ncons.c b/src/lib/libcrypto/x509/x509_ncons.c
index a5d055ae9f..cc7f59cd0a 100644
--- a/src/lib/libcrypto/x509/x509_ncons.c
+++ b/src/lib/libcrypto/x509/x509_ncons.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_ncons.c,v 1.6 2022/11/14 17:48:50 beck Exp $ */ 1/* $OpenBSD: x509_ncons.c,v 1.7 2022/11/26 16:08:55 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project. 3 * project.
4 */ 4 */
@@ -64,7 +64,7 @@
64#include <openssl/err.h> 64#include <openssl/err.h>
65#include <openssl/x509v3.h> 65#include <openssl/x509v3.h>
66 66
67#include "x509_lcl.h" 67#include "x509_local.h"
68 68
69static void *v2i_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method, 69static void *v2i_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method,
70 X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval); 70 X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
diff --git a/src/lib/libcrypto/x509/x509_obj.c b/src/lib/libcrypto/x509/x509_obj.c
index d27e59c741..f9323cf5bc 100644
--- a/src/lib/libcrypto/x509/x509_obj.c
+++ b/src/lib/libcrypto/x509/x509_obj.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_obj.c,v 1.20 2022/11/14 17:48:50 beck Exp $ */ 1/* $OpenBSD: x509_obj.c,v 1.21 2022/11/26 16:08:55 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 *
@@ -65,7 +65,7 @@
65#include <openssl/objects.h> 65#include <openssl/objects.h>
66#include <openssl/x509.h> 66#include <openssl/x509.h>
67 67
68#include "x509_lcl.h" 68#include "x509_local.h"
69 69
70char * 70char *
71X509_NAME_oneline(const X509_NAME *a, char *buf, int len) 71X509_NAME_oneline(const X509_NAME *a, char *buf, int len)
diff --git a/src/lib/libcrypto/x509/x509_prn.c b/src/lib/libcrypto/x509/x509_prn.c
index b7db631500..89cd555fc5 100644
--- a/src/lib/libcrypto/x509/x509_prn.c
+++ b/src/lib/libcrypto/x509/x509_prn.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_prn.c,v 1.3 2022/11/14 17:48:50 beck Exp $ */ 1/* $OpenBSD: x509_prn.c,v 1.4 2022/11/26 16:08:55 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -62,7 +62,7 @@
62#include <openssl/conf.h> 62#include <openssl/conf.h>
63#include <openssl/x509v3.h> 63#include <openssl/x509v3.h>
64 64
65#include "x509_lcl.h" 65#include "x509_local.h"
66 66
67/* Extension printing routines */ 67/* Extension printing routines */
68 68
diff --git a/src/lib/libcrypto/x509/x509_purp.c b/src/lib/libcrypto/x509/x509_purp.c
index d5027377bf..4faf83b975 100644
--- a/src/lib/libcrypto/x509/x509_purp.c
+++ b/src/lib/libcrypto/x509/x509_purp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_purp.c,v 1.17 2022/11/14 17:48:50 beck Exp $ */ 1/* $OpenBSD: x509_purp.c,v 1.18 2022/11/26 16:08:55 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2001. 3 * project 2001.
4 */ 4 */
@@ -66,7 +66,7 @@
66#include <openssl/x509_vfy.h> 66#include <openssl/x509_vfy.h>
67 67
68#include "x509_internal.h" 68#include "x509_internal.h"
69#include "x509_lcl.h" 69#include "x509_local.h"
70 70
71#define V1_ROOT (EXFLAG_V1|EXFLAG_SS) 71#define V1_ROOT (EXFLAG_V1|EXFLAG_SS)
72#define ku_reject(x, usage) \ 72#define ku_reject(x, usage) \
diff --git a/src/lib/libcrypto/x509/x509_r2x.c b/src/lib/libcrypto/x509/x509_r2x.c
index e69b54fc5b..a8ffbdc65b 100644
--- a/src/lib/libcrypto/x509/x509_r2x.c
+++ b/src/lib/libcrypto/x509/x509_r2x.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_r2x.c,v 1.14 2022/11/14 17:48:50 beck Exp $ */ 1/* $OpenBSD: x509_r2x.c,v 1.15 2022/11/26 16:08:55 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 *
@@ -66,7 +66,7 @@
66#include <openssl/objects.h> 66#include <openssl/objects.h>
67#include <openssl/x509.h> 67#include <openssl/x509.h>
68 68
69#include "x509_lcl.h" 69#include "x509_local.h"
70 70
71X509 * 71X509 *
72X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey) 72X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
diff --git a/src/lib/libcrypto/x509/x509_req.c b/src/lib/libcrypto/x509/x509_req.c
index 5155d743ab..32415979e9 100644
--- a/src/lib/libcrypto/x509/x509_req.c
+++ b/src/lib/libcrypto/x509/x509_req.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_req.c,v 1.30 2022/11/14 17:48:50 beck Exp $ */ 1/* $OpenBSD: x509_req.c,v 1.31 2022/11/26 16:08:55 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 *
@@ -70,8 +70,8 @@
70#include <openssl/pem.h> 70#include <openssl/pem.h>
71#include <openssl/x509.h> 71#include <openssl/x509.h>
72 72
73#include "evp_locl.h" 73#include "evp_local.h"
74#include "x509_lcl.h" 74#include "x509_local.h"
75 75
76X509_REQ * 76X509_REQ *
77X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md) 77X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
diff --git a/src/lib/libcrypto/x509/x509_set.c b/src/lib/libcrypto/x509/x509_set.c
index 91d6483a3b..f07f0ec5f2 100644
--- a/src/lib/libcrypto/x509/x509_set.c
+++ b/src/lib/libcrypto/x509/x509_set.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_set.c,v 1.21 2022/11/14 17:48:50 beck Exp $ */ 1/* $OpenBSD: x509_set.c,v 1.22 2022/11/26 16:08:55 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 *
@@ -63,7 +63,7 @@
63#include <openssl/objects.h> 63#include <openssl/objects.h>
64#include <openssl/x509.h> 64#include <openssl/x509.h>
65 65
66#include "x509_lcl.h" 66#include "x509_local.h"
67 67
68const STACK_OF(X509_EXTENSION) * 68const STACK_OF(X509_EXTENSION) *
69X509_get0_extensions(const X509 *x) 69X509_get0_extensions(const X509 *x)
diff --git a/src/lib/libcrypto/x509/x509_skey.c b/src/lib/libcrypto/x509/x509_skey.c
index 813a8de199..d4212a64a1 100644
--- a/src/lib/libcrypto/x509/x509_skey.c
+++ b/src/lib/libcrypto/x509/x509_skey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_skey.c,v 1.3 2022/11/14 17:48:50 beck Exp $ */ 1/* $OpenBSD: x509_skey.c,v 1.4 2022/11/26 16:08:55 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -62,7 +62,7 @@
62#include <openssl/err.h> 62#include <openssl/err.h>
63#include <openssl/x509v3.h> 63#include <openssl/x509v3.h>
64 64
65#include "x509_lcl.h" 65#include "x509_local.h"
66 66
67static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method, 67static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method,
68 X509V3_CTX *ctx, char *str); 68 X509V3_CTX *ctx, char *str);
diff --git a/src/lib/libcrypto/x509/x509_trs.c b/src/lib/libcrypto/x509/x509_trs.c
index c4d371446c..10995801b1 100644
--- a/src/lib/libcrypto/x509/x509_trs.c
+++ b/src/lib/libcrypto/x509/x509_trs.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_trs.c,v 1.29 2022/11/17 00:42:12 beck Exp $ */ 1/* $OpenBSD: x509_trs.c,v 1.30 2022/11/26 16:08:55 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -62,7 +62,7 @@
62#include <openssl/err.h> 62#include <openssl/err.h>
63#include <openssl/x509v3.h> 63#include <openssl/x509v3.h>
64 64
65#include "x509_lcl.h" 65#include "x509_local.h"
66 66
67static int tr_cmp(const X509_TRUST * const *a, const X509_TRUST * const *b); 67static int tr_cmp(const X509_TRUST * const *a, const X509_TRUST * const *b);
68static void trtable_free(X509_TRUST *p); 68static void trtable_free(X509_TRUST *p);
diff --git a/src/lib/libcrypto/x509/x509_v3.c b/src/lib/libcrypto/x509/x509_v3.c
index 4f66524f51..27f670c450 100644
--- a/src/lib/libcrypto/x509/x509_v3.c
+++ b/src/lib/libcrypto/x509/x509_v3.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_v3.c,v 1.19 2022/11/14 17:48:50 beck Exp $ */ 1/* $OpenBSD: x509_v3.c,v 1.20 2022/11/26 16:08:55 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 *
@@ -66,7 +66,7 @@
66#include <openssl/x509.h> 66#include <openssl/x509.h>
67#include <openssl/x509v3.h> 67#include <openssl/x509v3.h>
68 68
69#include "x509_lcl.h" 69#include "x509_local.h"
70 70
71int 71int
72X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *x) 72X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *x)
diff --git a/src/lib/libcrypto/x509/x509_vfy.c b/src/lib/libcrypto/x509/x509_vfy.c
index 0a9965ae30..9b7f371cea 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.106 2022/11/17 00:42:12 beck Exp $ */ 1/* $OpenBSD: x509_vfy.c,v 1.107 2022/11/26 16:08:55 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 *
@@ -73,7 +73,7 @@
73#include <openssl/objects.h> 73#include <openssl/objects.h>
74#include <openssl/x509.h> 74#include <openssl/x509.h>
75#include <openssl/x509v3.h> 75#include <openssl/x509v3.h>
76#include "asn1_locl.h" 76#include "asn1_local.h"
77#include "vpm_int.h" 77#include "vpm_int.h"
78#include "x509_internal.h" 78#include "x509_internal.h"
79 79
diff --git a/src/lib/libcrypto/x509/x509_vpm.c b/src/lib/libcrypto/x509/x509_vpm.c
index 56e2c34127..724a28fc1b 100644
--- a/src/lib/libcrypto/x509/x509_vpm.c
+++ b/src/lib/libcrypto/x509/x509_vpm.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_vpm.c,v 1.31 2022/11/14 17:48:50 beck Exp $ */ 1/* $OpenBSD: x509_vpm.c,v 1.32 2022/11/26 16:08:55 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2004. 3 * project 2004.
4 */ 4 */
@@ -67,7 +67,7 @@
67#include <openssl/x509v3.h> 67#include <openssl/x509v3.h>
68 68
69#include "vpm_int.h" 69#include "vpm_int.h"
70#include "x509_lcl.h" 70#include "x509_local.h"
71 71
72/* X509_VERIFY_PARAM functions */ 72/* X509_VERIFY_PARAM functions */
73 73
diff --git a/src/lib/libcrypto/x509/x509cset.c b/src/lib/libcrypto/x509/x509cset.c
index 7002238394..a75a63b03b 100644
--- a/src/lib/libcrypto/x509/x509cset.c
+++ b/src/lib/libcrypto/x509/x509cset.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509cset.c,v 1.17 2022/11/14 17:48:50 beck Exp $ */ 1/* $OpenBSD: x509cset.c,v 1.18 2022/11/26 16:08:55 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2001. 3 * project 2001.
4 */ 4 */
@@ -63,7 +63,7 @@
63#include <openssl/objects.h> 63#include <openssl/objects.h>
64#include <openssl/x509.h> 64#include <openssl/x509.h>
65 65
66#include "x509_lcl.h" 66#include "x509_local.h"
67 67
68int 68int
69X509_CRL_up_ref(X509_CRL *x) 69X509_CRL_up_ref(X509_CRL *x)
diff --git a/src/lib/libcrypto/x509/x509name.c b/src/lib/libcrypto/x509/x509name.c
index 88f4efa149..14e2deb84f 100644
--- a/src/lib/libcrypto/x509/x509name.c
+++ b/src/lib/libcrypto/x509/x509name.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509name.c,v 1.28 2022/11/14 17:48:50 beck Exp $ */ 1/* $OpenBSD: x509name.c,v 1.29 2022/11/26 16:08:55 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 *
@@ -66,7 +66,7 @@
66#include <openssl/stack.h> 66#include <openssl/stack.h>
67#include <openssl/x509.h> 67#include <openssl/x509.h>
68 68
69#include "x509_lcl.h" 69#include "x509_local.h"
70 70
71int 71int
72X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf, int len) 72X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf, int len)
diff --git a/src/lib/libcrypto/x509/x509rset.c b/src/lib/libcrypto/x509/x509rset.c
index 6fb622e3cb..640a850800 100644
--- a/src/lib/libcrypto/x509/x509rset.c
+++ b/src/lib/libcrypto/x509/x509rset.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509rset.c,v 1.10 2022/11/14 17:48:50 beck Exp $ */ 1/* $OpenBSD: x509rset.c,v 1.11 2022/11/26 16:08:55 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 *
@@ -63,7 +63,7 @@
63#include <openssl/objects.h> 63#include <openssl/objects.h>
64#include <openssl/x509.h> 64#include <openssl/x509.h>
65 65
66#include "x509_lcl.h" 66#include "x509_local.h"
67 67
68int 68int
69X509_REQ_set_version(X509_REQ *x, long version) 69X509_REQ_set_version(X509_REQ *x, long version)
diff --git a/src/lib/libcrypto/x509/x509type.c b/src/lib/libcrypto/x509/x509type.c
index 2d80434d95..7e10fb540d 100644
--- a/src/lib/libcrypto/x509/x509type.c
+++ b/src/lib/libcrypto/x509/x509type.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509type.c,v 1.16 2022/11/14 17:48:50 beck Exp $ */ 1/* $OpenBSD: x509type.c,v 1.17 2022/11/26 16:08:55 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 *
@@ -62,8 +62,8 @@
62#include <openssl/objects.h> 62#include <openssl/objects.h>
63#include <openssl/x509.h> 63#include <openssl/x509.h>
64 64
65#include "evp_locl.h" 65#include "evp_local.h"
66#include "x509_lcl.h" 66#include "x509_local.h"
67 67
68int 68int
69X509_certificate_type(const X509 *x, const EVP_PKEY *pkey) 69X509_certificate_type(const X509 *x, const EVP_PKEY *pkey)
diff --git a/src/lib/libcrypto/x509/x_all.c b/src/lib/libcrypto/x509/x_all.c
index 442a27bc7f..819162dc31 100644
--- a/src/lib/libcrypto/x509/x_all.c
+++ b/src/lib/libcrypto/x509/x_all.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x_all.c,v 1.28 2022/11/14 17:48:50 beck Exp $ */ 1/* $OpenBSD: x_all.c,v 1.29 2022/11/26 16:08:55 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 *
@@ -73,7 +73,7 @@
73#include <openssl/rsa.h> 73#include <openssl/rsa.h>
74#endif 74#endif
75 75
76#include "x509_lcl.h" 76#include "x509_local.h"
77 77
78X509 * 78X509 *
79d2i_X509_bio(BIO *bp, X509 **x509) 79d2i_X509_bio(BIO *bp, X509 **x509)