diff options
| author | Gerald Combs <gerald@wireshark.org> | 2006-02-14 18:52:26 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2006-02-14 18:52:26 +0000 |
| commit | 7353fadc50bdbfe15ac1df0181268750f17a74ad (patch) | |
| tree | f01612cb9931d9ce06b34fd6ffa41c63b77f191b /epan/dissectors | |
| parent | 0d3244a6fe3f44c0d626f8fe08d5fa0ca78e65d2 (diff) | |
Make sure SSL_DEBUG_USE_STDERR is always defined.
svn path=/trunk/; revision=17303
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.h | 13 | ||||
| -rw-r--r-- | epan/dissectors/packet-ssl.c | 2 |
2 files changed, 8 insertions, 7 deletions
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 <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 8a960f2d47..a13fb6cf3d 100644 --- 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); } |