diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/x509/x509_trs.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/libcrypto/x509/x509_trs.c b/src/lib/libcrypto/x509/x509_trs.c index 3764f0200c..73f24682f6 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.45 2024/03/24 00:35:45 tb Exp $ */ | 1 | /* $OpenBSD: x509_trs.c,v 1.46 2024/03/24 01:24: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 | */ |
| @@ -70,7 +70,7 @@ | |||
| 70 | typedef struct x509_trust_st { | 70 | typedef 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 | int arg1; | 73 | int nid; |
| 74 | } X509_TRUST; | 74 | } X509_TRUST; |
| 75 | 75 | ||
| 76 | static int | 76 | static int |
| @@ -116,7 +116,7 @@ static int | |||
| 116 | trust_1oidany(X509_TRUST *trust, X509 *x) | 116 | trust_1oidany(X509_TRUST *trust, X509 *x) |
| 117 | { | 117 | { |
| 118 | if (x->aux && (x->aux->trust || x->aux->reject)) | 118 | if (x->aux && (x->aux->trust || x->aux->reject)) |
| 119 | return obj_trust(trust->arg1, x); | 119 | return obj_trust(trust->nid, x); |
| 120 | /* we don't have any trust settings: for compatibility | 120 | /* we don't have any trust settings: for compatibility |
| 121 | * we return trusted if it is self signed | 121 | * we return trusted if it is self signed |
| 122 | */ | 122 | */ |
| @@ -127,7 +127,7 @@ static int | |||
| 127 | trust_1oid(X509_TRUST *trust, X509 *x) | 127 | trust_1oid(X509_TRUST *trust, X509 *x) |
| 128 | { | 128 | { |
| 129 | if (x->aux) | 129 | if (x->aux) |
| 130 | return obj_trust(trust->arg1, x); | 130 | return obj_trust(trust->nid, x); |
| 131 | return X509_TRUST_UNTRUSTED; | 131 | return X509_TRUST_UNTRUSTED; |
| 132 | } | 132 | } |
| 133 | 133 | ||
| @@ -144,37 +144,37 @@ static const X509_TRUST trstandard[] = { | |||
| 144 | { | 144 | { |
| 145 | .trust = X509_TRUST_SSL_CLIENT, | 145 | .trust = X509_TRUST_SSL_CLIENT, |
| 146 | .check_trust = trust_1oidany, | 146 | .check_trust = trust_1oidany, |
| 147 | .arg1 = NID_client_auth, | 147 | .nid = NID_client_auth, |
| 148 | }, | 148 | }, |
| 149 | { | 149 | { |
| 150 | .trust = X509_TRUST_SSL_SERVER, | 150 | .trust = X509_TRUST_SSL_SERVER, |
| 151 | .check_trust = trust_1oidany, | 151 | .check_trust = trust_1oidany, |
| 152 | .arg1 = NID_server_auth, | 152 | .nid = NID_server_auth, |
| 153 | }, | 153 | }, |
| 154 | { | 154 | { |
| 155 | .trust = X509_TRUST_EMAIL, | 155 | .trust = X509_TRUST_EMAIL, |
| 156 | .check_trust = trust_1oidany, | 156 | .check_trust = trust_1oidany, |
| 157 | .arg1 = NID_email_protect, | 157 | .nid = NID_email_protect, |
| 158 | }, | 158 | }, |
| 159 | { | 159 | { |
| 160 | .trust = X509_TRUST_OBJECT_SIGN, | 160 | .trust = X509_TRUST_OBJECT_SIGN, |
| 161 | .check_trust = trust_1oidany, | 161 | .check_trust = trust_1oidany, |
| 162 | .arg1 = NID_code_sign, | 162 | .nid = NID_code_sign, |
| 163 | }, | 163 | }, |
| 164 | { | 164 | { |
| 165 | .trust = X509_TRUST_OCSP_SIGN, | 165 | .trust = X509_TRUST_OCSP_SIGN, |
| 166 | .check_trust = trust_1oid, | 166 | .check_trust = trust_1oid, |
| 167 | .arg1 = NID_OCSP_sign, | 167 | .nid = NID_OCSP_sign, |
| 168 | }, | 168 | }, |
| 169 | { | 169 | { |
| 170 | .trust = X509_TRUST_OCSP_REQUEST, | 170 | .trust = X509_TRUST_OCSP_REQUEST, |
| 171 | .check_trust = trust_1oid, | 171 | .check_trust = trust_1oid, |
| 172 | .arg1 = NID_ad_OCSP, | 172 | .nid = NID_ad_OCSP, |
| 173 | }, | 173 | }, |
| 174 | { | 174 | { |
| 175 | .trust = X509_TRUST_TSA, | 175 | .trust = X509_TRUST_TSA, |
| 176 | .check_trust = trust_1oidany, | 176 | .check_trust = trust_1oidany, |
| 177 | .arg1 = NID_time_stamp, | 177 | .nid = NID_time_stamp, |
| 178 | }, | 178 | }, |
| 179 | }; | 179 | }; |
| 180 | 180 | ||
