diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2023-04-16 18:42:31 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2023-04-16 18:42:31 +0000 |
| commit | c363904c977d4c2f5cb9cdf9f9a804a3d91bbf33 (patch) | |
| tree | 6e2a42ca4739efa89de67329ab95a4c0a50f6f71 /lib/libcrypto | |
| parent | c5f54d0b02dbfc5aff24ed35547292779679bb0a (diff) | |
Move X509_VERIFY_PARAM_st from vpm_int.h to x509_local.h
Diffstat (limited to 'lib/libcrypto')
| -rw-r--r-- | lib/libcrypto/x509/vpm_int.h | 13 | ||||
| -rw-r--r-- | lib/libcrypto/x509/x509_local.h | 13 |
2 files changed, 13 insertions, 13 deletions
diff --git a/lib/libcrypto/x509/vpm_int.h b/lib/libcrypto/x509/vpm_int.h index 7fc9fef761b..d50c5e46fd9 100644 --- a/lib/libcrypto/x509/vpm_int.h +++ b/lib/libcrypto/x509/vpm_int.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vpm_int.h,v 1.4 2018/04/06 07:08:20 beck Exp $ */ +/* $OpenBSD: vpm_int.h,v 1.5 2023/04/16 18:42:30 tb Exp $ */ /* * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project * 2013. @@ -61,15 +61,4 @@ __BEGIN_HIDDEN_DECLS /* internal only structure to hold additional X509_VERIFY_PARAM data */ -struct X509_VERIFY_PARAM_ID_st { - STACK_OF(OPENSSL_STRING) *hosts; /* Set of acceptable names */ - unsigned int hostflags; /* Flags to control matching features */ - char *peername; /* Matching hostname in peer certificate */ - char *email; /* If not NULL email address to match */ - size_t emaillen; - unsigned char *ip; /* If not NULL IP address to match */ - size_t iplen; /* Length of IP address */ - int poisoned; -}; - __END_HIDDEN_DECLS diff --git a/lib/libcrypto/x509/x509_local.h b/lib/libcrypto/x509/x509_local.h index 6792a3c5b81..043fc2dacf2 100644 --- a/lib/libcrypto/x509/x509_local.h +++ b/lib/libcrypto/x509/x509_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_local.h,v 1.3 2023/04/16 08:08:34 tb Exp $ */ +/* $OpenBSD: x509_local.h,v 1.4 2023/04/16 18:42:30 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2013. */ @@ -370,6 +370,17 @@ struct x509_store_ctx_st { CRYPTO_EX_DATA ex_data; } /* X509_STORE_CTX */; +struct X509_VERIFY_PARAM_ID_st { + STACK_OF(OPENSSL_STRING) *hosts; /* Set of acceptable names */ + unsigned int hostflags; /* Flags to control matching features */ + char *peername; /* Matching hostname in peer certificate */ + char *email; /* If not NULL email address to match */ + size_t emaillen; + unsigned char *ip; /* If not NULL IP address to match */ + size_t iplen; /* Length of IP address */ + int poisoned; +}; + int x509_check_cert_time(X509_STORE_CTX *ctx, X509 *x, int quiet); int name_cmp(const char *name, const char *cmp); |