[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, gnutls_3_0_x, updated. gnutls_3_0_1-108-gd03115
|
From: |
Simon Josefsson |
|
Subject: |
[SCM] GNU gnutls branch, gnutls_3_0_x, updated. gnutls_3_0_1-108-gd031152 |
|
Date: |
Fri, 09 Sep 2011 07:36:58 +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=d031152f05f85ec623cc3fa03fce9d7bc709dcdd
The branch, gnutls_3_0_x has been updated
via d031152f05f85ec623cc3fa03fce9d7bc709dcdd (commit)
via 9a76226351f2735acd6ebeb73f009e148a28d358 (commit)
via ecc2ab0911c6ae1eba244917c3975ce7dd1fb755 (commit)
via 1886508f3dfbda78a5eac6933b3656dadb580e17 (commit)
via 55c7d93175abd0a156ef7988379ce6d8197c1253 (commit)
from 5b310b5d0381166f99261a78a1ff2fdc2c1fb1de (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 d031152f05f85ec623cc3fa03fce9d7bc709dcdd
Author: Simon Josefsson <address@hidden>
Date: Fri Sep 9 09:35:55 2011 +0200
Fix build warnings.
commit 9a76226351f2735acd6ebeb73f009e148a28d358
Author: Simon Josefsson <address@hidden>
Date: Fri Sep 9 09:33:39 2011 +0200
Fix possible infloop and build warning about uninitialied variable.
commit ecc2ab0911c6ae1eba244917c3975ce7dd1fb755
Author: Simon Josefsson <address@hidden>
Date: Fri Sep 9 09:10:28 2011 +0200
Fix build errors.
commit 1886508f3dfbda78a5eac6933b3656dadb580e17
Author: Simon Josefsson <address@hidden>
Date: Fri Sep 9 09:09:46 2011 +0200
Generated.
commit 55c7d93175abd0a156ef7988379ce6d8197c1253
Author: Simon Josefsson <address@hidden>
Date: Fri Sep 9 08:49:31 2011 +0200
Update gnulib files.
-----------------------------------------------------------------------
Summary of changes:
doc/manpages/Makefile.am | 4 ++
gl/m4/getcwd.m4 | 33 ++++++++++++++++-----
gl/m4/gnulib-common.m4 | 49 +++++++++++++++++++++++-------
gl/m4/largefile.m4 | 20 ++++++------
gl/tests/init.sh | 4 ++-
gl/tests/lstat.c | 10 +++++-
gl/tests/open.c | 11 +++++--
gl/tests/stat.c | 10 +++++-
gl/tests/test-float.c | 9 +++++-
gl/unistd.in.h | 3 +-
lib/accelerated/intel/aes-gcm-padlock.c | 1 -
lib/accelerated/intel/aes-padlock.c | 1 -
lib/accelerated/intel/aes-padlock.h | 4 +-
lib/gnutls_sig.c | 3 +-
lib/gnutls_state.c | 1 -
lib/gnutls_ui.c | 3 +-
lib/includes/gnutls/gnutls.h.in | 2 +-
lib/includes/gnutls/openpgp.h | 14 ++++-----
lib/includes/gnutls/x509.h | 31 +++++++++----------
lib/openpgp/gnutls_openpgp.c | 12 ++++----
lib/pkcs11_privkey.c | 2 -
lib/pkcs11_write.c | 4 +-
maint.mk | 6 ++--
src/prime.c | 7 ++--
24 files changed, 153 insertions(+), 91 deletions(-)
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 1441501..aaabc4f 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -188,12 +188,15 @@ APIMANS += gnutls_pubkey_get_key_id.3
APIMANS += gnutls_pubkey_get_pk_rsa_raw.3
APIMANS += gnutls_pubkey_get_pk_dsa_raw.3
APIMANS += gnutls_pubkey_get_pk_ecc_raw.3
+APIMANS += gnutls_pubkey_get_pk_ecc_x962.3
APIMANS += gnutls_pubkey_import.3
APIMANS += gnutls_x509_crt_set_pubkey.3
APIMANS += gnutls_x509_crq_set_pubkey.3
APIMANS += gnutls_pubkey_set_key_usage.3
APIMANS += gnutls_pubkey_import_pkcs11_url.3
APIMANS += gnutls_pubkey_import_rsa_raw.3
+APIMANS += gnutls_pubkey_import_ecc_raw.3
+APIMANS += gnutls_pubkey_import_ecc_x962.3
APIMANS += gnutls_pubkey_import_dsa_raw.3
APIMANS += gnutls_pubkey_verify_data.3
APIMANS += gnutls_pubkey_verify_data2.3
@@ -302,6 +305,7 @@ APIMANS += gnutls_pkcs11_privkey_get_pk_algorithm.3
APIMANS += gnutls_pkcs11_privkey_get_info.3
APIMANS += gnutls_pkcs11_privkey_import_url.3
APIMANS += gnutls_pkcs11_privkey_export_url.3
+APIMANS += gnutls_pkcs11_privkey_generate.3
APIMANS += gnutls_pkcs11_copy_secret_key.3
APIMANS += gnutls_pkcs11_copy_x509_crt.3
APIMANS += gnutls_pkcs11_copy_x509_privkey.3
diff --git a/gl/m4/getcwd.m4 b/gl/m4/getcwd.m4
index 269fdd7..d3bbe59 100644
--- a/gl/m4/getcwd.m4
+++ b/gl/m4/getcwd.m4
@@ -6,7 +6,7 @@
# with or without modifications, as long as this notice is preserved.
# Written by Paul Eggert.
-# serial 7
+# serial 8
AC_DEFUN([gl_FUNC_GETCWD_NULL],
[
@@ -37,9 +37,6 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL],
return 0;
}
#endif
- /* If size is non-zero, allocation must fail if size is too small */
- if (getcwd (NULL, 1))
- return 5;
]])],
[gl_cv_func_getcwd_null=yes],
[gl_cv_func_getcwd_null=no],
@@ -55,6 +52,24 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL],
]])])
])
+AC_DEFUN([gl_FUNC_GETCWD_SIGNATURE],
+[
+ AC_CACHE_CHECK([for getcwd with POSIX signature],
+ [gl_cv_func_getcwd_posix_signature],
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <unistd.h>]],
+ [[extern
+ #ifdef __cplusplus
+ "C"
+ #endif
+ char *getcwd (char *, size_t);
+ ]])
+ ],
+ [gl_cv_func_getcwd_posix_signature=yes],
+ [gl_cv_func_getcwd_posix_signature=no])
+ ])
+])
dnl Guarantee that getcwd will malloc with a NULL first argument. Assumes
dnl that either the system getcwd is robust, or that calling code is okay
@@ -67,9 +82,10 @@ AC_DEFUN([gl_FUNC_GETCWD_LGPL],
[
AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
AC_REQUIRE([gl_FUNC_GETCWD_NULL])
+ AC_REQUIRE([gl_FUNC_GETCWD_SIGNATURE])
- case $gl_cv_func_getcwd_null in
- *yes) ;;
+ case $gl_cv_func_getcwd_null,$gl_cv_func_getcwd_posix_signature in
+ *yes,yes) ;;
*)
dnl Minimal replacement lib/getcwd-lgpl.c.
REPLACE_GETCWD=1
@@ -83,6 +99,7 @@ AC_DEFUN([gl_FUNC_GETCWD],
[
AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
AC_REQUIRE([gl_FUNC_GETCWD_NULL])
+ AC_REQUIRE([gl_FUNC_GETCWD_SIGNATURE])
AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
gl_abort_bug=no
@@ -94,8 +111,8 @@ AC_DEFUN([gl_FUNC_GETCWD],
gl_FUNC_GETCWD_ABORT_BUG([gl_abort_bug=yes]);;
esac
- case $gl_cv_func_getcwd_null,$gl_cv_func_getcwd_path_max,$gl_abort_bug in
- *yes,yes,no) ;;
+ case
$gl_cv_func_getcwd_null,$gl_cv_func_getcwd_posix_signature$gl_cv_func_getcwd_path_max,$gl_abort_bug
in
+ *yes,yes,yes,no) ;;
*)
dnl Full replacement lib/getcwd.c, overrides LGPL replacement.
REPLACE_GETCWD=1;;
diff --git a/gl/m4/gnulib-common.m4 b/gl/m4/gnulib-common.m4
index 9dc8fbe..8fc448f 100644
--- a/gl/m4/gnulib-common.m4
+++ b/gl/m4/gnulib-common.m4
@@ -1,4 +1,4 @@
-# gnulib-common.m4 serial 29
+# gnulib-common.m4 serial 30
dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -213,6 +213,8 @@ m4_ifndef([AS_VAR_IF],
# gl_PROG_AR_RANLIB
# Determines the values for AR, ARFLAGS, RANLIB that fit with the compiler.
+# The user can set the variables AR, ARFLAGS, RANLIB if he wants to override
+# the values.
AC_DEFUN([gl_PROG_AR_RANLIB],
[
dnl Minix 3 comes with two toolchains: The Amsterdam Compiler Kit compiler
@@ -220,24 +222,47 @@ AC_DEFUN([gl_PROG_AR_RANLIB],
dnl library formats. In particular, the GNU binutils programs ar, ranlib
dnl produce libraries that work only with gcc, not with cc.
AC_REQUIRE([AC_PROG_CC])
- AC_EGREP_CPP([Amsterdam],
+ AC_CACHE_CHECK([for Minix Amsterdam compiler], [gl_cv_c_amsterdam_compiler],
[
+ AC_EGREP_CPP([Amsterdam],
+ [
#ifdef __ACK__
Amsterdam
#endif
- ],
- [AR='cc -c.a'
- ARFLAGS='-o'
- RANLIB=':'
- ],
- [dnl Use the Automake-documented default values for AR and ARFLAGS.
- AR='ar'
- ARFLAGS='cru'
- dnl Use the ranlib program if it is available.
- AC_PROG_RANLIB
+ ],
+ [gl_cv_c_amsterdam_compiler=yes],
+ [gl_cv_c_amsterdam_compiler=no])
])
+ if test -z "$AR"; then
+ if test $gl_cv_c_amsterdam_compiler = yes; then
+ AR='cc -c.a'
+ if test -z "$ARFLAGS"; then
+ ARFLAGS='-o'
+ fi
+ else
+ dnl Use the Automake-documented default values for AR and ARFLAGS,
+ dnl but prefer ${host}-ar over ar (useful for cross-compiling).
+ AC_CHECK_TOOL([AR], [ar], [ar])
+ if test -z "$ARFLAGS"; then
+ ARFLAGS='cru'
+ fi
+ fi
+ else
+ if test -z "$ARFLAGS"; then
+ ARFLAGS='cru'
+ fi
+ fi
AC_SUBST([AR])
AC_SUBST([ARFLAGS])
+ if test -z "$RANLIB"; then
+ if test $gl_cv_c_amsterdam_compiler = yes; then
+ RANLIB=':'
+ else
+ dnl Use the ranlib program if it is available.
+ AC_PROG_RANLIB
+ fi
+ fi
+ AC_SUBST([RANLIB])
])
# AC_PROG_MKDIR_P
diff --git a/gl/m4/largefile.m4 b/gl/m4/largefile.m4
index 6986244..d83fea1 100644
--- a/gl/m4/largefile.m4
+++ b/gl/m4/largefile.m4
@@ -19,8 +19,8 @@ m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES],
incorrectly reject 9223372036854775807. */
@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[[(LARGE_OFF_T % 2147483629 == 721
- && LARGE_OFF_T % 2147483647 == 1)
- ? 1 : -1]];[]dnl
+ && LARGE_OFF_T % 2147483647 == 1)
+ ? 1 : -1]];[]dnl
])
@@ -58,7 +58,7 @@ rm -rf conftest*[]dnl
# http://www.unix-systems.org/version2/whatsnew/lfs20mar.html
AC_DEFUN([AC_SYS_LARGEFILE],
[AC_ARG_ENABLE(largefile,
- [ --disable-largefile omit support for large files])
+ [ --disable-largefile omit support for large files])
if test "$enable_largefile" != no; then
AC_CACHE_CHECK([for special C compiler options needed for large files],
@@ -67,13 +67,13 @@ if test "$enable_largefile" != no; then
if test "$GCC" != yes; then
ac_save_CC=$CC
while :; do
- # IRIX 6.2 and later do not support large files by default,
- # so use the C compiler's -n32 option if that helps.
- AC_LANG_CONFTEST([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_INCLUDES])])
- AC_COMPILE_IFELSE([], [break])
- CC="$CC -n32"
- AC_COMPILE_IFELSE([], [ac_cv_sys_largefile_CC=' -n32'; break])
- break
+ # IRIX 6.2 and later do not support large files by default,
+ # so use the C compiler's -n32 option if that helps.
+ AC_LANG_CONFTEST([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_INCLUDES])])
+ AC_COMPILE_IFELSE([], [break])
+ CC="$CC -n32"
+ AC_COMPILE_IFELSE([], [ac_cv_sys_largefile_CC=' -n32'; break])
+ break
done
CC=$ac_save_CC
rm -f conftest.$ac_ext
diff --git a/gl/tests/init.sh b/gl/tests/init.sh
index 0da6c1e..e6f5f1c 100644
--- a/gl/tests/init.sh
+++ b/gl/tests/init.sh
@@ -208,8 +208,10 @@ export MALLOC_PERTURB_
# a partition, or to undo any other global state changes.
cleanup_ () { :; }
-if ( diff --version < /dev/null 2>&1 | grep GNU ) > /dev/null 2>&1; then
+if ( diff -u "$0" "$0" < /dev/null ) > /dev/null 2>&1; then
compare () { diff -u "$@"; }
+elif ( diff -c "$0" "$0" < /dev/null ) > /dev/null 2>&1; then
+ compare () { diff -c "$@"; }
elif ( cmp --version < /dev/null 2>&1 | grep GNU ) > /dev/null 2>&1; then
compare () { cmp -s "$@"; }
else
diff --git a/gl/tests/lstat.c b/gl/tests/lstat.c
index b26065e..d786288 100644
--- a/gl/tests/lstat.c
+++ b/gl/tests/lstat.c
@@ -17,6 +17,10 @@
/* written by Jim Meyering */
+/* If the user's config.h happens to include <sys/stat.h>, let it include only
+ the system's <sys/stat.h> here, so that orig_lstat doesn't recurse to
+ rpl_lstat. */
+#define __need_system_sys_stat_h
#include <config.h>
#if !HAVE_LSTAT
@@ -27,7 +31,6 @@ typedef int dummy;
#else /* HAVE_LSTAT */
/* Get the original definition of lstat. It might be defined as a macro. */
-# define __need_system_sys_stat_h
# include <sys/types.h>
# include <sys/stat.h>
# undef __need_system_sys_stat_h
@@ -39,7 +42,10 @@ orig_lstat (const char *filename, struct stat *buf)
}
/* Specification. */
-# include <sys/stat.h>
+/* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc
+ eliminates this include because of the preliminary #include <sys/stat.h>
+ above. */
+# include "sys/stat.h"
# include <string.h>
# include <errno.h>
diff --git a/gl/tests/open.c b/gl/tests/open.c
index e60b619..8dc36ef 100644
--- a/gl/tests/open.c
+++ b/gl/tests/open.c
@@ -16,13 +16,16 @@
/* Written by Bruno Haible <address@hidden>, 2007. */
+/* If the user's config.h happens to include <fcntl.h>, let it include only
+ the system's <fcntl.h> here, so that orig_open doesn't recurse to
+ rpl_open. */
+#define __need_system_fcntl_h
#include <config.h>
/* Get the original definition of open. It might be defined as a macro. */
-#define __need_system_fcntl_h
#include <fcntl.h>
-#undef __need_system_fcntl_h
#include <sys/types.h>
+#undef __need_system_fcntl_h
static inline int
orig_open (const char *filename, int flags, mode_t mode)
@@ -31,7 +34,9 @@ orig_open (const char *filename, int flags, mode_t mode)
}
/* Specification. */
-#include <fcntl.h>
+/* Write "fcntl.h" here, not <fcntl.h>, otherwise OSF/1 5.1 DTK cc eliminates
+ this include because of the preliminary #include <fcntl.h> above. */
+#include "fcntl.h"
#include <errno.h>
#include <stdarg.h>
diff --git a/gl/tests/stat.c b/gl/tests/stat.c
index f07370d..1002f16 100644
--- a/gl/tests/stat.c
+++ b/gl/tests/stat.c
@@ -16,10 +16,13 @@
/* written by Eric Blake */
+/* If the user's config.h happens to include <sys/stat.h>, let it include only
+ the system's <sys/stat.h> here, so that orig_stat doesn't recurse to
+ rpl_stat. */
+#define __need_system_sys_stat_h
#include <config.h>
/* Get the original definition of stat. It might be defined as a macro. */
-#define __need_system_sys_stat_h
#include <sys/types.h>
#include <sys/stat.h>
#undef __need_system_sys_stat_h
@@ -31,7 +34,10 @@ orig_stat (const char *filename, struct stat *buf)
}
/* Specification. */
-#include <sys/stat.h>
+/* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc
+ eliminates this include because of the preliminary #include <sys/stat.h>
+ above. */
+#include "sys/stat.h"
#include <errno.h>
#include <limits.h>
diff --git a/gl/tests/test-float.c b/gl/tests/test-float.c
index 5301813..57a472f 100644
--- a/gl/tests/test-float.c
+++ b/gl/tests/test-float.c
@@ -298,7 +298,14 @@ test_long_double (void)
/* Check that 'long double' is at least as wide as 'double'. */
ASSERT (LDBL_MANT_DIG >= DBL_MANT_DIG);
- ASSERT (LDBL_MIN_EXP <= DBL_MIN_EXP);
+
+ /* Normally, we would also assert this:
+ ASSERT (LDBL_MIN_EXP <= DBL_MIN_EXP);
+ but at least on powerpc64 with gcc-4.4.4, it would fail:
+ $ :|gcc -dD -E -include stddef.h -|grep -E 'L?DBL_MIN_EXP'
+ #define __DBL_MIN_EXP__ (-1021)
+ #define __LDBL_MIN_EXP__ (-968)
+ */
ASSERT (LDBL_MAX_EXP >= DBL_MAX_EXP);
/* Check the value of LDBL_DIG. */
diff --git a/gl/unistd.in.h b/gl/unistd.in.h
index 769ecf0..119cd14 100644
--- a/gl/unistd.in.h
+++ b/gl/unistd.in.h
@@ -85,7 +85,8 @@
/* mingw declares getcwd in <io.h>, not in <unistd.h>. */
#if ((@GNULIB_GETCWD@ || defined GNULIB_POSIXCHECK) \
&& ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
-# include <io.h>
+# include <io.h> /* mingw32, mingw64 */
+# include <direct.h> /* mingw64 */
#endif
/* AIX and OSF/1 5.1 declare getdomainname in <netdb.h>, not in <unistd.h>.
diff --git a/lib/accelerated/intel/aes-gcm-padlock.c
b/lib/accelerated/intel/aes-gcm-padlock.c
index 241f563..d60c0a6 100644
--- a/lib/accelerated/intel/aes-gcm-padlock.c
+++ b/lib/accelerated/intel/aes-gcm-padlock.c
@@ -89,7 +89,6 @@ static int
aes_gcm_cipher_setkey (void *_ctx, const void *userkey, size_t keysize)
{
struct gcm_padlock_aes_ctx *ctx = _ctx;
- int ret;
GCM_SET_KEY(ctx, padlock_aes_set_encrypt_key, padlock_aes_encrypt, keysize,
userkey);
diff --git a/lib/accelerated/intel/aes-padlock.c
b/lib/accelerated/intel/aes-padlock.c
index 88bf934..a0bf838 100644
--- a/lib/accelerated/intel/aes-padlock.c
+++ b/lib/accelerated/intel/aes-padlock.c
@@ -62,7 +62,6 @@ int padlock_aes_cipher_setkey(void *_ctx, const void
*userkey, size_t keysize)
#ifdef HAVE_LIBNETTLE
struct aes_ctx nc;
#endif
- int ret;
memset(_ctx, 0, sizeof(struct padlock_cipher_data));
diff --git a/lib/accelerated/intel/aes-padlock.h
b/lib/accelerated/intel/aes-padlock.h
index 35e1e4a..ea3e2c6 100644
--- a/lib/accelerated/intel/aes-padlock.h
+++ b/lib/accelerated/intel/aes-padlock.h
@@ -33,8 +33,8 @@ int padlock_aes_ecb_encrypt(void *_ctx, const void *src,
size_t src_size,
void *dst, size_t dst_size);
/* asm */
-unsigned int padlock_capability();
-void padlock_reload_key();
+unsigned int padlock_capability(void);
+void padlock_reload_key(void);
int padlock_ecb_encrypt(void *out, const void *inp,
struct padlock_cipher_data *ctx, size_t len);
int padlock_cbc_encrypt(void *out, const void *inp,
diff --git a/lib/gnutls_sig.c b/lib/gnutls_sig.c
index c906676..5500148 100644
--- a/lib/gnutls_sig.c
+++ b/lib/gnutls_sig.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+ * Copyright (C) 2001, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
* Software Foundation, Inc.
*
* Author: Nikos Mavrogiannopoulos
@@ -419,7 +419,6 @@ _gnutls_handshake_verify_cert_vrfy12 (gnutls_session_t
session,
{
int ret;
opaque concat[MAX_HASH_SIZE];
- digest_hd_st td;
gnutls_datum_t dconcat;
gnutls_digest_algorithm_t hash_algo;
gnutls_protocol_t ver = gnutls_protocol_get_version (session);
diff --git a/lib/gnutls_state.c b/lib/gnutls_state.c
index 5fb782a..8eda274 100644
--- a/lib/gnutls_state.c
+++ b/lib/gnutls_state.c
@@ -791,7 +791,6 @@ _gnutls_cal_PRF_A (gnutls_mac_algorithm_t algorithm,
const void *secret, int secret_size,
const void *seed, int seed_size, void *result)
{
- digest_hd_st td1;
int ret;
ret = _gnutls_hmac_fast (algorithm, secret, secret_size, seed, seed_size,
result);
diff --git a/lib/gnutls_ui.c b/lib/gnutls_ui.c
index e05dd4d..79b17d5 100644
--- a/lib/gnutls_ui.c
+++ b/lib/gnutls_ui.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008, 2009, 2010 Free
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008, 2009, 2010, 2011 Free
* Software Foundation, Inc.
*
* Author: Nikos Mavrogiannopoulos
@@ -556,7 +556,6 @@ gnutls_fingerprint (gnutls_digest_algorithm_t algo,
const gnutls_datum_t * data, void *result,
size_t * result_size)
{
- digest_hd_st td;
int ret;
int hash_len = _gnutls_hash_get_algo_len (HASH2MAC (algo));
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index c61599a..3488c55 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -1081,7 +1081,7 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t
session);
int
gnutls_certificate_set_x509_trust_file (gnutls_certificate_credentials_t
- res, const char *cafile,
+ cred, const char *cafile,
gnutls_x509_crt_fmt_t type);
int gnutls_certificate_set_x509_trust_mem (gnutls_certificate_credentials_t
res, const gnutls_datum_t * ca,
diff --git a/lib/includes/gnutls/openpgp.h b/lib/includes/gnutls/openpgp.h
index 14d483f..c3cedf8 100644
--- a/lib/includes/gnutls/openpgp.h
+++ b/lib/includes/gnutls/openpgp.h
@@ -345,15 +345,13 @@ extern "C"
const char *subkey_id,
gnutls_openpgp_crt_fmt_t format);
- int
- gnutls_certificate_set_openpgp_keyring_mem
- (gnutls_certificate_credentials_t c, const unsigned char *data,
- size_t dlen, gnutls_openpgp_crt_fmt_t format);
+ int gnutls_certificate_set_openpgp_keyring_mem
+ (gnutls_certificate_credentials_t c, const unsigned char *data,
+ size_t dlen, gnutls_openpgp_crt_fmt_t format);
- int
- gnutls_certificate_set_openpgp_keyring_file
- (gnutls_certificate_credentials_t c, const char *file,
- gnutls_openpgp_crt_fmt_t format);
+ int gnutls_certificate_set_openpgp_keyring_file
+ (gnutls_certificate_credentials_t c, const char *file,
+ gnutls_openpgp_crt_fmt_t format);
#ifdef __cplusplus
}
diff --git a/lib/includes/gnutls/x509.h b/lib/includes/gnutls/x509.h
index 35a8b94..9344558 100644
--- a/lib/includes/gnutls/x509.h
+++ b/lib/includes/gnutls/x509.h
@@ -119,21 +119,21 @@ extern "C"
gnutls_x509_crt_fmt_t format,
void *output_data, size_t * output_data_size);
int gnutls_x509_crt_get_issuer_dn (gnutls_x509_crt_t cert, char *buf,
- size_t * sizeof_buf);
+ size_t * buf_size);
int gnutls_x509_crt_get_issuer_dn_oid (gnutls_x509_crt_t cert, int indx,
- void *oid, size_t * sizeof_oid);
+ void *oid, size_t * oid_size);
int gnutls_x509_crt_get_issuer_dn_by_oid (gnutls_x509_crt_t cert,
const char *oid, int indx,
unsigned int raw_flag,
- void *buf, size_t * sizeof_buf);
+ void *buf, size_t * buf_size);
int gnutls_x509_crt_get_dn (gnutls_x509_crt_t cert, char *buf,
- size_t * sizeof_buf);
+ size_t * buf_size);
int gnutls_x509_crt_get_dn_oid (gnutls_x509_crt_t cert, int indx,
- void *oid, size_t * sizeof_oid);
+ void *oid, size_t * oid_size);
int gnutls_x509_crt_get_dn_by_oid (gnutls_x509_crt_t cert,
const char *oid, int indx,
unsigned int raw_flag, void *buf,
- size_t * sizeof_buf);
+ size_t * buf_size);
int gnutls_x509_crt_check_hostname (gnutls_x509_crt_t cert,
const char *hostname);
@@ -157,10 +157,10 @@ extern "C"
unsigned int *critical);
int gnutls_x509_crt_get_subject_unique_id (gnutls_x509_crt_t crt, char *buf,
- size_t * sizeof_buf);
+ size_t * buf_size);
int gnutls_x509_crt_get_issuer_unique_id (gnutls_x509_crt_t crt, char *buf,
- size_t * sizeof_buf);
+ size_t * buf_size);
#define GNUTLS_CRL_REASON_UNUSED 128
#define GNUTLS_CRL_REASON_KEY_COMPROMISE 64
@@ -222,8 +222,8 @@ extern "C"
int gnutls_x509_crt_get_subject_alt_othername_oid (gnutls_x509_crt_t cert,
unsigned int seq,
- void *ret,
- size_t * ret_size);
+ void *oid,
+ size_t * oid_size);
int gnutls_x509_crt_get_issuer_alt_name (gnutls_x509_crt_t cert,
unsigned int seq, void *ret,
@@ -265,16 +265,15 @@ extern "C"
/* Read extensions by OID. */
int gnutls_x509_crt_get_extension_oid (gnutls_x509_crt_t cert, int indx,
- void *oid, size_t * sizeof_oid);
+ void *oid, size_t * oid_size);
int gnutls_x509_crt_get_extension_by_oid (gnutls_x509_crt_t cert,
const char *oid, int indx,
- void *buf,
- size_t * sizeof_buf,
+ void *buf, size_t * buf_size,
unsigned int *critical);
/* Read extensions by sequence number. */
int gnutls_x509_crt_get_extension_info (gnutls_x509_crt_t cert, int indx,
- void *oid, size_t * sizeof_oid,
+ void *oid, size_t * oid_size,
unsigned int *critical);
int gnutls_x509_crt_get_extension_data (gnutls_x509_crt_t cert, int indx,
void *data, size_t * sizeof_data);
@@ -593,11 +592,11 @@ extern "C"
int gnutls_x509_crt_get_fingerprint (gnutls_x509_crt_t cert,
gnutls_digest_algorithm_t algo,
- void *buf, size_t * sizeof_buf);
+ void *buf, size_t * buf_size);
int gnutls_x509_crt_get_key_purpose_oid (gnutls_x509_crt_t cert,
int indx, void *oid,
- size_t * sizeof_oid,
+ size_t * oid_size,
unsigned int *critical);
int gnutls_x509_crt_set_key_purpose_oid (gnutls_x509_crt_t cert,
const void *oid,
diff --git a/lib/openpgp/gnutls_openpgp.c b/lib/openpgp/gnutls_openpgp.c
index 5bb97fa..ae7320a 100644
--- a/lib/openpgp/gnutls_openpgp.c
+++ b/lib/openpgp/gnutls_openpgp.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
* Free Software Foundation, Inc.
*
* Author: Timo Schulz, Nikos Mavrogiannopoulos
@@ -522,7 +522,7 @@ gnutls_openpgp_count_key_names (const gnutls_datum_t * cert)
/**
* gnutls_certificate_set_openpgp_keyring_file:
- * @cred: A certificate credentials structure
+ * @c: A certificate credentials structure
* @file: filename of the keyring.
* @format: format of keyring.
*
@@ -535,15 +535,15 @@ gnutls_openpgp_count_key_names (const gnutls_datum_t *
cert)
* negative error value.
**/
int
-gnutls_certificate_set_openpgp_keyring_file (gnutls_certificate_credentials_t
- cred, const char *file,
+gnutls_certificate_set_openpgp_keyring_file (gnutls_certificate_credentials_t
c,
+ const char *file,
gnutls_openpgp_crt_fmt_t format)
{
gnutls_datum_t ring;
size_t size;
int rc;
- if (!cred || !file)
+ if (!c || !file)
{
gnutls_assert ();
return GNUTLS_E_INVALID_REQUEST;
@@ -558,7 +558,7 @@ gnutls_certificate_set_openpgp_keyring_file
(gnutls_certificate_credentials_t
}
rc =
- gnutls_certificate_set_openpgp_keyring_mem (cred, ring.data, ring.size,
+ gnutls_certificate_set_openpgp_keyring_mem (c, ring.data, ring.size,
format);
free (ring.data);
diff --git a/lib/pkcs11_privkey.c b/lib/pkcs11_privkey.c
index ffc5ac6..479613c 100644
--- a/lib/pkcs11_privkey.c
+++ b/lib/pkcs11_privkey.c
@@ -423,8 +423,6 @@ gnutls_pkcs11_privkey_generate (const char* url,
ck_session_handle_t pks = 0;
struct p11_kit_uri *info = NULL;
ck_rv_t rv;
- size_t id_size;
- opaque id[20];
struct ck_attribute a[10], p[10];
ck_object_handle_t pub, priv;
unsigned long _bits = bits;
diff --git a/lib/pkcs11_write.c b/lib/pkcs11_write.c
index 5b2fd7b..256a7d2 100644
--- a/lib/pkcs11_write.c
+++ b/lib/pkcs11_write.c
@@ -268,7 +268,7 @@ gnutls_pkcs11_copy_x509_privkey (const char *token_url,
{
p11_kit_uri_free (info);
gnutls_assert ();
- goto cleanup;
+ return ret;
}
ret =
@@ -518,7 +518,7 @@ cleanup:
default:
gnutls_assert ();
ret = GNUTLS_E_INVALID_REQUEST;
- goto cleanup;
+ break;
}
if (pks != 0)
diff --git a/maint.mk b/maint.mk
index d364934..c9ffb95 100644
--- a/maint.mk
+++ b/maint.mk
@@ -1235,9 +1235,9 @@ emit_upload_commands:
@echo =====================================
define emit-commit-log
- printf '%s\n' 'post-release administrivia' '' \
- '* NEWS: Add header line for next release.' \
- '* .prev-version: Record previous version.' \
+ printf '%s\n' 'maint: post-release administrivia' '' \
+ '* NEWS: Add header line for next release.'
\
+ '* .prev-version: Record previous version.'
\
'* cfg.mk (old_NEWS_hash): Auto-update.'
endef
diff --git a/src/prime.c b/src/prime.c
index d3241e1..f53b31e 100644
--- a/src/prime.c
+++ b/src/prime.c
@@ -1,6 +1,5 @@
/*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
- * 2010 Free Software Foundation, Inc.
+ * Copyright (C) 2001-2011 Free Software Foundation, Inc.
*
* This file is part of GnuTLS.
*
@@ -37,7 +36,7 @@
extern FILE *outfile;
extern FILE *infile;
-const static int cparams = 0;
+static const int cparams = 0;
/* If how is zero then the included parameters are used.
*/
@@ -58,7 +57,7 @@ generate_prime (int how, common_info_st * info)
fprintf (stderr, "(might take long time)\n");
}
else
- fprintf (stderr, "Retrieving DH parameters...\n", bits);
+ fprintf (stderr, "Retrieving DH parameters...\n");
if (how != 0)
{
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, gnutls_3_0_x, updated. gnutls_3_0_1-108-gd031152,
Simon Josefsson <=