parent
73534a5320
commit
581f0ad413
|
@ -0,0 +1,42 @@
|
||||||
|
From bb64c550ae19b08ad4e6d8d26f68c2474cb251e6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Stefan Metzmacher <metze@samba.org>
|
||||||
|
Date: Tue, 19 Jul 2016 16:31:01 +0200
|
||||||
|
Subject: [PATCH] krb5_wrap: provide CKSUMTYPE_HMAC_SHA1_96_AES_*
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
MIT only defined this as CKSUMTYPE_HMAC_SHA1_96_AES128,
|
||||||
|
while Heimdal has CKSUMTYPE_HMAC_SHA1_96_AES_128.
|
||||||
|
|
||||||
|
Signed-off-by: Stefan Metzmacher <metze@samba.org>
|
||||||
|
Reviewed-by: Günther Deschner <gd@samba.org>
|
||||||
|
---
|
||||||
|
lib/krb5_wrap/krb5_samba.h | 11 +++++++++++
|
||||||
|
1 file changed, 11 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h
|
||||||
|
index 41664f1..2b5e2bb 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;
|
||||||
|
--
|
||||||
|
2.9.3
|
||||||
|
|
|
@ -109,6 +109,7 @@ Source201: README.downgrade
|
||||||
|
|
||||||
Patch0: samba-4.4.5-fix_resolving_trusted_domain_users.patch
|
Patch0: samba-4.4.5-fix_resolving_trusted_domain_users.patch
|
||||||
Patch1: samba-4.4.7-vfs_gluster_realpath.patch
|
Patch1: samba-4.4.7-vfs_gluster_realpath.patch
|
||||||
|
Patch2: samba-4.4.9-krb5_cksumtype_checks.patch
|
||||||
|
|
||||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||||
|
|
||||||
|
@ -693,6 +694,7 @@ and use CTDB instead.
|
||||||
|
|
||||||
%patch0 -p 1 -b .samba-4.4.5-fix_resolving_trusted_domain_users.patch
|
%patch0 -p 1 -b .samba-4.4.5-fix_resolving_trusted_domain_users.patch
|
||||||
%patch1 -p 1 -b .samba-4.4.7-vfs_gluster_realpath.patch
|
%patch1 -p 1 -b .samba-4.4.7-vfs_gluster_realpath.patch
|
||||||
|
%patch2 -p 1 -b .samba-4.4.9-krb5_cksumtype_checks.patch
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%global _talloc_lib ,talloc,pytalloc,pytalloc-util
|
%global _talloc_lib ,talloc,pytalloc,pytalloc-util
|
||||||
|
|
Loading…
Reference in New Issue