some libtasn1 related compilation fixes

diff --git a/configure.in b/configure.in
index 4ff5f6a214e59af6d6e18c3b72aa648b0abb4aea..431dc26ff341ba24a6b1a8ee7f1d25cf17571b9e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -508,8 +508,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 b56ba7edaf3d4d8e17013e344a85ee5ba0eef238..5817151fd597cf26cb4cd4cdc3926582c0557328 100644 (file)
--- 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) $(LIBTASN1_CFLAGS) $(LIBGCRYPT_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/lib/x509/Makefile.am b/lib/x509/Makefile.am
index bcc42674df2d5da158a8874083cc013980bef633..71d5193da5eefe2778168a0e18696cc63dbaa4e1 100644 (file)
--- a/lib/x509/Makefile.am
+++ b/lib/x509/Makefile.am
@@ -1,10 +1,9 @@
-INCLUDES = -I../ -I../../includes/ -I../../lib/minitasn1 $(LIBOPENCDK_CFLAGS) $(LIBGCRYPT_CFLAGS)
+INCLUDES = -I../ -I../../includes/ -I../../lib/minitasn1 $(LIBOPENCDK_CFLAGS) $(LIBTASN1_CFLAGS) $(LIBGCRYPT_CFLAGS)
 EXTRA_DIST = dn.h common.h x509.h extensions.h pkcs7.h \
        x509-api.tex compat.h verify.h mpi.h crq.h sign.h pkcs5.h \
        privkey.h pkcs12.h rfc2818.h dsa.h
 
 noinst_LTLIBRARIES = libx509.la
-#lib_LTLIBRARIES = libgnutls-x509.la
 
 COBJECTS = crl.c dn.c common.c x509.c extensions.c dsa.c \
        rfc2818_hostname.c verify.c mpi.c privkey.c pkcs7.c \
@@ -16,11 +15,6 @@ COMPAT_OBJECTS = compat.c
 
 libx509_la_SOURCES = $(COBJECTS) $(COMPAT_OBJECTS)
 
-#libgnutls_x509_la_SOURCES = $(COBJECTS2)
-
-#libgnutls_x509_la_LIBADD = ../libgnutls.la
-#libgnutls_x509_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
 x509-api.tex: $(COBJECTS)
        @echo "" > x509-api.tex
        @for i in $(COBJECTS); \

diff --git a/libextra/Makefile.am b/libextra/Makefile.am
index fe631de4a1146c961591c6ae9a87238b2beeab97..1a79df3d96aa2a54ce11cf28eeb0086d60e81d29 100644 (file)
--- 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/ -Iopenpgp/
+INCLUDES = -I../lib -I../includes -I../lib/minitasn1/ $(LIBOPENCDK_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBTASN1_CFLAGS) -Iopencdk/ -Iopenpgp/
 bin_SCRIPTS = libgnutls-extra-config
 DIST_SUBDIRS = openpgp opencdk
 

diff --git a/libextra/openpgp/Makefile.am b/libextra/openpgp/Makefile.am
index c00155ccc1ce19cd9712f1c692e97be19c5ebd0f..8d097f5cff7e537293ca40af4c36651cd36df4b8 100644 (file)
--- 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) -I../opencdk
+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
 libpgp_la_SOURCES = openpgp.c xml.c verify.c extras.c compat.c privkey.c

diff --git a/src/Makefile.am b/src/Makefile.am
index 766502d46f95188c64cd7a12d9f935028b00aeca..388d832dddab14cceec08745ab523c91b25511df 100644 (file)
--- 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) $(LIBTASN1_LIBS) $(LIBOPENCDK_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) $(LIBTASN1_LIBS) $(LIBOPENCDK_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) $(LIBTASN1_LIBS) $(LIBOPENCDK_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) $(LIBTASN1_LIBS) $(LIBOPENCDK_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 3629f34c42baf6b54b3ea50cca2fa06c2a15468d..50cbcccfe1b5e5031fa034103fbf6c37c52dba88 100644 (file)
--- 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);
 

diff --git a/src/retcodes.c b/src/retcodes.c
index 35ea7bac15207ab23f65b66fb6652577eb904137..141ffb6980383671d900299e74668d79887c17f4 100644 (file)
--- a/src/retcodes.c
+++ b/src/retcodes.c
@@ -39,7 +39,7 @@ static int compar( const void* _n1, const void* _n2)
 static char* escape_string( const char* str)
 {
 static char buffer[500];
-int i = 0, j = 0;
+unsigned int i = 0, j = 0;
 
 
 while( str[i] != 0 && j < sizeof(buffer) - 1) {