some libtasn1 related compilation fixes

8 files changed, 53 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 4e454c1f66..14844bac6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+2004-05-26 14:26  nmav <nmav@gnutls.org>
+
+	* NEWS, doc/README.autoconf, doc/certtool.cfg,
+	lib/gnutls_handshake.c, lib/pkix.asn, lib/pkix_asn1_tab.c, NEWS,
+	lib/gnutls_handshake.c, lib/pkix.asn, lib/pkix_asn1_tab.c:
+
+	Corrected session resuming in SRP ciphersuites.  
+
+2004-05-23 07:31  nmav <nmav@gnutls.org>
+
+	* NEWS, lib/gnutls.h.in.in, lib/gnutls_state.c:
+
+	_gnutls_deinit() is no longer used. Sessions are not automatically
+	removed any more, on abnormal termination.  
+
+2004-05-22 19:37  nmav <nmav@gnutls.org>
+
+	* lib/: gnutls_int.h, gnutls_record.c:
+
+	some cleanups and better handling of EOF in record_recv.  
+
+2004-05-16 15:15  nmav <nmav@gnutls.org>
+
+	* acinclude.m4, configure.in, libtasn1.m4, ChangeLog, NEWS,
+	acinclude.m4, configure.in, libtasn1.m4:
+
+	added proper libtasn1 version detection.  
+
+2004-05-15 06:37  nmav <nmav@gnutls.org>
+
+	* NEWS, configure.in, doc/certtool.cfg, lib/pkix.asn,
+	src/certtool-cfg.c, src/certtool.c, NEWS, configure.in,
+	doc/certtool.cfg, lib/pkix.asn, src/certtool-cfg.c, src/certtool.c:
+
+	certtool has now support for more X.520 DN attribute types.  
+
 2004-05-14 12:35  nmav <nmav@gnutls.org>
 
 	* src/: certtool-cfg.c, certtool-cfg.h, certtool.c, certtool-cfg.c,
diff --git a/acinclude.m4 b/acinclude.m4
index f247ce4eae..5c1abea9fd 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,7 +1,7 @@
 
-include(opencdk.m4)
-include(libgcrypt.m4)
-include(libtasn1.m4)
+sinclude(opencdk.m4)
+sinclude(libgcrypt.m4)
+sinclude(libtasn1.m4)
 
 
 dnl *-*wedit:notab*-*  Please keep this as the last line.
diff --git a/configure.in b/configure.in
index 10c6447e34..0992ca9c45 100644
--- a/configure.in
+++ b/configure.in
@@ -509,8 +509,8 @@ fi
 AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
 
 
-LIBGNUTLS_LIBS="$LIBS -L${libdir} -lgnutls $LIBASN1_LINK $LIBGCRYPT_LIBS"
-LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS -I${includedir}"
+LIBGNUTLS_LIBS="$LIBS -L${libdir} -lgnutls $LIBTASN1_LIBS $LIBGCRYPT_LIBS"
+LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS $LIBTASN1_CFLAGS -I${includedir}"
 
 CFLAGS="${CFLAGS} ${LIBGCRYPT_CFLAGS}"
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index b56ba7edaf..dc5313b126 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I../libextra -Iminitasn1/ -I../includes $(LIBOPENCDK_CFLAGS) $(LIBGCRYPT_CFLAGS)
+INCLUDES = -I../libextra -Iminitasn1/ -I../includes $(LIBOPENCDK_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBTASN1_CFLAGS)
 bin_SCRIPTS = libgnutls-config
 
 m4datadir = $(datadir)/aclocal
@@ -14,11 +14,9 @@ DIST_SUBDIRS = minitasn1 x509
 if ENABLE_MINITASN1
 SUBDIRS = minitasn1 x509
 MINITASN1_OBJECTS = minitasn1/libminitasn1.la
-LIBASN1_LINK = 
 else
 SUBDIRS = x509
 MINITASN1_OBJECTS = 
-LIBASN1_LINK = -ltasn1
 endif
 
 EXTRA_DIST = debug.h gnutls_compress.h defines.h gnutls.asn pkix.asn \
@@ -62,7 +60,7 @@ libgnutls_la_SOURCES = $(COBJECTS)
 
 libgnutls_la_LIBADD = $(MINITASN1_OBJECTS) x509/libx509.la
 
-libgnutls_la_LDFLAGS = $(LIBASN1_LINK) $(LIBGCRYPT_LIBS) \
+libgnutls_la_LDFLAGS = $(LIBTASN1_LIBS) $(LIBGCRYPT_LIBS) \
 	$(libgnutls_version_script_cmd) \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
diff --git a/libextra/Makefile.am b/libextra/Makefile.am
index 67e7fa9b47..040d123c59 100644
--- a/libextra/Makefile.am
+++ b/libextra/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I../lib -I../includes -I../lib/minitasn1/ $(LIBOPENCDK_CFLAGS) $(LIBGCRYPT_CFLAGS) -Iopencdk/
+INCLUDES = -I../lib -I../includes -I../lib/minitasn1/ $(LIBOPENCDK_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBTASN1_CFLAGS) -Iopencdk/
 bin_SCRIPTS = libgnutls-extra-config
 DIST_SUBDIRS = openpgp opencdk
 
diff --git a/libextra/openpgp/Makefile.am b/libextra/openpgp/Makefile.am
index 83147ea947..55013f1155 100644
--- a/libextra/openpgp/Makefile.am
+++ b/libextra/openpgp/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I. -I../ -I../../includes/ -I../../lib -I../../lib/minitasn1 $(LIBOPENCDK_CFLAGS) $(LIBGCRYPT_CFLAGS)
+INCLUDES = -I. -I../ -I../../includes/ -I../../lib -I../../lib/minitasn1 $(LIBOPENCDK_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBTASN1_CFLAGS) -I../opencdk/
 EXTRA_DIST = openpgp.h gnutls_openpgp.h
 
 noinst_LTLIBRARIES = libpgp.la
diff --git a/src/Makefile.am b/src/Makefile.am
index 728c5d44eb..f1b9d3af48 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,22 +9,22 @@ INCLUDES = -I../lib -I../libtasn1/lib -I../includes $(LIBOPENCDK_CFLAGS) -Icfg/
 
 bin_PROGRAMS = gnutls-serv gnutls-cli srptool gnutls-cli-debug certtool
 gnutls_serv_SOURCES = serv-gaa.c serv.c common.c
-gnutls_serv_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la $(LIBGCRYPT_LIBS) $(LIBOPENCDK_LIBS) $(SERV_LIBS)
+gnutls_serv_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la $(LIBGCRYPT_LIBS) $(LIBOPENCDK_LIBS) $(LIBTASN1_LIBS) $(SERV_LIBS)
 srptool_SOURCES = crypt-gaa.c crypt.c getpass.c
-srptool_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la  $(LIBGCRYPT_LIBS) $(LIBOPENCDK_LIBS)
+srptool_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la  $(LIBGCRYPT_LIBS) $(LIBOPENCDK_LIBS) $(LIBTASN1_LIBS) 
 gnutls_cli_SOURCES = cli-gaa.c cli.c common.c 
-gnutls_cli_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la  $(LIBGCRYPT_LIBS) $(LIBOPENCDK_LIBS) $(SERV_LIBS)
+gnutls_cli_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la  $(LIBGCRYPT_LIBS) $(LIBOPENCDK_LIBS) $(LIBTASN1_LIBS) $(SERV_LIBS)
 gnutls_cli_debug_SOURCES = tls_test-gaa.c tls_test.c tests.c common.c
-gnutls_cli_debug_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la  $(LIBGCRYPT_LIBS) $(LIBOPENCDK_LIBS) $(SERV_LIBS)
+gnutls_cli_debug_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la  $(LIBGCRYPT_LIBS) $(LIBOPENCDK_LIBS) $(LIBTASN1_LIBS) $(SERV_LIBS)
 
 
 noinst_PROGRAMS = retcodes
 retcodes_SOURCES = retcodes.c
-retcodes_LDADD = ../lib/libgnutls.la $(LIBGCRYPT_LIBS)
+retcodes_LDADD = ../lib/libgnutls.la $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS)
 
 if HAVE_LIBCFG
 certtool_SOURCES = certtool-gaa.c certtool.c prime.c getpass.c certtool-cfg.c
-certtool_LDADD = ../lib/libgnutls.la $(LIBGCRYPT_LIBS) -lcfg+
+certtool_LDADD = ../lib/libgnutls.la $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) -lcfg+
 else
 certtool_SOURCES = certtool-gaa.c certtool.c prime.c getpass.c certtool-cfg.c \
 	cfg/cfg+.c cfg/cfgfile.c cfg/cmdline.c cfg/parse.c cfg/props.c \
diff --git a/src/certtool-cfg.h b/src/certtool-cfg.h
index 3629f34c42..50cbcccfe1 100644
--- a/src/certtool-cfg.h
+++ b/src/certtool-cfg.h
@@ -27,6 +27,7 @@ void get_locality_crt_set( gnutls_x509_crt crt);
 void get_cn_crt_set( gnutls_x509_crt crt);
 void get_uid_crt_set( gnutls_x509_crt crt);
 void get_pkcs9_email_crt_set( gnutls_x509_crt crt);
+void get_oid_crt_set( gnutls_x509_crt crt);
 int get_serial( void);
 int get_days( void);
 int get_ca_status( void);
@@ -53,4 +54,5 @@ void get_state_crq_set( gnutls_x509_crq crq);
 void get_unit_crq_set( gnutls_x509_crq crq);
 void get_organization_crq_set( gnutls_x509_crq crq);
 void get_country_crq_set( gnutls_x509_crq crq);
+void get_oid_crq_set( gnutls_x509_crq crq);