New drop with windows code from Secure Endpoints/Asanka

diff --git a/configure.ac b/configure.ac
index 726c274603f66b61b10f4485faf26cff7cf37ab4..e91bc79f91fcc901458d304883d9be986a5c2a74 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_REVISION($Revision$)
 AC_PREREQ(2.62)
 test -z "$CFLAGS" && CFLAGS="-g"
-AC_INIT([Heimdal],[1.3.99],[heimdal-bugs@h5l.org])
+AC_INIT([Heimdal],[1.4.99],[heimdal-bugs@h5l.org])
 AC_CONFIG_SRCDIR([kuser/kinit.c])
 AC_CONFIG_HEADERS(include/config.h)
 AC_CONFIG_MACRO_DIR([cf])

diff --git a/include/Makefile.am b/include/Makefile.am
index 8c60c9ed50f2c5457a68958b3342ca97eca712cc..5a1e864215147413e9c043559d2b0ff3b0efa931 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -29,12 +29,16 @@ endif
 
 CLEANFILES =                   \
        asn1.h                  \
+       asn1-common.h           \
+       asn1-template.h         \
        asn1_err.h              \
        base64.h                \
        cms_asn1.h              \
+       crmf_asn1.h             \
        com_err.h               \
        com_right.h             \
        der-protos.h            \
+       der-private.h           \
        der.h                   \
        digest_asn1.h           \
        editline.h              \
@@ -46,6 +50,7 @@ CLEANFILES =                  \
        hdb.h                   \
        hdb_asn1.h              \
        hdb_err.h               \
+       heim-ipc.h              \
        heim_asn1.h             \
        heim_err.h              \
        heimntlm-protos.h       \
@@ -70,12 +75,14 @@ CLEANFILES =                        \
        kx509_err.h             \
        locate_plugin.h         \
        otp.h                   \
+       ocsp_asn1.h             \
        parse_bytes.h           \
        parse_time.h            \
        parse_units.h           \
        pkcs12_asn1.h           \
        pkcs8_asn1.h            \
        pkcs9_asn1.h            \
+       pkcs10_asn1.h           \
        pkinit_asn1.h           \
        resolve.h               \
        rfc2459_asn1.h          \

diff --git a/lib/asn1/Makefile.am b/lib/asn1/Makefile.am
index 162cf0f7fe133f15dbffe04db9268efcf548a7b1..93c355963e714dc214ae2427ed5141e70e83849c 100644 (file)
--- a/lib/asn1/Makefile.am
+++ b/lib/asn1/Makefile.am
@@ -592,17 +592,18 @@ CLEANFILES = \
        $(gen_files_digest) \
        $(gen_files_kx509) \
        $(gen_files_test) $(nodist_check_gen_SOURCES) \
+       asn1_err.c asn1_err.h \
        test_asn1-template.c \
-       rfc2459_asn1_files rfc2459_asn1.h* \
-       cms_asn1_files cms_asn1.h* \
-       krb5_asn1_files krb5_asn1.h* \
-       pkinit_asn1_files pkinit_asn1.h* \
-       pkcs8_asn1_files pkcs8_asn1.h* \
-       pkcs9_asn1_files pkcs9_asn1.h* \
-       pkcs12_asn1_files pkcs12_asn1.h* \
-       digest_asn1_files digest_asn1.h* \
-       kx509_asn1_files kx509_asn1.h* \
-       test_asn1_files test_asn1.h*
+       rfc2459_asn1_files rfc2459_asn1*.h* \
+       cms_asn1_files cms_asn1*.h* \
+       krb5_asn1_files krb5_asn1*.h* \
+       pkinit_asn1_files pkinit_asn1*.h* \
+       pkcs8_asn1_files pkcs8_asn1*.h* \
+       pkcs9_asn1_files pkcs9_asn1*.h* \
+       pkcs12_asn1_files pkcs12_asn1*.h* \
+       digest_asn1_files digest_asn1*.h* \
+       kx509_asn1_files kx509_asn1*.h* \
+       test_asn1_files test_asn1*.h*
 
 dist_include_HEADERS = der.h heim_asn1.h der-protos.h der-private.h
 dist_include_HEADERS += asn1-common.h

diff --git a/lib/gssapi/Makefile.am b/lib/gssapi/Makefile.am
index 18709f3a4bea0049402288527d96c02b335186ee..142562ed630cb696801e97ecd2f97bb249c20caa 100644 (file)
--- a/lib/gssapi/Makefile.am
+++ b/lib/gssapi/Makefile.am
@@ -254,8 +254,8 @@ BUILT_SOURCES = $(spnego_files:.x=.c) $(gssapi_files:.x=.c)
 
 CLEANFILES = $(BUILT_SOURCES) \
        gkrb5_err.h gkrb5_err.c \
-       $(spnego_files) spnego_asn1.h* spnego_asn1_files \
-       $(gssapi_files) gssapi_asn1.h* gssapi_asn1_files \
+       $(spnego_files) spnego_asn1*.h* spnego_asn1_files spnego_asn1-template.c \
+       $(gssapi_files) gssapi_asn1*.h* gssapi_asn1_files gssapi_asn1-template.c \
        gss-commands.h gss-commands.c
 
 $(spnego_files) spnego_asn1.hx spnego_asn1-priv.hx: spnego_asn1_files

diff --git a/lib/hx509/Makefile.am b/lib/hx509/Makefile.am
index 8f052c9e7de6bbe4e9a284606546048416d0b35f..b0d311ee039b484f78ad07805b5c96790928d877 100644 (file)
--- a/lib/hx509/Makefile.am
+++ b/lib/hx509/Makefile.am
@@ -54,6 +54,7 @@ AM_YFLAGS = -d
 dist_libhx509_la_SOURCES = \
        ca.c \
        cert.c \
+       char_map.h \
        cms.c \
        collector.c \
        crypto.c \
@@ -299,8 +300,11 @@ EXTRA_DIST = \
        crmf.asn1 \
        hx509_err.et \
        hxtool-commands.in \
+       quote.py \
        ocsp.asn1 \
+       ocsp.opt \
        pkcs10.asn1 \
+       pkcs10.opt \
        test_ca.in \
        test_chain.in \
        test_cert.in \
@@ -416,6 +420,7 @@ EXTRA_DIST = \
        data/test.crt \
        data/test.key \
        data/test.p12 \
+       data/win-u16-in-printablestring.der \
        data/yutaka-pad-broken-ca.pem \
        data/yutaka-pad-broken-cert.pem \
        data/yutaka-pad-ok-ca.pem \

diff --git a/lib/ipc/Makefile.am b/lib/ipc/Makefile.am
index bbfd5044303f6902dad5759cc5e376f1187c043d..41fc3e361ca57f78ce0ec3605873b7923e6c6837 100644 (file)
--- a/lib/ipc/Makefile.am
+++ b/lib/ipc/Makefile.am
@@ -2,8 +2,8 @@ include $(top_srcdir)/Makefile.am.common
 
 noinst_LTLIBRARIES = libheim-ipcc.la libheim-ipcs.la
 
-dist_libheim_ipcc_la_SOURCES = client.c common.c
-dist_libheim_ipcs_la_SOURCES = server.c common.c
+dist_libheim_ipcc_la_SOURCES = hi_locl.h heim_ipc_types.h client.c common.c
+dist_libheim_ipcs_la_SOURCES = hi_locl.h heim_ipc_types.h server.c common.c
 
 include_HEADERS = heim-ipc.h
 
@@ -33,6 +33,8 @@ tc_LDADD = libheim-ipcc.la $(LIB_roken)
 
 if have_gcd
 
+EXTRA_DIST = heim_ipc.defs heim_ipc_async.defs heim_ipc_reply.defs
+
 heim_ipc.h heim_ipcUser.c heim_ipcServer.c heim_ipcServer.h: heim_ipc.defs
        mig -header heim_ipc.h -user heim_ipcUser.c -sheader heim_ipcServer.h -server heim_ipcServer.c -I$(srcdir) $(srcdir)/heim_ipc.defs
 
@@ -60,5 +62,4 @@ CLEANFILES = $(built_ipcc) $(built_ipcs)
 $(srcdir)/client.c: $(built_ipcc)
 $(srcdir)/server.c: $(built_ipcs)
 
-
 endif
\ No newline at end of file