diff options
author | tb <> | 2024-08-31 10:12:23 +0000 |
---|---|---|
committer | tb <> | 2024-08-31 10:12:23 +0000 |
commit | 1bfe42304abd279bc2acdd729257c0be64042977 (patch) | |
tree | 5ad4736711eb813207541e6898526bde4640e2e7 /src/lib/libcrypto/x509/x509.h | |
parent | 7031212164b5493a716d2d9cd97186e6adf787b9 (diff) | |
download | openbsd-1bfe42304abd279bc2acdd729257c0be64042977.tar.gz openbsd-1bfe42304abd279bc2acdd729257c0be64042977.tar.bz2 openbsd-1bfe42304abd279bc2acdd729257c0be64042977.zip |
Remove X509_check_trust() and some related defines
Someone thought it would be a good idea to append non-standard trust
information to the certs in the trust store. This API is used to
inspect that depending on the intended purpose of the cert. Only
M2Crypto thought it necessary to expose this. It was adjusted.
ok beck jsing
Diffstat (limited to 'src/lib/libcrypto/x509/x509.h')
-rw-r--r-- | src/lib/libcrypto/x509/x509.h | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h index 856ad19ba4..3ab35d3d91 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.113 2024/08/28 07:15:04 tb Exp $ */ | 1 | /* $OpenBSD: x509.h,v 1.114 2024/08/31 10:12:23 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 | * |
@@ -153,11 +153,6 @@ typedef struct x509_cinf_st X509_CINF; | |||
153 | 153 | ||
154 | DECLARE_STACK_OF(X509) | 154 | DECLARE_STACK_OF(X509) |
155 | 155 | ||
156 | /* standard trust ids */ | ||
157 | |||
158 | /* OpenSSL changed this to 0 */ | ||
159 | #define X509_TRUST_DEFAULT -1 /* Only valid in purpose settings */ | ||
160 | |||
161 | #define X509_TRUST_COMPAT 1 | 156 | #define X509_TRUST_COMPAT 1 |
162 | #define X509_TRUST_SSL_CLIENT 2 | 157 | #define X509_TRUST_SSL_CLIENT 2 |
163 | #define X509_TRUST_SSL_SERVER 3 | 158 | #define X509_TRUST_SSL_SERVER 3 |
@@ -171,17 +166,6 @@ DECLARE_STACK_OF(X509) | |||
171 | #define X509_TRUST_MIN 1 | 166 | #define X509_TRUST_MIN 1 |
172 | #define X509_TRUST_MAX 8 | 167 | #define X509_TRUST_MAX 8 |
173 | 168 | ||
174 | |||
175 | /* trust_flags values */ | ||
176 | #define X509_TRUST_DYNAMIC 1 | ||
177 | #define X509_TRUST_DYNAMIC_NAME 2 | ||
178 | |||
179 | /* check_trust return codes */ | ||
180 | |||
181 | #define X509_TRUST_TRUSTED 1 | ||
182 | #define X509_TRUST_REJECTED 2 | ||
183 | #define X509_TRUST_UNTRUSTED 3 | ||
184 | |||
185 | /* Flags for X509_print_ex() */ | 169 | /* Flags for X509_print_ex() */ |
186 | 170 | ||
187 | #define X509_FLAG_COMPAT 0 | 171 | #define X509_FLAG_COMPAT 0 |
@@ -1013,8 +997,6 @@ int X509_PUBKEY_set0_param(X509_PUBKEY *pub, ASN1_OBJECT *aobj, int ptype, | |||
1013 | int X509_PUBKEY_get0_param(ASN1_OBJECT **ppkalg, const unsigned char **pk, | 997 | int X509_PUBKEY_get0_param(ASN1_OBJECT **ppkalg, const unsigned char **pk, |
1014 | int *ppklen, X509_ALGOR **pa, X509_PUBKEY *pub); | 998 | int *ppklen, X509_ALGOR **pa, X509_PUBKEY *pub); |
1015 | 999 | ||
1016 | int X509_check_trust(X509 *x, int id, int flags); | ||
1017 | |||
1018 | int X509_up_ref(X509 *x); | 1000 | int X509_up_ref(X509 *x); |
1019 | STACK_OF(X509) *X509_chain_up_ref(STACK_OF(X509) *chain); | 1001 | STACK_OF(X509) *X509_chain_up_ref(STACK_OF(X509) *chain); |
1020 | 1002 | ||