From: Stefan Metzmacher Date: Tue, 19 Jul 2016 14:31:01 +0000 (+0200) Subject: krb5_wrap: provide CKSUMTYPE_HMAC_SHA1_96_AES_* X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35e2373d3f5c0fe0b88751402fe9d24b9d2872e6;p=thirdparty%2Fsamba.git krb5_wrap: provide CKSUMTYPE_HMAC_SHA1_96_AES_* MIT only defined this as CKSUMTYPE_HMAC_SHA1_96_AES128, while Heimdal has CKSUMTYPE_HMAC_SHA1_96_AES_128. Signed-off-by: Stefan Metzmacher Reviewed-by: Günther Deschner (cherry picked from commit bb64c550ae19b08ad4e6d8d26f68c2474cb251e6) BUG: https://bugzilla.samba.org/show_bug.cgi?id=12471 Patches for CVE-2016-2126 break build with MIT Kerberos Autobuild-User(v4-3-test): Karolin Seeger Autobuild-Date(v4-3-test): Mon Jan 2 11:30:28 CET 2017 on sn-devel-104 --- diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h index cef9144a17e..20ef6a3ca53 100644 --- a/lib/krb5_wrap/krb5_samba.h +++ b/lib/krb5_wrap/krb5_samba.h @@ -74,6 +74,17 @@ #define CKSUMTYPE_HMAC_MD5 CKSUMTYPE_HMAC_MD5_ARCFOUR #endif +/* + * CKSUMTYPE_HMAC_SHA1_96_AES_* in Heimdal + * CKSUMTYPE_HMAC_SHA1_96_AES* in MIT + */ +#if defined(CKSUMTYPE_HMAC_SHA1_96_AES128) && !defined(CKSUMTYPE_HMAC_SHA1_96_AES_128) +#define CKSUMTYPE_HMAC_SHA1_96_AES_128 CKSUMTYPE_HMAC_SHA1_96_AES128 +#endif +#if defined(CKSUMTYPE_HMAC_SHA1_96_AES256) && !defined(CKSUMTYPE_HMAC_SHA1_96_AES_256) +#define CKSUMTYPE_HMAC_SHA1_96_AES_256 CKSUMTYPE_HMAC_SHA1_96_AES256 +#endif + typedef struct { #if defined(HAVE_MAGIC_IN_KRB5_ADDRESS) && defined(HAVE_ADDRTYPE_IN_KRB5_ADDRESS) /* MIT */ krb5_address **addrs;