diff options
| author | Rich Salz <rsalz@openssl.org> | 2016-04-08 09:10:06 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-04-08 09:30:23 -0400 |
| commit | b9aec69ace2ae84b2b4494cc49725945805d5a29 (patch) | |
| tree | fc7d8005823a1c6db57765ce0b060375765dd90e /include | |
| parent | 506e28b3e3d954bd71e915aa7aa3f966ee0d24ec (diff) | |
Add SSL_DANE typedef for consistency.
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/dane.h | 2 | ||||
| -rw-r--r-- | include/openssl/ossl_typ.h | 1 | ||||
| -rw-r--r-- | include/openssl/ssl.h | 2 | ||||
| -rw-r--r-- | include/openssl/x509_vfy.h | 4 |
4 files changed, 5 insertions, 4 deletions
diff --git a/include/internal/dane.h b/include/internal/dane.h index 42581104fd..1672849c83 100644 --- a/include/internal/dane.h +++ b/include/internal/dane.h @@ -110,7 +110,7 @@ struct dane_ctx_st { /* * Per connection DANE state */ -struct dane_st { +struct ssl_dane_st { struct dane_ctx_st *dctx; STACK_OF(danetls_record) *trecs; STACK_OF(X509) *certs; /* DANE-TA(2) Cert(0) Full(0) certs */ diff --git a/include/openssl/ossl_typ.h b/include/openssl/ossl_typ.h index 7a8d319989..ee6ebcfb67 100644 --- a/include/openssl/ossl_typ.h +++ b/include/openssl/ossl_typ.h @@ -158,6 +158,7 @@ typedef struct ec_key_method_st EC_KEY_METHOD; typedef struct rand_meth_st RAND_METHOD; +typedef struct ssl_dane_st SSL_DANE; typedef struct x509_st X509; typedef struct X509_algor_st X509_ALGOR; typedef struct X509_crl_st X509_CRL; diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index ae9d8f27eb..8459c93e05 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -1578,7 +1578,7 @@ __owur int SSL_get0_dane_tlsa(SSL *s, uint8_t *usage, uint8_t *selector, * Bridge opacity barrier between libcrypt and libssl, also needed to support * offline testing in test/danetest.c */ -struct dane_st *SSL_get0_dane(SSL *ssl); +SSL_DANE *SSL_get0_dane(SSL *ssl); __owur int SSL_CTX_set1_param(SSL_CTX *ctx, X509_VERIFY_PARAM *vpm); __owur int SSL_set1_param(SSL *ssl, X509_VERIFY_PARAM *vpm); diff --git a/include/openssl/x509_vfy.h b/include/openssl/x509_vfy.h index 093b0f3d0a..2d0cbc0ddf 100644 --- a/include/openssl/x509_vfy.h +++ b/include/openssl/x509_vfy.h @@ -262,7 +262,7 @@ struct x509_store_ctx_st { /* X509_STORE_CTX */ /* For CRL path validation: parent context */ X509_STORE_CTX *parent; CRYPTO_EX_DATA ex_data; - struct dane_st *dane; + SSL_DANE *dane; /* signed via bare TA public key, rather than CA certificate */ int bare_ta_signed; } /* X509_STORE_CTX */ ; @@ -536,7 +536,7 @@ int X509_STORE_CTX_set_default(X509_STORE_CTX *ctx, const char *name); * Bridge opacity barrier between libcrypt and libssl, also needed to support * offline testing in test/danetest.c */ -void X509_STORE_CTX_set0_dane(X509_STORE_CTX *ctx, struct dane_st *dane); +void X509_STORE_CTX_set0_dane(X509_STORE_CTX *ctx, SSL_DANE *dane); /* X509_VERIFY_PARAM functions */ |