diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-09-20 23:18:34 -0700 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-11-13 23:19:05 +1100 |
| commit | 5bc87c14a1f5b45ed86e7ff9663f5f0aa2f70094 (patch) | |
| tree | 82c3416f2211df07d5fe1e58ee6639f09e465a60 /source4/heimdal_build | |
| parent | 12205347163b55e79651921c6858c4d04e1faa51 (diff) | |
| download | samba-5bc87c14a1f5b45ed86e7ff9663f5f0aa2f70094.tar.gz samba-5bc87c14a1f5b45ed86e7ff9663f5f0aa2f70094.tar.bz2 samba-5bc87c14a1f5b45ed86e7ff9663f5f0aa2f70094.zip | |
s4:heimdal: import lorikeet-heimdal-200909210500 (commit 290db8d23647a27c39b97c189a0b2ef6ec21ca69)
Diffstat (limited to 'source4/heimdal_build')
| -rw-r--r-- | source4/heimdal_build/internal.mk | 3 | ||||
| -rw-r--r-- | source4/heimdal_build/roken.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/source4/heimdal_build/internal.mk b/source4/heimdal_build/internal.mk index a2b5df7257..7e85b9758d 100644 --- a/source4/heimdal_build/internal.mk +++ b/source4/heimdal_build/internal.mk @@ -428,7 +428,7 @@ HEIMDAL_HCRYPTO_OBJ_FILES = \ $(heimdalsrcdir)/lib/hcrypto/ui.o \ $(heimdalsrcdir)/lib/hcrypto/evp.o \ $(heimdalsrcdir)/lib/hcrypto/evp-hcrypto.o \ - $(heimdalsrcdir)/lib/hcrypto/evp-aes-cts.o \ + $(heimdalsrcdir)/lib/hcrypto/evp-cc.o \ $(heimdalsrcdir)/lib/hcrypto/pkcs5.o \ $(heimdalsrcdir)/lib/hcrypto/pkcs12.o \ $(heimdalsrcdir)/lib/hcrypto/rand.o \ @@ -608,6 +608,7 @@ PRIVATE_DEPENDENCIES = \ HEIMDAL_ROKEN_OBJ_FILES = \ $(heimdalsrcdir)/lib/roken/base64.o \ + $(heimdalsrcdir)/lib/roken/ct.o \ $(heimdalsrcdir)/lib/roken/hex.o \ $(heimdalsrcdir)/lib/roken/bswap.o \ $(heimdalsrcdir)/lib/roken/dumpdata.o \ diff --git a/source4/heimdal_build/roken.h b/source4/heimdal_build/roken.h index ea9103e15d..2d46767e1b 100644 --- a/source4/heimdal_build/roken.h +++ b/source4/heimdal_build/roken.h @@ -4,6 +4,9 @@ #ifndef _ROKEN_H_ #define _ROKEN_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" |