summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/x509/x509.h13
-rw-r--r--src/lib/libcrypto/x509/x509_trs.c11
2 files changed, 11 insertions, 13 deletions
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h
index cd332a986b..c89e8fc757 100644
--- a/src/lib/libcrypto/x509/x509.h
+++ b/src/lib/libcrypto/x509/x509.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509.h,v 1.108 2024/03/02 10:49:03 tb Exp $ */ 1/* $OpenBSD: x509.h,v 1.109 2024/03/02 10:50:26 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 *
@@ -155,17 +155,6 @@ typedef struct x509_cinf_st X509_CINF;
155 155
156DECLARE_STACK_OF(X509) 156DECLARE_STACK_OF(X509)
157 157
158/* This is used for a table of trust checking functions */
159
160typedef struct x509_trust_st {
161 int trust;
162 int flags;
163 int (*check_trust)(struct x509_trust_st *, X509 *, int);
164 char *name;
165 int arg1;
166 void *arg2;
167} X509_TRUST;
168
169/* standard trust ids */ 158/* standard trust ids */
170 159
171/* OpenSSL changed this to 0 */ 160/* OpenSSL changed this to 0 */
diff --git a/src/lib/libcrypto/x509/x509_trs.c b/src/lib/libcrypto/x509/x509_trs.c
index 774ce584b8..2f4cbba387 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.41 2024/03/02 10:48:17 tb Exp $ */ 1/* $OpenBSD: x509_trs.c,v 1.42 2024/03/02 10:50:26 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 */
@@ -67,6 +67,15 @@
67#include "crypto_internal.h" 67#include "crypto_internal.h"
68#include "x509_local.h" 68#include "x509_local.h"
69 69
70typedef struct x509_trust_st {
71 int trust;
72 int flags;
73 int (*check_trust)(struct x509_trust_st *, X509 *, int);
74 char *name;
75 int arg1;
76 void *arg2;
77} X509_TRUST;
78
70static int 79static int
71obj_trust(int id, X509 *x, int flags) 80obj_trust(int id, X509 *x, int flags)
72{ 81{