Wireshark · Wireshark-dev: [Wireshark-dev] epan/dissectors/packet-ssl-utils.h fails compilation at commit b642a280cb74b94e62

[Shu Shen <shu.shen@xxxxxxxxx>]

It appears this latest change has mishandled the case when both HAVE_LIBGNUTLS and HAVE_LIBGCRYPT are undefined.

=== Proposed Patch ===

diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h

index e26f323..330fe5e 100644

--- a/epan/dissectors/packet-ssl-utils.h

+++ b/epan/dissectors/packet-ssl-utils.h

@@ -55,6 +55,9 @@

 #define SSL_CIPHER_CTX void*

 #define SSL_PRIVATE_KEY void

 #endif /* HAVE_LIBGCRYPT */

+#else  /* HAVE_LIBGNUTLS */

+#define SSL_CIPHER_CTX void*

+#define SSL_PRIVATE_KEY void

 #endif /* HAVE_LIBGNUTLS */

=== Compile Error Message ===

  CC       libdissectors_la-packet-dtls.lo

In file included from packet-dtls.c:64:0:

packet-ssl-utils.h:279:5: error: unknown type name 'SSL_CIPHER_CTX'

     SSL_CIPHER_CTX evp;

     ^

packet-ssl-utils.h:361:5: error: unknown type name 'SSL_PRIVATE_KEY'

     SSL_PRIVATE_KEY* private_key;

     ^

packet-ssl-utils.h:391:5: error: unknown type name 'SSL_PRIVATE_KEY'

     SSL_PRIVATE_KEY       *sexp_pkey;

     ^

packet-ssl-utils.h:433:18: error: unknown type name 'SSL_CIPHER_CTX'

 ssl_cipher_setiv(SSL_CIPHER_CTX *cipher, guchar* iv, gint iv_len);

                  ^

packet-ssl-utils.h:490:39: error: unknown type name 'SSL_PRIVATE_KEY'

     StringInfo* encrypted_pre_master, SSL_PRIVATE_KEY *pk);

                                       ^

make[5]: *** [libdissectors_la-packet-dtls.lo] Error 1