heimdal_build: include heimdal's new EVP code to fix the build

metze

diff --git a/source/heimdal_build/internal.mk b/source/heimdal_build/internal.mk
index 3f37bbb6a578b9cdb3c92d41be58237d3de9a71d..67fda9dd58a76250e318217d64a773bf133886fc 100644 (file)
--- a/source/heimdal_build/internal.mk
+++ b/source/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/source/heimdal_build/kpasswdd-glue.h b/source/heimdal_build/kpasswdd-glue.h
index 2a7c3c0690f263878a55d1a5adae775bdfbd06ba..47ac26d2851e06a5ed26b89550f4a18f4f660fb2 100644 (file)
--- a/source/heimdal_build/kpasswdd-glue.h
+++ b/source/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"