diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-08-26 11:31:57 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-08-26 19:46:38 +0200 |
| commit | 2356cd74783c64162b580b8793014e4956bab152 (patch) | |
| tree | 54d662bc7c37e8d1506714687b0bdc10bb6d5266 | |
| parent | 243321b4bbe273cf3a9105ca132caa2b53e2f263 (diff) | |
| download | samba-2356cd74783c64162b580b8793014e4956bab152.tar.gz samba-2356cd74783c64162b580b8793014e4956bab152.tar.bz2 samba-2356cd74783c64162b580b8793014e4956bab152.zip | |
heimdal_build: include heimdal's new EVP code to fix the build
metze
(This used to be commit f454342d48e1dce7dff0bcff246c7237bed94fd5)
| -rw-r--r-- | source4/heimdal_build/internal.mk | 2 | ||||
| -rw-r--r-- | source4/heimdal_build/kpasswdd-glue.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/source4/heimdal_build/internal.mk b/source4/heimdal_build/internal.mk index 3f37bbb6a5..67fda9dd58 100644 --- a/source4/heimdal_build/internal.mk +++ b/source4/heimdal_build/internal.mk @@ -346,6 +346,7 @@ HEIMDAL_KRB5_OBJ_FILES = \ $(heimdalsrcdir)/lib/krb5/heim_err.o \ $(heimdalsrcdir)/lib/krb5/k524_err.o \ $(heimdalsrcdir)/lib/krb5/krb_err.o \ + $(heimdalsrcdir)/lib/hcrypto/evp-aes-cts.o \ $(heimdalbuildsrcdir)/krb5-glue.o $(eval $(call heimdal_proto_header_template, \ @@ -424,6 +425,7 @@ HEIMDAL_HCRYPTO_OBJ_FILES = \ $(heimdalsrcdir)/lib/hcrypto/sha256.o \ $(heimdalsrcdir)/lib/hcrypto/ui.o \ $(heimdalsrcdir)/lib/hcrypto/evp.o \ + $(heimdalsrcdir)/lib/hcrypto/evp-hcrypto.o \ $(heimdalsrcdir)/lib/hcrypto/pkcs5.o \ $(heimdalsrcdir)/lib/hcrypto/pkcs12.o \ $(heimdalsrcdir)/lib/hcrypto/rand.o \ diff --git a/source4/heimdal_build/kpasswdd-glue.h b/source4/heimdal_build/kpasswdd-glue.h index 2a7c3c0690..47ac26d285 100644 --- a/source4/heimdal_build/kpasswdd-glue.h +++ b/source4/heimdal_build/kpasswdd-glue.h @@ -1,3 +1,6 @@ /* TODO: remove this file */ -#include "heimdal/lib/hcrypto/aes.h" +struct _krb5_krb_auth_data; +struct krb5_dh_moduli; +struct AlgorithmIdentifier; +#include "heimdal/lib/hcrypto/evp.h" #include "heimdal/lib/krb5/krb5-private.h" |