From 7353fadc50bdbfe15ac1df0181268750f17a74ad Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Tue, 14 Feb 2006 18:52:26 +0000 Subject: Make sure SSL_DEBUG_USE_STDERR is always defined. svn path=/trunk/; revision=17303 --- epan/dissectors/packet-ssl-utils.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'epan/dissectors/packet-ssl-utils.h') diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index 4a0fafeb5a..f852e5c4c3 100644 --- a/epan/dissectors/packet-ssl-utils.h +++ b/epan/dissectors/packet-ssl-utils.h @@ -29,7 +29,7 @@ #ifdef HAVE_LIBGNUTLS #ifdef _WIN32 #include -#endif +#endif /* _WIN32 */ #include #include @@ -38,18 +38,17 @@ /* #define SSL_FAST 1 */ #define SSL_DECRYPT_DEBUG -#define SSL_DEBUG_USE_STDERR "-" #define SSL_CIPHER_CTX gcry_cipher_hd_t #ifdef SSL_FAST #define SSL_PRIVATE_KEY gcry_mpi_t -#else +#else /* SSL_FAST */ #define SSL_PRIVATE_KEY struct gcry_sexp -#endif -#else +#endif /* SSL_FAST */ +#else /* HAVE_LIBGNUTLS */ #define SSL_CIPHER_CTX void* #define SSL_PRIVATE_KEY void -#endif +#endif /* HAVE_LIBGNUTLS */ typedef struct _StringInfo { unsigned char* data; @@ -71,6 +70,8 @@ typedef struct _StringInfo { #define SSL_CIPHER_MODE_STREAM 0 #define SSL_CIPHER_MODE_CBC 1 +#define SSL_DEBUG_USE_STDERR "-" + typedef struct _SslCipherSuite { int number; int kex; -- cgit v1.2.3