diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2016-10-16 22:36:50 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2016-10-16 22:36:50 +0000 |
| commit | 3a6eac6c6d6d78df7d80e9c4c89f9bd0d69e9a9a (patch) | |
| tree | d1472e5e89a50040c11e1a8f0cb5b688c6a3afc1 /net/wireshark/files/patch-epan_dissectors_packet-spnego.c | |
| parent | Newlib is a C library intended for use on embedded systems. It is (diff) | |
Update to 2.2.1. Incorporate patches from PR 213356 to fix the build
with base Kerberos and add more explicit dependencies.
For changes in 2.2.1, see https://www.wireshark.org/docs/relnotes/wireshark-2.2.1.html .
PR: 213356
Submitted by: Piotr Kubaj <pkubaj@anongoth.pl>
Diffstat (limited to 'net/wireshark/files/patch-epan_dissectors_packet-spnego.c')
| -rw-r--r-- | net/wireshark/files/patch-epan_dissectors_packet-spnego.c | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/net/wireshark/files/patch-epan_dissectors_packet-spnego.c b/net/wireshark/files/patch-epan_dissectors_packet-spnego.c new file mode 100644 index 000000000000..79fc023b9600 --- /dev/null +++ b/net/wireshark/files/patch-epan_dissectors_packet-spnego.c @@ -0,0 +1,39 @@ +--- epan/dissectors/packet-spnego.c.orig 2016-10-04 18:27:52 UTC ++++ epan/dissectors/packet-spnego.c +@@ -775,6 +775,9 @@ dissect_spnego_krb5(tvbuff_t *tvb, packe + #ifndef KEYTYPE_ARCFOUR_56 + # define KEYTYPE_ARCFOUR_56 24 + #endif ++#ifndef KEYTYPE_ARCFOUR_HMAC ++# define KEYTYPE_ARCFOUR_HMAC 23 ++#endif + /* XXX - We should probably do a configure-time check for this instead */ + #ifndef KRB5_KU_USAGE_SEAL + # define KRB5_KU_USAGE_SEAL 22 +@@ -1299,7 +1302,7 @@ dissect_spnego_krb5_wrap_base(tvbuff_t * + decrypt_gssapi_krb_arcfour_wrap(tree, + pinfo, + tvb, +- KERB_ENCTYPE_RC4_HMAC, ++ KEYTYPE_ARCFOUR_HMAC, + gssapi_encrypt); + #endif /* HAVE_HEIMDAL_KERBEROS || HAVE_MIT_KERBEROS */ + } +@@ -1966,7 +1969,7 @@ void proto_register_spnego(void) { + NULL, HFILL }}, + + /*--- End of included file: packet-spnego-hfarr.c ---*/ +-#line 1421 "./asn1/spnego/packet-spnego-template.c" ++#line 1424 "./asn1/spnego/packet-spnego-template.c" + }; + + /* List of subtrees */ +@@ -1989,7 +1992,7 @@ void proto_register_spnego(void) { + &ett_spnego_InitialContextToken_U, + + /*--- End of included file: packet-spnego-ettarr.c ---*/ +-#line 1431 "./asn1/spnego/packet-spnego-template.c" ++#line 1434 "./asn1/spnego/packet-spnego-template.c" + }; + + static ei_register_info ei[] = { |