diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2004-03-15 15:54:50 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2004-03-15 15:54:50 +0000 |
| commit | c0de7fa380652f4c14dec290adb69ef3bcfe6776 (patch) | |
| tree | e90a9563ed390284bb7e1ac57c9d25f1e39b5965 | |
| parent | ecf09c05a2a626ea2075659e0953687e1acf0c9e (diff) | |
| download | gnutls-c0de7fa380652f4c14dec290adb69ef3bcfe6776.tar.gz | |
Finally corrected a compilation issue when opencdk was installed in a non-base directory. Some other minor fixes.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | libextra/openpgp/openpgp.c | 2 | ||||
| -rw-r--r-- | libextra/openpgp/xml.c | 4 |
5 files changed, 7 insertions, 5 deletions
@@ -4,6 +4,8 @@ Version 1.1.7 parameters using a callback. - Added functions gnutls_rsa_params_cpy(), gnutls_dh_params_cpy() and gnutls_x509_privkey_cpy(). +- Corrected a compilation issue when opencdk was installed in a + non standard directory. Version 1.1.6 (24/02/2004) - Several bug fixes, by Arne Thomassen. diff --git a/configure.in b/configure.in index ac7c0ce165..7877bdf6af 100644 --- a/configure.in +++ b/configure.in @@ -17,7 +17,7 @@ GNUTLS_VERSION=$GNUTLS_MAJOR_VERSION.$GNUTLS_MINOR_VERSION.$GNUTLS_MICRO_VERSION AC_DEFINE_UNQUOTED(GNUTLS_VERSION, "$GNUTLS_VERSION", [version of gnutls]) -GNUTLS_GCRYPT_VERSION=1.1.90 +GNUTLS_GCRYPT_VERSION=1:1.1.90 GNUTLS_LIBTASN1_VERSION=0.2.5 AC_DEFINE_UNQUOTED(GNUTLS_GCRYPT_VERSION, "$GNUTLS_GCRYPT_VERSION", [version of gcrypt]) AC_DEFINE_UNQUOTED(GNUTLS_LIBTASN1_VERSION, "$GNUTLS_LIBTASN1_VERSION", [version of libtasn1]) diff --git a/lib/Makefile.am b/lib/Makefile.am index d1142c5afc..b6d2f9808a 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I../libextra -Iminitasn1/ -I../includes $(LIBGCRYPT_CFLAGS) +INCLUDES = -I../libextra -Iminitasn1/ -I../includes $(LIBOPENCDK_CFLAGS) $(LIBGCRYPT_CFLAGS) bin_SCRIPTS = libgnutls-config m4datadir = $(datadir)/aclocal diff --git a/libextra/openpgp/openpgp.c b/libextra/openpgp/openpgp.c index 5ebdab7625..3aac1bd6cf 100644 --- a/libextra/openpgp/openpgp.c +++ b/libextra/openpgp/openpgp.c @@ -449,7 +449,7 @@ gnutls_openpgp_key_get_id( gnutls_openpgp_key key, { cdk_packet_t pkt; cdk_pkt_pubkey_t pk = NULL; - unsigned long kid[2]; + unsigned int kid[2]; if( !key || !keyid ) { gnutls_assert( ); diff --git a/libextra/openpgp/xml.c b/libextra/openpgp/xml.c index d95e10e85a..251bd25b6d 100644 --- a/libextra/openpgp/xml.c +++ b/libextra/openpgp/xml.c @@ -140,7 +140,7 @@ xml_add_key( gnutls_string *xmlkey, int ext, cdk_pkt_pubkey_t pk, int sub ) const char *algo, *s; char keyid[16], fpr[41], tmp[32]; uint8 fingerpr[20]; - unsigned long kid[2]; + unsigned int kid[2]; int i = 0, rc = 0; if( !xmlkey || !pk ) { @@ -254,7 +254,7 @@ xml_add_sig( gnutls_string *xmlkey, int ext, cdk_pkt_signature_t sig ) { const char *algo, *s; char tmp[32], keyid[16]; - unsigned long kid[2]; + unsigned int kid[2]; int rc = 0; if( !xmlkey || !sig ) { |