[wireshark/f20] fix decode Camellia encryption for Kerberos 5

[Peter Hatina]

commit dad2e97f0f03cb5d81d3a253d3c8cf04339db6bf
Author: Peter Hatina <phatina at redhat.com>
Date:   Tue Sep 2 12:29:22 2014 +0200

    fix decode Camellia encryption for Kerberos 5

 wireshark-0029-kerberos-camellia.patch |   22 ++++++++++++++++++++++
 wireshark.spec                         |    8 +++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/wireshark-0029-kerberos-camellia.patch b/wireshark-0029-kerberos-camellia.patch
new file mode 100644
index 0000000..ef52a57
--- /dev/null
+++ b/wireshark-0029-kerberos-camellia.patch
@@ -0,0 +1,22 @@
+diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
+index 90000c2..b0dc967 100644
+--- a/epan/dissectors/packet-kerberos.c
++++ b/epan/dissectors/packet-kerberos.c
+@@ -1007,6 +1007,8 @@ g_warning("woohoo decrypted keytype:%d in frame:%u\n", keytype, pinfo->fd->num);
+ #define KRB5_ENCTYPE_DES_CBC_MD5_NT               20
+ #define KERB_ENCTYPE_RC4_HMAC                     23
+ #define KERB_ENCTYPE_RC4_HMAC_EXP                 24
++#define KERB_ENCTYPE_CAMELLIA128_CTS_CMAC         25
++#define KERB_ENCTYPE_CAMELLIA256_CTS_CMAC         26
+ #define KRB5_ENCTYPE_UNKNOWN                   0x1ff
+ #define KRB5_ENCTYPE_LOCAL_DES3_HMAC_SHA1     0x7007
+ #define KRB5_ENCTYPE_RC4_PLAIN_EXP        0xffffff73
+@@ -1364,6 +1366,8 @@ static const value_string krb5_encryption_types[] = {
+     { KRB5_ENCTYPE_DES_CBC_MD5_NT  , "des-cbc-md5-nt" },
+     { KERB_ENCTYPE_RC4_HMAC       , "rc4-hmac" },
+     { KERB_ENCTYPE_RC4_HMAC_EXP   , "rc4-hmac-exp" },
++    { KERB_ENCTYPE_CAMELLIA128_CTS_CMAC, "camellia128-cts-cmac" },
++    { KERB_ENCTYPE_CAMELLIA256_CTS_CMAC, "camellia256-cts-cmac" },
+     { KRB5_ENCTYPE_UNKNOWN        , "unknown" },
+     { KRB5_ENCTYPE_LOCAL_DES3_HMAC_SHA1    , "local-des3-hmac-sha1" },
+     { KRB5_ENCTYPE_RC4_PLAIN_EXP  , "rc4-plain-exp" },
diff --git a/wireshark.spec b/wireshark.spec
index a99536f..a362ff6 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -21,7 +21,7 @@
 Summary:	Network traffic analyzer
 Name:		wireshark
 Version:	1.10.9
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL+
 Group:		Applications/Internet
 Source0:	http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
@@ -83,6 +83,7 @@ Patch26:        wireshark-0026-amqp-1.0.patch
 # No longer necessary - will be removed in the next release (1.12.x)
 Patch27:        wireshark-0027-frame-fix.patch
 Patch28:        wireshark-0028-dtls-elliptic-curves.patch
+Patch29:        wireshark-0029-kerberos-camellia.patch
 
 Url:		http://www.wireshark.org/
 BuildRequires:	libpcap-devel >= 0.9
@@ -205,6 +206,7 @@ and plugins.
 %patch26 -p1 -b .amqp-1.0
 #%patch27 -p1 -b .frame
 %patch28 -p1 -b .dtls-elliptic-curves
+%patch29 -p1 -b .krb-camellia
 
 %build
 %ifarch s390 s390x sparcv9 sparc64
@@ -403,6 +405,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/aclocal/*
 
 %changelog
+* Tue Sep  2 2014 Peter Hatina <phatina at redhat.com> - 1.10.9-3
+- fix decode Camellia encryption for Kerberos 5
+- Resolves: rhbz#1131135
+
 * Tue Sep  2 2014 Peter Hatina <phatina at redhat.com> - 1.10.9-2
 - fix decode elliptic curves in DTLS
 - Resolves: rhbz#1131200