forked from pool/wireshark
6ab2ee3f7c
Copy from network:utilities/wireshark based on submit request 21610 from user prusnak OBS-URL: https://build.opensuse.org/request/show/21610 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wireshark?expand=0&rev=24
68 lines
2.0 KiB
Diff
68 lines
2.0 KiB
Diff
Index: epan/dissectors/packet-ssl-utils.c
|
|
===================================================================
|
|
--- epan/dissectors/packet-ssl-utils.c (revision 29905)
|
|
+++ epan/dissectors/packet-ssl-utils.c (revision 29906)
|
|
@@ -43,6 +43,17 @@
|
|
* Lookup tables
|
|
*
|
|
*/
|
|
+const gchar* ssl_version_short_names[] = {
|
|
+ "SSL",
|
|
+ "SSLv2",
|
|
+ "SSLv3",
|
|
+ "TLSv1",
|
|
+ "TLSv1.1",
|
|
+ "DTLSv1.0",
|
|
+ "PCT",
|
|
+ "TLSv1.2"
|
|
+};
|
|
+
|
|
const value_string ssl_20_msg_types[] = {
|
|
{ SSL2_HND_ERROR, "Error" },
|
|
{ SSL2_HND_CLIENT_HELLO, "Client Hello" },
|
|
Index: epan/dissectors/packet-ssl-utils.h
|
|
===================================================================
|
|
--- epan/dissectors/packet-ssl-utils.h (revision 29905)
|
|
+++ epan/dissectors/packet-ssl-utils.h (revision 29906)
|
|
@@ -150,6 +150,7 @@
|
|
* Lookup tables
|
|
*
|
|
*/
|
|
+extern const gchar* ssl_version_short_names[];
|
|
extern const value_string ssl_20_msg_types[];
|
|
extern const value_string ssl_20_cipher_suites[];
|
|
extern const value_string ssl_20_certificate_type[];
|
|
Index: epan/dissectors/packet-dtls.c
|
|
===================================================================
|
|
--- epan/dissectors/packet-dtls.c (revision 29905)
|
|
+++ epan/dissectors/packet-dtls.c (revision 29906)
|
|
@@ -74,8 +74,6 @@
|
|
#include "inet_v6defs.h"
|
|
#include "packet-ssl-utils.h"
|
|
|
|
-extern const gchar *ssl_version_short_names[];
|
|
-
|
|
/* we need to remember the top tree so that subdissectors we call are created
|
|
* at the root and not deep down inside the DTLS decode
|
|
*/
|
|
Index: epan/dissectors/packet-ssl.c
|
|
===================================================================
|
|
--- epan/dissectors/packet-ssl.c (revision 29905)
|
|
+++ epan/dissectors/packet-ssl.c (revision 29906)
|
|
@@ -272,15 +272,6 @@
|
|
static gchar* ssl_debug_file_name = NULL;
|
|
#endif
|
|
|
|
-const gchar* ssl_version_short_names[] = {
|
|
- "SSL",
|
|
- "SSLv2",
|
|
- "SSLv3",
|
|
- "TLSv1",
|
|
- "TLSv1.1",
|
|
- "DTLSv1.0",
|
|
- "PCT"
|
|
-};
|
|
|
|
/* Forward declaration we need below */
|
|
void proto_reg_handoff_ssl(void);
|