[git] GnuPG - branch, master, updated. gnupg-2.1.1-24-g9bf4084
by Werner Koch
cvs at cvs.gnupg.org
Mon Jan 5 15:17:46 CET 2015
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 "The GNU Privacy Guard".
The branch, master has been updated
via 9bf40849a9f86204e113712c4cc285f1ac16127a (commit)
via 616e511f278bf9af04dc66bbb8b05b37bf541f37 (commit)
via 56e688823345bbcfef220b13eb418854f8798b16 (commit)
via 445bb17d5fe6b53db078082fb033dbc67eea8307 (commit)
from ac2cb47fc5c0be539aaa07fd141acdbc0934800f (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 9bf40849a9f86204e113712c4cc285f1ac16127a
Author: Werner Koch <wk at gnupg.org>
Date: Mon Jan 5 15:10:03 2015 +0100
sm,g13: Init local vars to avoid compiler warnings.
* sm/misc.c (transform_sigval): Init RSA_S_LEN.
* g13/mount.c (read_keyblob): Init HEADERLEN.
--
Not a bug but the compiler (gcc 4.9.1) can't detect that it is not
used uninitialized.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/g13/mount.c b/g13/mount.c
index fc640e0..a9203d1 100644
--- a/g13/mount.c
+++ b/g13/mount.c
@@ -139,7 +139,8 @@ read_keyblob (const char *filename,
{
gpg_error_t err;
estream_t fp = NULL;
- size_t headerlen, msglen;
+ size_t headerlen = 0;
+ size_t msglen;
void *msg = NULL;
*r_enckeyblob = NULL;
diff --git a/sm/misc.c b/sm/misc.c
index ec9f97e..39897f4 100644
--- a/sm/misc.c
+++ b/sm/misc.c
@@ -112,7 +112,7 @@ transform_sigval (const unsigned char *sigval, size_t sigvallen, int mdalgo,
int depth, last_depth1, last_depth2;
int is_pubkey = 0;
const unsigned char *rsa_s = NULL;
- size_t rsa_s_len;
+ size_t rsa_s_len = 0;
const char *oid;
gcry_sexp_t sexp;
commit 616e511f278bf9af04dc66bbb8b05b37bf541f37
Author: Werner Koch <wk at gnupg.org>
Date: Mon Jan 5 15:07:23 2015 +0100
gpg: Remove unused args from a function.
* g10/keyserver.c (parse_keyserver_uri): Remove args configname and
configlineno. Change all callers.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/g10/card-util.c b/g10/card-util.c
index b030fad..4b584bf 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -754,7 +754,7 @@ fetch_url (ctrl_t ctrl)
gpg_strerror(rc));
else if (info.pubkey_url && *info.pubkey_url)
{
- spec=parse_keyserver_uri(info.pubkey_url,1,NULL,0);
+ spec = parse_keyserver_uri (info.pubkey_url, 1);
if(spec && info.fpr1valid)
{
/* This is not perfectly right. Currently, all card
diff --git a/g10/getkey.c b/g10/getkey.c
index 4a4dd55..f8cb869 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -2938,7 +2938,7 @@ parse_auto_key_locate (char *options)
else if (ascii_strcasecmp (tok, "pka") == 0)
akl->type = AKL_PKA;
#endif
- else if ((akl->spec = parse_keyserver_uri (tok, 1, NULL, 0)))
+ else if ((akl->spec = parse_keyserver_uri (tok, 1)))
akl->type = AKL_SPEC;
else
{
diff --git a/g10/gpg.c b/g10/gpg.c
index 12fe7b2..73de511 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2800,8 +2800,7 @@ main (int argc, char **argv)
case oKeyServer:
{
keyserver_spec_t keyserver;
- keyserver = parse_keyserver_uri (pargs.r.ret_str,0,
- configname,configlineno);
+ keyserver = parse_keyserver_uri (pargs.r.ret_str, 0);
if (!keyserver)
log_error (_("could not parse keyserver URL\n"));
else
@@ -2990,8 +2989,7 @@ main (int argc, char **argv)
case oDefaultKeyserverURL:
{
keyserver_spec_t keyserver;
- keyserver = parse_keyserver_uri (pargs.r.ret_str,1,
- configname,configlineno);
+ keyserver = parse_keyserver_uri (pargs.r.ret_str,1 );
if (!keyserver)
log_error (_("could not parse keyserver URL\n"));
else
diff --git a/g10/keyedit.c b/g10/keyedit.c
index a8e6f5d..e2da61b 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -4165,7 +4165,7 @@ menu_set_keyserver_url (const char *url, KBNODE pub_keyblock)
{
struct keyserver_spec *keyserver = NULL;
/* Sanity check the format */
- keyserver = parse_keyserver_uri (answer, 1, NULL, 0);
+ keyserver = parse_keyserver_uri (answer, 1);
xfree (answer);
if (!keyserver)
{
diff --git a/g10/keygen.c b/g10/keygen.c
index c25caad..fa466a8 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -3106,7 +3106,7 @@ proc_parameter_file( struct para_data_s *para, const char *fname,
{
struct keyserver_spec *spec;
- spec=parse_keyserver_uri(s1,1,NULL,0);
+ spec = parse_keyserver_uri (s1, 1);
if(spec)
{
free_keyserver_spec(spec);
diff --git a/g10/keyserver-internal.h b/g10/keyserver-internal.h
index 2b1b64e..a955fc7 100644
--- a/g10/keyserver-internal.h
+++ b/g10/keyserver-internal.h
@@ -28,10 +28,8 @@
int parse_keyserver_options(char *options);
void free_keyserver_spec(struct keyserver_spec *keyserver);
struct keyserver_spec *keyserver_match(struct keyserver_spec *spec);
-struct keyserver_spec *parse_keyserver_uri(const char *string,
- int require_scheme,
- const char *configname,
- unsigned int configlineno);
+struct keyserver_spec *parse_keyserver_uri (const char *string,
+ int require_scheme);
struct keyserver_spec *parse_preferred_keyserver(PKT_signature *sig);
int keyserver_export (ctrl_t ctrl, strlist_t users);
int keyserver_import (ctrl_t ctrl, strlist_t users);
diff --git a/g10/keyserver.c b/g10/keyserver.c
index a92544c..7d80756 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -258,8 +258,7 @@ keyserver_match(struct keyserver_spec *spec)
keyserver/ksutil.c for limited use in gpgkeys_ldap or the like. */
keyserver_spec_t
-parse_keyserver_uri (const char *string,int require_scheme,
- const char *configname,unsigned int configlineno)
+parse_keyserver_uri (const char *string,int require_scheme)
{
int assume_hkp=0;
struct keyserver_spec *keyserver;
@@ -481,7 +480,7 @@ parse_preferred_keyserver(PKT_signature *sig)
memcpy(dupe,p,plen);
dupe[plen]='\0';
- spec=parse_keyserver_uri(dupe,1,NULL,0);
+ spec = parse_keyserver_uri (dupe, 1);
xfree(dupe);
}
@@ -1931,7 +1930,7 @@ keyserver_import_cert (ctrl_t ctrl,
{
struct keyserver_spec *spec;
- spec=parse_keyserver_uri(url,1,NULL,0);
+ spec = parse_keyserver_uri (url, 1);
if(spec)
{
err = keyserver_import_fprint (ctrl, *fpr,*fpr_len,spec);
@@ -1977,7 +1976,7 @@ keyserver_import_pka (ctrl_t ctrl,
{
/* An URI is available. Lookup the key. */
struct keyserver_spec *spec;
- spec = parse_keyserver_uri (uri, 1, NULL, 0);
+ spec = parse_keyserver_uri (uri, 1);
if (spec)
{
rc = keyserver_import_fprint (ctrl, *fpr, 20, spec);
diff --git a/g10/mainproc.c b/g10/mainproc.c
index 03a13c5..a66a99d 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -1739,7 +1739,7 @@ check_sig_and_print (CTX c, kbnode_t node)
int res;
struct keyserver_spec *spec;
- spec = parse_keyserver_uri (uri, 1, NULL, 0);
+ spec = parse_keyserver_uri (uri, 1);
if (spec)
{
glo_ctrl.in_auto_key_retrieve++;
commit 56e688823345bbcfef220b13eb418854f8798b16
Author: Werner Koch <wk at gnupg.org>
Date: Mon Jan 5 15:03:12 2015 +0100
gpg: Clear a possible rest of the KDF secret buffer.
* g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Fix order of args.
--
That bug has been here since the beginning. The entire function needs
a review or be be moved to Libgcrypt.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/g10/ecdh.c b/g10/ecdh.c
index 0b06239..07f3983 100644
--- a/g10/ecdh.c
+++ b/g10/ecdh.c
@@ -250,7 +250,7 @@ pk_ecdh_encrypt_with_shared_point (int is_encrypt, gcry_mpi_t shared_mpi,
assert( secret_x_size <= gcry_md_get_algo_dlen (kdf_hash_algo) );
/* We could have allocated more, so clean the tail before returning. */
- memset( secret_x+secret_x_size, old_size-secret_x_size, 0 );
+ memset (secret_x+secret_x_size, 0, old_size - secret_x_size);
if (DBG_CIPHER)
log_printhex ("ecdh KEK is:", secret_x, secret_x_size );
}
commit 445bb17d5fe6b53db078082fb033dbc67eea8307
Author: Werner Koch <wk at gnupg.org>
Date: Mon Jan 5 14:55:36 2015 +0100
build: Require automake 1.14.
* configure.ac (AM_INIT_AUTOMAKE): Add serial-tests.
diff --git a/README.GIT b/README.GIT
index ee2c638..57dab7a 100644
--- a/README.GIT
+++ b/README.GIT
@@ -17,8 +17,8 @@ variables to override the default tool names:
AUTOMAKE_SUFFIX is used as a suffix for all tools from the automake
package. For example
- AUTOMAKE_SUFFIX="-1.7" ./autogen.sh
- uses "automake-1.7" and "aclocal-1.7.
+ AUTOMAKE_SUFFIX="-1.14" ./autogen.sh
+ uses "automake-1.14" and "aclocal-1.14.
AUTOMAKE_PREFIX is used as a prefix for all tools from the automake
page and may be combined with AUTOMAKE_SUFFIX. e.g.:
AUTOMAKE_PREFIX=/usr/foo/bin ./autogen.sh
diff --git a/configure.ac b/configure.ac
index 16843f4..30a639e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-min_automake_version="1.10"
+min_automake_version="1.14"
# To build a release you need to create a tag with the version number
# (git tag -s gnupg-2.n.m) and run "./autogen.sh --force". Please
@@ -78,9 +78,7 @@ VERSION=$PACKAGE_VERSION
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_SRCDIR([sm/gpgsm.c])
AC_CONFIG_HEADER([config.h])
-# Note: For automake 1.13 add the option
-# serial-tests
-AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
+AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip])
AC_CANONICAL_HOST
AB_INIT
-----------------------------------------------------------------------
Summary of changes:
README.GIT | 4 ++--
configure.ac | 6 ++----
g10/card-util.c | 2 +-
g10/ecdh.c | 2 +-
g10/getkey.c | 2 +-
g10/gpg.c | 6 ++----
g10/keyedit.c | 2 +-
g10/keygen.c | 2 +-
g10/keyserver-internal.h | 6 ++----
g10/keyserver.c | 9 ++++-----
g10/mainproc.c | 2 +-
g13/mount.c | 3 ++-
sm/misc.c | 2 +-
13 files changed, 21 insertions(+), 27 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list