Make sure SSL_DEBUG_USE_STDERR is always defined.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@17303 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h
index 4a0fafeb5a958919d086a1621694eb2195807263..f852e5c4c3f519f9048f579aa666868235e4b27a 100644 (file)
--- a/epan/dissectors/packet-ssl-utils.h
+++ b/epan/dissectors/packet-ssl-utils.h
@@ -29,7 +29,7 @@
 #ifdef HAVE_LIBGNUTLS
 #ifdef _WIN32
 #include <winposixtype.h>
-#endif
+#endif /* _WIN32 */
 
 #include <stdio.h>
 #include <gcrypt.h>
@@ -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;

diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c
index 8a960f2d471b9961344f6ab0995b36df57fa6f45..a13fb6cf3d156b2a9c1bad5960d70a51275fe3c0 100644 (file)
--- a/epan/dissectors/packet-ssl.c
+++ b/epan/dissectors/packet-ssl.c
@@ -4317,7 +4317,7 @@ proto_register_ssl(void)
              (const char **)&ssl_ports_list);
         prefs_register_string_preference(ssl_module, "debug_file", "SSL debug file",
              "redirect ssl debug to file name; leave empty to disable debug, "
-             "use \""SSL_DEBUG_USE_STDERR"\" to redirect output to stderr\n",
+             "use \"" SSL_DEBUG_USE_STDERR "\" to redirect output to stderr\n",
              (const char **)&ssl_debug_file_name);
     }