diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-03-11 04:03:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:56:58 -0500 |
| commit | b7afac2b834674e20f303c3a03b4ac7bb283695e (patch) | |
| tree | 4828afb0cf5bc89f0063d3225d0f15cc01cd2012 /source4/heimdal_build | |
| parent | 64b619cefe99c833297f2a635db06bd186843481 (diff) | |
| download | samba-b7afac2b834674e20f303c3a03b4ac7bb283695e.tar.gz samba-b7afac2b834674e20f303c3a03b4ac7bb283695e.tar.bz2 samba-b7afac2b834674e20f303c3a03b4ac7bb283695e.zip | |
r14198: Update Samba4 to current lorikeet-heimdal.
Andrew Bartlett
(This used to be commit 97a0a0e2fa6784e5fc5278f7a15b385ddcb6a3b3)
Diffstat (limited to 'source4/heimdal_build')
| -rw-r--r-- | source4/heimdal_build/config.mk | 12 | ||||
| -rw-r--r-- | source4/heimdal_build/crypto-headers.h | 5 |
2 files changed, 16 insertions, 1 deletions
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk index 46b9f3da28..a02c5008b7 100644 --- a/source4/heimdal_build/config.mk +++ b/source4/heimdal_build/config.mk @@ -97,6 +97,10 @@ NOPROTO = YES ####################### # Start SUBSYSTEM HEIMDAL_KRB5 [SUBSYSTEM::HEIMDAL_KRB5] +EXTRA_CFLAGS = \ + -Iheimdal_build -Iheimdal/kdc \ + -Iheimdal/lib/des -Iheimdal/lib/roken \ + -DNO_PRINTF_ATTRIBUTE OBJ_FILES = \ ../heimdal/lib/krb5/acache.o \ ../heimdal/lib/krb5/add_et_list.o \ @@ -194,6 +198,7 @@ OBJ_FILES = \ ../heimdal/lib/asn1/der_get.o \ ../heimdal/lib/asn1/der_put.o \ ../heimdal/lib/asn1/der_free.o \ + ../heimdal/lib/asn1/der_format.o \ ../heimdal/lib/asn1/der_length.o \ ../heimdal/lib/asn1/der_copy.o \ ../heimdal/lib/asn1/der_cmp.o \ @@ -272,6 +277,7 @@ EXTRA_CFLAGS = \ OBJ_FILES = \ ../heimdal/lib/des/aes.o \ ../heimdal/lib/des/des.o \ + ../heimdal/lib/des/md2.o \ ../heimdal/lib/des/md4.o \ ../heimdal/lib/des/md5.o \ ../heimdal/lib/des/rc2.o \ @@ -279,7 +285,10 @@ OBJ_FILES = \ ../heimdal/lib/des/rijndael-alg-fst.o \ ../heimdal/lib/des/rnd_keys.o \ ../heimdal/lib/des/sha.o \ - ../heimdal/lib/des/ui.o + ../heimdal/lib/des/ui.o \ + ../heimdal/lib/des/evp.o \ + ../heimdal/lib/des/pkcs5.o \ + ../heimdal/lib/des/hmac.o NOPROTO = YES # End SUBSYSTEM HEIMDAL_DES ####################### @@ -317,6 +326,7 @@ EXTRA_CFLAGS = \ -Iheimdal/lib/des -Iheimdal/lib/roken -DNO_PRINTF_ATTRIBUTE OBJ_FILES = \ ../heimdal/lib/roken/base64.o \ + ../heimdal/lib/roken/hex.o \ ../heimdal/lib/roken/bswap.o \ ../heimdal/lib/roken/get_window_size.o \ ../heimdal/lib/roken/getprogname.o \ diff --git a/source4/heimdal_build/crypto-headers.h b/source4/heimdal_build/crypto-headers.h index ced0b13649..3f88266585 100644 --- a/source4/heimdal_build/crypto-headers.h +++ b/source4/heimdal_build/crypto-headers.h @@ -8,4 +8,9 @@ #include <rc4.h> #include <rc2.h> #include <aes.h> +#include <ui.h> +#include <evp.h> +#include <rand.h> +#include <engine.h> +#include <pkcs12.h> #endif /* __crypto_headers_h__ */ |