From: Isaac Boukris <iboukris@gmail.com>
Date: Sat, 16 Nov 2019 22:03:34 +0000 (+0100)
Subject: heimdal: do not compile weak crypto
X-Git-Tag: ldb-2.1.0~680
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=389d1b979b8a4235033a298a56e6c10294a515fe

heimdal: do not compile weak crypto

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14202

Signed-off-by: Isaac Boukris <iboukris@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index c3a3a68b7b6..76f3ebb1fea 100644
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -262,7 +262,6 @@ sub mk_krb5_conf($$)
  dns_lookup_kdc = true
  ticket_lifetime = 24h
  forwardable = yes
- allow_weak_crypto = yes
 
  name_canon_rules=as-is:realm=$ctx->{realm}
  name_canon_rules=as-is:realm=$ctx->{dnsname}
diff --git a/source4/heimdal_build/roken.h b/source4/heimdal_build/roken.h
index 9752c04a741..559021c0a0e 100644
--- a/source4/heimdal_build/roken.h
+++ b/source4/heimdal_build/roken.h
@@ -6,9 +6,6 @@
 
 #include "config.h"
 
-/* Support 'weak' keys for now, it can't be worse than NTLM and we don't want to hard-code the behaviour at this point */
-#define HEIM_WEAK_CRYPTO 1
-
 /* path to sysconf - should we force this to samba LIBDIR ? */
 #define SYSCONFDIR "/etc"