summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2024-03-24 00:35:45 +0000
committertb <>2024-03-24 00:35:45 +0000
commitb3a13967000c87e38df8552d19c92ff97aefd6a4 (patch)
tree182ddb070d7b52232e87102c1721f7409c616de5 /src
parent973afe71a276e5e67638a08177a8fb6f68c1b71f (diff)
downloadopenbsd-b3a13967000c87e38df8552d19c92ff97aefd6a4.tar.gz
openbsd-b3a13967000c87e38df8552d19c92ff97aefd6a4.tar.bz2
openbsd-b3a13967000c87e38df8552d19c92ff97aefd6a4.zip
Drop the unused 'name' member from X509_TRUST
This used to be exposed via an accessor, but this accessor is no longer part of the library, so nuke it. ok beck
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/x509/x509_trs.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/lib/libcrypto/x509/x509_trs.c b/src/lib/libcrypto/x509/x509_trs.c
index 8fb0e35f67..3764f0200c 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.44 2024/03/23 06:38:01 tb Exp $ */ 1/* $OpenBSD: x509_trs.c,v 1.45 2024/03/24 00:35:45 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 */
@@ -70,7 +70,6 @@
70typedef struct x509_trust_st { 70typedef struct x509_trust_st {
71 int trust; 71 int trust;
72 int (*check_trust)(struct x509_trust_st *, X509 *); 72 int (*check_trust)(struct x509_trust_st *, X509 *);
73 char *name;
74 int arg1; 73 int arg1;
75} X509_TRUST; 74} X509_TRUST;
76 75
@@ -141,48 +140,40 @@ static const X509_TRUST trstandard[] = {
141 { 140 {
142 .trust = X509_TRUST_COMPAT, 141 .trust = X509_TRUST_COMPAT,
143 .check_trust = trust_compat, 142 .check_trust = trust_compat,
144 .name = "compatible",
145 }, 143 },
146 { 144 {
147 .trust = X509_TRUST_SSL_CLIENT, 145 .trust = X509_TRUST_SSL_CLIENT,
148 .check_trust = trust_1oidany, 146 .check_trust = trust_1oidany,
149 .name = "SSL Client",
150 .arg1 = NID_client_auth, 147 .arg1 = NID_client_auth,
151 }, 148 },
152 { 149 {
153 .trust = X509_TRUST_SSL_SERVER, 150 .trust = X509_TRUST_SSL_SERVER,
154 .check_trust = trust_1oidany, 151 .check_trust = trust_1oidany,
155 .name = "SSL Server",
156 .arg1 = NID_server_auth, 152 .arg1 = NID_server_auth,
157 }, 153 },
158 { 154 {
159 .trust = X509_TRUST_EMAIL, 155 .trust = X509_TRUST_EMAIL,
160 .check_trust = trust_1oidany, 156 .check_trust = trust_1oidany,
161 .name = "S/MIME email",
162 .arg1 = NID_email_protect, 157 .arg1 = NID_email_protect,
163 }, 158 },
164 { 159 {
165 .trust = X509_TRUST_OBJECT_SIGN, 160 .trust = X509_TRUST_OBJECT_SIGN,
166 .check_trust = trust_1oidany, 161 .check_trust = trust_1oidany,
167 .name = "Object Signer",
168 .arg1 = NID_code_sign, 162 .arg1 = NID_code_sign,
169 }, 163 },
170 { 164 {
171 .trust = X509_TRUST_OCSP_SIGN, 165 .trust = X509_TRUST_OCSP_SIGN,
172 .check_trust = trust_1oid, 166 .check_trust = trust_1oid,
173 .name = "OCSP responder",
174 .arg1 = NID_OCSP_sign, 167 .arg1 = NID_OCSP_sign,
175 }, 168 },
176 { 169 {
177 .trust = X509_TRUST_OCSP_REQUEST, 170 .trust = X509_TRUST_OCSP_REQUEST,
178 .check_trust = trust_1oid, 171 .check_trust = trust_1oid,
179 .name = "OCSP request",
180 .arg1 = NID_ad_OCSP, 172 .arg1 = NID_ad_OCSP,
181 }, 173 },
182 { 174 {
183 .trust = X509_TRUST_TSA, 175 .trust = X509_TRUST_TSA,
184 .check_trust = trust_1oidany, 176 .check_trust = trust_1oidany,
185 .name = "TSA server",
186 .arg1 = NID_time_stamp, 177 .arg1 = NID_time_stamp,
187 }, 178 },
188}; 179};