Rename int_*() functions to *_int()

[openssl.git] / include / internal / dane.h

diff --git a/include/internal/dane.h b/include/internal/dane.h
index 0d35cc2405e3972164fc5880a9c586a27b6fe32f..1672849c8328cdfc3b7597478ecfbaf48f2845cf 100644 (file)
--- a/include/internal/dane.h
+++ b/include/internal/dane.h
@@ -1,4 +1,3 @@
-/* dane.h */
 /*
  * Written by Viktor Dukhovni (viktor@openssl.org) for the OpenSSL project
  * 2015.
@@ -111,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 */
@@ -122,7 +121,7 @@ struct dane_st {
     int             pdpth;      /* Depth of PKIX trust */
 };
 
-#define DANETLS_ENABLED(dane)  ((dane) && ((dane)->trecs != NULL))
+#define DANETLS_ENABLED(dane)  ((dane) != NULL && ((dane)->trecs != NULL))
 
 #define DANETLS_USAGE_BIT(u)   (((uint32_t)1) << u)