[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_0-10-ge8df5
|
From: |
Nikos Mavrogiannopoulos |
|
Subject: |
[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_0-10-ge8df5a7 |
|
Date: |
Sat, 26 Mar 2011 00:01:34 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".
http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=e8df5a70b7ee05e7f835348350e06533732d05aa
The branch, gnutls_2_12_x has been updated
via e8df5a70b7ee05e7f835348350e06533732d05aa (commit)
via c09e61a8941dd002cfa75fb449dbd069d2f866b1 (commit)
via 33ad30ad5802e4ec10a479a6d4764978c4b382cb (commit)
via c2347c675f526f0a3bcc0b0a92a5a493d9c697da (commit)
via 24a7f63c4abb84786dec5d2eaeaa455b7bf24cb0 (commit)
via 504f2a10130b5c9592e3b570eab50dfcaa3d3456 (commit)
via bb7f8debdebed187604011313c45ba866fc9f6a9 (commit)
via 93dee00c4ece2ff287ef6c6e60d8a8d8c057dfbf (commit)
via 6342869bf7307d41e38cbb89f61f00b06b59dc33 (commit)
from 52c971686ff5faba79d31c8506ffd467cff25760 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e8df5a70b7ee05e7f835348350e06533732d05aa
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Mar 26 01:01:17 2011 +0100
Corrected access to freed memory location. Reported by Vitaly Kruglikov.
commit c09e61a8941dd002cfa75fb449dbd069d2f866b1
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Mar 26 00:55:19 2011 +0100
added Mark and Vitaly to THANKS.
commit 33ad30ad5802e4ec10a479a6d4764978c4b382cb
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Mar 26 00:53:51 2011 +0100
Corrected windows system_errno() function. Reported and patch by Mark Brand.
commit c2347c675f526f0a3bcc0b0a92a5a493d9c697da
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Mar 26 00:52:01 2011 +0100
C++ compatibility fix for compat.h. Suggested by Mark Brand.
commit 24a7f63c4abb84786dec5d2eaeaa455b7bf24cb0
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Fri Mar 25 20:31:11 2011 +0100
Corrected uninitialized var deinitiation. Reported by Vitaly Kruglikov.
commit 504f2a10130b5c9592e3b570eab50dfcaa3d3456
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Fri Mar 25 20:23:35 2011 +0100
Define ext_mod_ia in gnutls_ia.c only.
commit bb7f8debdebed187604011313c45ba866fc9f6a9
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Fri Mar 25 20:20:22 2011 +0100
eliminate compiler warning. Reported by Andreas Metzler.
commit 93dee00c4ece2ff287ef6c6e60d8a8d8c057dfbf
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Fri Mar 25 20:18:00 2011 +0100
Fix size of gnutls_openpgp_keyid_t by using the GNUTLS_OPENPGP_KEYID_SIZE
definition.
Reported by Andreas Metzler.
commit 6342869bf7307d41e38cbb89f61f00b06b59dc33
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Fri Mar 25 20:15:37 2011 +0100
updated
-----------------------------------------------------------------------
Summary of changes:
THANKS | 2 +
lib/build-aux/config.rpath | 136 ++++++++++++++++----------------------
lib/gnutls_sig.c | 4 +-
lib/includes/gnutls/compat.h | 9 +++
lib/includes/gnutls/openpgp.h | 3 +-
lib/opencdk/stream.c | 4 +-
lib/opencdk/verify.c | 2 +
lib/openpgp/gnutls_openpgp.c | 6 +-
lib/openpgp/pgp.c | 4 +-
lib/openpgp/privkey.c | 4 +-
lib/system.c | 2 +-
libextra/ext_inner_application.h | 2 +-
libextra/gnutls_ia.c | 2 +
13 files changed, 87 insertions(+), 93 deletions(-)
diff --git a/THANKS b/THANKS
index b01a1f3..b61d9da 100644
--- a/THANKS
+++ b/THANKS
@@ -110,6 +110,8 @@ Vincent Torri <address@hidden>
Sjoerd Simons <address@hidden>
Micah Anderson <address@hidden>
Michael Rommel <address@hidden>
+Mark Brand <address@hidden>
+Vitaly Kruglikov <address@hidden>
----------------------------------------------------------------------
Copying and distribution of this file, with or without modification,
diff --git a/lib/build-aux/config.rpath b/lib/build-aux/config.rpath
index 8bd7f5d..c547c68 100755
--- a/lib/build-aux/config.rpath
+++ b/lib/build-aux/config.rpath
@@ -2,7 +2,7 @@
# Output a system dependent set of variables, describing how to set the
# run time search path of shared libraries in an executable.
#
-# Copyright 1996-2011 Free Software Foundation, Inc.
+# Copyright 1996-2007 Free Software Foundation, Inc.
# Taken from GNU libtool, 2001
# Originally by Gordon Matzigkeit <address@hidden>, 1996
#
@@ -47,7 +47,7 @@ for cc_temp in $CC""; do
done
cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
-# Code taken from libtool.m4's _LT_COMPILER_PIC.
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
wl=
if test "$GCC" = yes; then
@@ -57,7 +57,14 @@ else
aix*)
wl='-Wl,'
;;
- mingw* | cygwin* | pw32* | os2* | cegcc*)
+ darwin*)
+ case $cc_basename in
+ xlc*)
+ wl='-Wl,'
+ ;;
+ esac
+ ;;
+ mingw* | cygwin* | pw32* | os2*)
;;
hpux9* | hpux10* | hpux11*)
wl='-Wl,'
@@ -65,37 +72,24 @@ else
irix5* | irix6* | nonstopux*)
wl='-Wl,'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ newsos6)
+ ;;
+ linux* | k*bsd*-gnu)
case $cc_basename in
- ecc*)
+ icc* | ecc*)
wl='-Wl,'
;;
- icc* | ifort*)
- wl='-Wl,'
- ;;
- lf95*)
- wl='-Wl,'
- ;;
- nagfor*)
- wl='-Wl,-Wl,,'
- ;;
- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+ pgcc | pgf77 | pgf90)
wl='-Wl,'
;;
ccc*)
wl='-Wl,'
;;
- xl* | bgxl* | bgf* | mpixl*)
- wl='-Wl,'
- ;;
como)
wl='-lopt='
;;
*)
case `$CC -V 2>&1 | sed 5q` in
- *Sun\ F* | *Sun*Fortran*)
- wl=
- ;;
*Sun\ C*)
wl='-Wl,'
;;
@@ -103,24 +97,13 @@ else
;;
esac
;;
- newsos6)
- ;;
- *nto* | *qnx*)
- ;;
osf3* | osf4* | osf5*)
wl='-Wl,'
;;
rdos*)
;;
solaris*)
- case $cc_basename in
- f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
- wl='-Qoption ld '
- ;;
- *)
- wl='-Wl,'
- ;;
- esac
+ wl='-Wl,'
;;
sunos4*)
wl='-Qoption ld '
@@ -141,7 +124,7 @@ else
esac
fi
-# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
hardcode_libdir_flag_spec=
hardcode_libdir_separator=
@@ -149,7 +132,7 @@ hardcode_direct=no
hardcode_minus_L=no
case "$host_os" in
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
@@ -175,21 +158,22 @@ if test "$with_gnu_ld" = yes; then
# option of GNU ld is called -rpath, not --rpath.
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
case "$host_os" in
- aix[3-9]*)
+ aix3* | aix4* | aix5*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
fi
;;
amigaos*)
- case "$host_cpu" in
- powerpc)
- ;;
- m68k)
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_minus_L=yes
- ;;
- esac
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ # Samuel A. Falvo II <address@hidden> reports
+ # that the semantics of dynamic libraries on AmigaOS, at least up
+ # to version 4, is to share data among multiple programs linked
+ # with the same dynamic library. Since this doesn't match the
+ # behavior of shared libraries on other platforms, we cannot use
+ # them.
+ ld_shlibs=no
;;
beos*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -198,7 +182,7 @@ if test "$with_gnu_ld" = yes; then
ld_shlibs=no
fi
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | mingw* | pw32*)
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -208,13 +192,11 @@ if test "$with_gnu_ld" = yes; then
ld_shlibs=no
fi
;;
- haiku*)
- ;;
interix[3-9]*)
hardcode_direct=no
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
- gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ gnu* | linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
:
else
@@ -272,7 +254,7 @@ else
hardcode_direct=unsupported
fi
;;
- aix[4-9]*)
+ aix4* | aix5*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -282,7 +264,7 @@ else
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ case $host_os in aix4.[23]|aix4.[23].*|aix5*)
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
@@ -337,18 +319,14 @@ else
fi
;;
amigaos*)
- case "$host_cpu" in
- powerpc)
- ;;
- m68k)
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_minus_L=yes
- ;;
- esac
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ # see comment about different semantics on the GNU ld section
+ ld_shlibs=no
;;
bsdi[45]*)
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | mingw* | pw32*)
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -358,15 +336,24 @@ else
;;
darwin* | rhapsody*)
hardcode_direct=no
- if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; };
then
+ if test "$GCC" = yes ; then
:
else
- ld_shlibs=no
+ case $cc_basename in
+ xlc*)
+ ;;
+ *)
+ ld_shlibs=no
+ ;;
+ esac
fi
;;
dgux*)
hardcode_libdir_flag_spec='-L$libdir'
;;
+ freebsd1*)
+ ld_shlibs=no
+ ;;
freebsd2.2*)
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
@@ -427,8 +414,6 @@ else
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator=:
;;
- *nto* | *qnx*)
- ;;
openbsd*)
if test -f /usr/libexec/ld.so; then
hardcode_direct=yes
@@ -509,7 +494,7 @@ else
fi
# Check dynamic linker characteristics
-# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
+# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
# Unlike libtool.m4, here we don't care about _all_ names of the library, but
# only about the one the linker finds when passed -lNAME. This is the last
# element of library_names_spec in libtool.m4, or possibly two of them if the
@@ -520,16 +505,11 @@ case "$host_os" in
aix3*)
library_names_spec='$libname.a'
;;
- aix[4-9]*)
+ aix4* | aix5*)
library_names_spec='$libname$shrext'
;;
amigaos*)
- case "$host_cpu" in
- powerpc*)
- library_names_spec='$libname$shrext' ;;
- m68k)
- library_names_spec='$libname.a' ;;
- esac
+ library_names_spec='$libname.a'
;;
beos*)
library_names_spec='$libname$shrext'
@@ -537,7 +517,7 @@ case "$host_os" in
bsdi[45]*)
library_names_spec='$libname$shrext'
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | mingw* | pw32*)
shrext=.dll
library_names_spec='$libname.dll.a $libname.lib'
;;
@@ -548,6 +528,8 @@ case "$host_os" in
dgux*)
library_names_spec='$libname$shrext'
;;
+ freebsd1*)
+ ;;
freebsd* | dragonfly*)
case "$host_os" in
freebsd[123]*)
@@ -559,9 +541,6 @@ case "$host_os" in
gnu*)
library_names_spec='$libname$shrext'
;;
- haiku*)
- library_names_spec='$libname$shrext'
- ;;
hpux9* | hpux10* | hpux11*)
case $host_cpu in
ia64*)
@@ -597,7 +576,7 @@ case "$host_os" in
;;
linux*oldld* | linux*aout* | linux*coff*)
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu)
library_names_spec='$libname$shrext'
;;
knetbsd*-gnu)
@@ -609,7 +588,7 @@ case "$host_os" in
newsos6)
library_names_spec='$libname$shrext'
;;
- *nto* | *qnx*)
+ nto-qnx*)
library_names_spec='$libname$shrext'
;;
openbsd*)
@@ -640,9 +619,6 @@ case "$host_os" in
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
library_names_spec='$libname$shrext'
;;
- tpf*)
- library_names_spec='$libname$shrext'
- ;;
uts4*)
library_names_spec='$libname$shrext'
;;
diff --git a/lib/gnutls_sig.c b/lib/gnutls_sig.c
index 1fa2750..82155f4 100644
--- a/lib/gnutls_sig.c
+++ b/lib/gnutls_sig.c
@@ -596,9 +596,9 @@ _gnutls_handshake_sign_cert_vrfy12 (gnutls_session_t
session,
gnutls_sign_algorithm_get_name (sign_algo),
gnutls_mac_get_name (hash_algo));
- if (hash_algo ==
session->internals.handshake_mac_handle.tls12.sha1.algorithm)
+ if ((gnutls_mac_algorithm_t)hash_algo ==
session->internals.handshake_mac_handle.tls12.sha1.algorithm)
handshake_td = &session->internals.handshake_mac_handle.tls12.sha1;
- else if (hash_algo ==
session->internals.handshake_mac_handle.tls12.sha256.algorithm)
+ else if ((gnutls_mac_algorithm_t)hash_algo ==
session->internals.handshake_mac_handle.tls12.sha256.algorithm)
handshake_td = &session->internals.handshake_mac_handle.tls12.sha256;
else
return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR); /* too bad we only
support SHA1 and SHA256 */
diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index af02d92..beb9dfc 100644
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -3,6 +3,11 @@
#ifndef _GNUTLS_COMPAT_H
#define _GNUTLS_COMPAT_H
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
#ifdef __GNUC__
#define _GNUTLS_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 +
__GNUC_PATCHLEVEL__)
@@ -345,4 +350,8 @@ gnutls_sign_callback_get (gnutls_session_t session, void
**userdata)
void gnutls_transport_set_lowat (gnutls_session_t session, int num)
_GNUTLS_GCC_ATTR_DEPRECATED;
+#ifdef __cplusplus
+}
+#endif
+
#endif /* _GNUTLS_COMPAT_H */
diff --git a/lib/includes/gnutls/openpgp.h b/lib/includes/gnutls/openpgp.h
index 4b0d853..6dfa786 100644
--- a/lib/includes/gnutls/openpgp.h
+++ b/lib/includes/gnutls/openpgp.h
@@ -53,7 +53,8 @@ extern "C"
GNUTLS_OPENPGP_FMT_BASE64
} gnutls_openpgp_crt_fmt_t;
- typedef unsigned char gnutls_openpgp_keyid_t[8];
+#define GNUTLS_OPENPGP_KEYID_SIZE 8
+ typedef unsigned char gnutls_openpgp_keyid_t[GNUTLS_OPENPGP_KEYID_SIZE];
/* gnutls_openpgp_cert_t should be defined in gnutls.h
*/
diff --git a/lib/opencdk/stream.c b/lib/opencdk/stream.c
index 29bea09..a9e0af3 100644
--- a/lib/opencdk/stream.c
+++ b/lib/opencdk/stream.c
@@ -761,6 +761,7 @@ stream_fp_replace (cdk_stream_t s, FILE ** tmp)
rc = fclose (s->fp);
if (rc)
{
+ s->fp = NULL;
gnutls_assert ();
return CDK_File_Error;
}
@@ -822,6 +823,7 @@ stream_filter_write (cdk_stream_t s)
{
_gnutls_read_log ("filter [close]: fd=%d\n", fileno (f->tmp));
fclose (f->tmp);
+ f->tmp = NULL;
break;
}
}
@@ -960,7 +962,7 @@ cdk_stream_read (cdk_stream_t s, void *buf, size_t buflen)
if (rc)
{
s->error = rc;
- if (feof (s->fp))
+ if (s->fp && feof (s->fp))
s->flags.eof = 1;
gnutls_assert ();
return EOF;
diff --git a/lib/opencdk/verify.c b/lib/opencdk/verify.c
index 957eb98..397b3ed 100644
--- a/lib/opencdk/verify.c
+++ b/lib/opencdk/verify.c
@@ -179,6 +179,8 @@ file_verify_clearsign (cdk_ctx_t hd, const char *file,
const char *output)
int err;
cdk_error_t rc;
+ memset(&md, 0, sizeof(md));
+
if (output)
{
rc = cdk_stream_create (output, &out);
diff --git a/lib/openpgp/gnutls_openpgp.c b/lib/openpgp/gnutls_openpgp.c
index ba7cd27..5917447 100644
--- a/lib/openpgp/gnutls_openpgp.c
+++ b/lib/openpgp/gnutls_openpgp.c
@@ -321,7 +321,7 @@ gnutls_certificate_set_openpgp_key_file
(gnutls_certificate_credentials_t res,
static int
get_keyid (gnutls_openpgp_keyid_t keyid, const char *str)
{
- size_t keyid_size = sizeof (keyid);
+ size_t keyid_size = GNUTLS_OPENPGP_KEYID_SIZE;
if (strlen (str) != 16)
{
@@ -744,7 +744,7 @@ _gnutls_openpgp_crt_to_gcert (gnutls_cert * gcert,
gnutls_openpgp_crt_t cert)
_gnutls_debug_log
("Importing Openpgp cert and using openpgp sub key: %s\n",
- _gnutls_bin2hex (keyid, sizeof (keyid), err_buf, sizeof (err_buf),
+ _gnutls_bin2hex (keyid, GNUTLS_OPENPGP_KEYID_SIZE, err_buf, sizeof
(err_buf),
NULL));
KEYID_IMPORT (kid32, keyid);
@@ -762,7 +762,7 @@ _gnutls_openpgp_crt_to_gcert (gnutls_cert * gcert,
gnutls_openpgp_crt_t cert)
gnutls_openpgp_crt_get_subkey_usage (cert, idx, &gcert->key_usage);
gcert->use_subkey = 1;
- memcpy (gcert->subkey_id, keyid, sizeof (keyid));
+ memcpy (gcert->subkey_id, keyid, GNUTLS_OPENPGP_KEYID_SIZE);
ret =
_gnutls_openpgp_crt_get_mpis (cert, kid32, gcert->params,
diff --git a/lib/openpgp/pgp.c b/lib/openpgp/pgp.c
index 229b69d..77a931d 100644
--- a/lib/openpgp/pgp.c
+++ b/lib/openpgp/pgp.c
@@ -1568,7 +1568,7 @@ gnutls_openpgp_crt_get_preferred_key_id
(gnutls_openpgp_crt_t key,
return GNUTLS_E_INVALID_REQUEST;
}
- memcpy (keyid, key->preferred_keyid, sizeof (gnutls_openpgp_keyid_t));
+ memcpy (keyid, key->preferred_keyid, GNUTLS_OPENPGP_KEYID_SIZE);
return 0;
}
@@ -1606,7 +1606,7 @@ gnutls_openpgp_crt_set_preferred_key_id
(gnutls_openpgp_crt_t key,
}
key->preferred_set = 1;
- memcpy (key->preferred_keyid, keyid, sizeof (gnutls_openpgp_keyid_t));
+ memcpy (key->preferred_keyid, keyid, GNUTLS_OPENPGP_KEYID_SIZE);
return 0;
}
diff --git a/lib/openpgp/privkey.c b/lib/openpgp/privkey.c
index 4b26a8c..7fef5ad 100644
--- a/lib/openpgp/privkey.c
+++ b/lib/openpgp/privkey.c
@@ -1186,7 +1186,7 @@ gnutls_openpgp_privkey_get_preferred_key_id
(gnutls_openpgp_privkey_t key,
return GNUTLS_E_INVALID_REQUEST;
}
- memcpy (keyid, key->preferred_keyid, sizeof (gnutls_openpgp_keyid_t));
+ memcpy (keyid, key->preferred_keyid, GNUTLS_OPENPGP_KEYID_SIZE);
return 0;
}
@@ -1224,7 +1224,7 @@ gnutls_openpgp_privkey_set_preferred_key_id
(gnutls_openpgp_privkey_t key,
}
key->preferred_set = 1;
- memcpy (key->preferred_keyid, keyid, sizeof (gnutls_openpgp_keyid_t));
+ memcpy (key->preferred_keyid, keyid, GNUTLS_OPENPGP_KEYID_SIZE);
return 0;
}
diff --git a/lib/system.c b/lib/system.c
index f3bed5f..b795fca 100644
--- a/lib/system.c
+++ b/lib/system.c
@@ -50,7 +50,7 @@
#ifdef _WIN32
int
-system_errno (gnutls_transport_ptr)
+system_errno (gnutls_transport_ptr p)
{
int tmperr = WSAGetLastError ();
int ret = 0;
diff --git a/libextra/ext_inner_application.h b/libextra/ext_inner_application.h
index a137c08..c641a99 100644
--- a/libextra/ext_inner_application.h
+++ b/libextra/ext_inner_application.h
@@ -31,7 +31,7 @@
#define IA_ENABLE (1 << 3)
#define IA_ALLOW_SKIP (1 << 4)
-extension_entry_st ext_mod_ia;
+extern extension_entry_st ext_mod_ia;
typedef struct
{
diff --git a/libextra/gnutls_ia.c b/libextra/gnutls_ia.c
index e692bde..12a049f 100644
--- a/libextra/gnutls_ia.c
+++ b/libextra/gnutls_ia.c
@@ -30,6 +30,8 @@
#define CHECKSUM_SIZE 12
+extension_entry_st ext_mod_ia;
+
struct gnutls_ia_client_credentials_st
{
gnutls_ia_avp_func avp_func;
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_0-10-ge8df5a7,
Nikos Mavrogiannopoulos <=