diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2013-12-11 14:28:57 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2013-12-13 15:42:16 +0000 |
| commit | 4a253652eebd8678d2d4494705c0ce498966fc20 (patch) | |
| tree | b23795a290d854bd4c57f6e5f198f5a2859d48c2 /crypto/x509/x509_vfy.h | |
| parent | 4fcdd66fff5fea0cfa1055c6680a76a4303f28a2 (diff) | |
| download | openssl-4a253652eebd8678d2d4494705c0ce498966fc20.tar.gz | |
Add opaque ID structure.
Move the IP, email and host checking fields from the public
X509_VERIFY_PARAM structure into an opaque X509_VERIFY_PARAM_ID
structure. By doing this the structure can be modified in future
without risk of breaking any applications.
(cherry picked from commit adc6bd73e3bd10ce6e76867482e8d137071298d7)
Conflicts:
crypto/x509/x509_vpm.c
Diffstat (limited to 'crypto/x509/x509_vfy.h')
| -rw-r--r-- | crypto/x509/x509_vfy.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/crypto/x509/x509_vfy.h b/crypto/x509/x509_vfy.h index a8d61e6e43..24115ccfa2 100644 --- a/crypto/x509/x509_vfy.h +++ b/crypto/x509/x509_vfy.h @@ -158,6 +158,8 @@ typedef struct x509_lookup_method_st X509_OBJECT *ret); } X509_LOOKUP_METHOD; +typedef struct X509_VERIFY_PARAM_ID_st X509_VERIFY_PARAM_ID; + /* This structure hold all parameters associated with a verify operation * by including an X509_VERIFY_PARAM structure in related structures the * parameters used can be customized @@ -173,12 +175,7 @@ typedef struct X509_VERIFY_PARAM_st int trust; /* trust setting to check */ int depth; /* Verify depth */ STACK_OF(ASN1_OBJECT) *policies; /* Permissible policies */ - unsigned char *host; /* If not NULL hostname to match */ - size_t hostlen; - unsigned 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 */ + X509_VERIFY_PARAM_ID *id; /* opaque ID data */ } X509_VERIFY_PARAM; DECLARE_STACK_OF(X509_VERIFY_PARAM) |