[git] GnuPG - branch, master, updated. gnupg-2.1.15-299-g8ea72a7
by Justus Winter
cvs at cvs.gnupg.org
Thu Oct 27 18:51:06 CEST 2016
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 8ea72a776a88f3c851e812d258355be80caa1bc1 (commit)
via 445f0c13d751f6dee9d70ef0785866ab2a7ea120 (commit)
via 66a0091d74768ab3a4a5342d3645e1834c59045a (commit)
from cf20b23c146c9e499263654644035796475de097 (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 8ea72a776a88f3c851e812d258355be80caa1bc1
Author: Justus Winter <justus at g10code.com>
Date: Thu Oct 27 15:31:30 2016 +0200
g10: Fix iteration over getkey results.
* g10/getkey.c (getkey_next): Return the public key in PK even if
RET_KEYBLOCK is NULL.
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/g10/getkey.c b/g10/getkey.c
index 325f00b..5ef5fc3 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -1930,7 +1930,7 @@ getkey_byname (ctrl_t ctrl, getkey_ctx_t *retctx, PKT_public_key *pk,
* If PK is not NULL, the public key of the next result is returned in
* *PK. Note: The self-signed data has already been merged into the
* public key using merge_selfsigs. Free *PK by calling
- * release_public_key_parts (or, if PK was allocated using xfree, you
+ * release_public_key_parts (or, if PK was allocated using xmalloc, you
* can use free_public_key, which calls release_public_key_parts(PK)
* and then xfree(PK)).
*
@@ -1954,8 +1954,11 @@ getkey_next (getkey_ctx_t ctx, PKT_public_key *pk, kbnode_t *ret_keyblock)
keydb_disable_caching (ctx->kr_handle);
rc = lookup (ctx, ret_keyblock, &found_key, ctx->want_secret);
- if (!rc && pk && ret_keyblock)
- pk_from_block (pk, *ret_keyblock, found_key);
+ if (!rc && pk)
+ {
+ log_assert (found_key);
+ pk_from_block (pk, NULL, found_key);
+ }
return rc;
}
commit 445f0c13d751f6dee9d70ef0785866ab2a7ea120
Author: Justus Winter <justus at g10code.com>
Date: Thu Oct 27 14:58:01 2016 +0200
Fix typos.
--
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 7bcda50..969d898 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -1127,7 +1127,7 @@ confirm_flag_from_sshcontrol (const char *hexgrip)
/* Open the ssh control file for reading. This is a public version of
open_control_file. The caller must use ssh_close_control_file to
- release the retruned handle. */
+ release the returned handle. */
ssh_control_file_t
ssh_open_control_file (void)
{
diff --git a/build-aux/speedo/w32/exdll.h b/build-aux/speedo/w32/exdll.h
index e5ba3bb..bb13ae0 100644
--- a/build-aux/speedo/w32/exdll.h
+++ b/build-aux/speedo/w32/exdll.h
@@ -23,7 +23,7 @@
* 3. This notice may not be removed or altered from any source
* distribution.
************************************************************
- * 2005-11-14 wk Applied license text to orginal exdll.h file from
+ * 2005-11-14 wk Applied license text to original exdll.h file from
* NSIS 2.0.4 and did some formatting changes.
*/
diff --git a/build-aux/speedo/w32/g4wihelp.c b/build-aux/speedo/w32/g4wihelp.c
index fe903aa..012e4af 100644
--- a/build-aux/speedo/w32/g4wihelp.c
+++ b/build-aux/speedo/w32/g4wihelp.c
@@ -23,7 +23,7 @@
************************************************************
* The code for the splash screen has been taken from the Splash
* plugin of the NSIS 2.04 distribution. That code comes without
- * explicit copyright notices in tyhe source files or author names, it
+ * explicit copyright notices in the source files or author names, it
* seems that it has been written by Justin Frankel; not sure about
* the year, though. [wk 2005-11-28]
*
diff --git a/common/convert.c b/common/convert.c
index 30e5a60..4611e77 100644
--- a/common/convert.c
+++ b/common/convert.c
@@ -176,7 +176,7 @@ bin2hexcolon (const void *buffer, size_t length, char *stringbuf)
store that at BUFFER. HEXSTRING is either delimited by end of
string or a white space character. The function makes sure that
the resulting string in BUFFER is terminated by a Nul byte. Note
- that the retruned string may include embedded Nul bytes; the extra
+ that the returned string may include embedded Nul bytes; the extra
Nul byte at the end is used to make sure tha the result can always
be used as a C-string.
diff --git a/common/get-passphrase.c b/common/get-passphrase.c
index 25c1602..8c7496c 100644
--- a/common/get-passphrase.c
+++ b/common/get-passphrase.c
@@ -136,7 +136,7 @@ default_inq_cb (void *opaque, const char *line)
PROMPT is the prompt string to label the entry box, it may be NULL
for a default one. DESC_MSG is a longer description to be
displayed above the entry box, if may be NULL for a default one.
- If USE_SECMEM is true, the returned passphrase is retruned in
+ If USE_SECMEM is true, the returned passphrase is returned in
secure memory. The length of all these strings is limited; they
need to fit in their encoded form into a standard Assuan line (i.e
less then about 950 characters). All strings shall be UTF-8. */
diff --git a/common/session-env.c b/common/session-env.c
index 8c3dbb5..20b7c06 100644
--- a/common/session-env.c
+++ b/common/session-env.c
@@ -372,7 +372,7 @@ session_env_getenv_or_default (session_env_t se, const char *name,
/* List the entire environment stored in SE. The caller initially
needs to set the value of ITERATOR to 0 and then call this function
- until it returns NULL. The value is retruned at R_VALUE. If
+ until it returns NULL. The value is returned at R_VALUE. If
R_DEFAULT is not NULL, the default flag is stored on return. The
default flag indicates that the value has been taken from the
process' environment. The caller must not change the returned
diff --git a/dirmngr/server.c b/dirmngr/server.c
index 2d4f292..4e6f426 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -1367,7 +1367,7 @@ lookup_cert_by_pattern (assuan_context_t ctx, char *line,
}
}
- /* First look through the internal cache. The certifcates retruned
+ /* First look through the internal cache. The certifcates returned
here are not counted towards the truncation limit. */
if (single && !cache_only)
; /* Do not read from the local cache in this case. */
diff --git a/g10/getkey.c b/g10/getkey.c
index 22842fe..325f00b 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -1935,7 +1935,7 @@ getkey_byname (ctrl_t ctrl, getkey_ctx_t *retctx, PKT_public_key *pk,
* and then xfree(PK)).
*
* RET_KEYBLOCK can be given as NULL; if it is not NULL it the entire
- * found keyblock wis retruned hich must be released with
+ * found keyblock is returned which must be released with
* release_kbnode. If the function returns an error NULL is stored at
* RET_KEYBLOCK.
*
diff --git a/g10/import.c b/g10/import.c
index d65a7ae..88ee162 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -82,7 +82,7 @@ struct import_stats_s
*
* FIXME: We should put this into the CTRL object but that requires a
* lot more changes right now. For now we use save and restore
- * fucntion to temporary change them.
+ * function to temporary change them.
*/
/* Definition of the import filters. */
struct import_filter_s
diff --git a/g10/mainproc.c b/g10/mainproc.c
index fbcf316..5dc7c33 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -2246,7 +2246,7 @@ proc_tree (CTX c, kbnode_t node)
/* We must skip our special plaintext marker packets here because
they may be the root packet. These packets are only used in
- addtional checks and skipping them here doesn't matter. */
+ additional checks and skipping them here doesn't matter. */
while (node
&& node->pkt->pkttype == PKT_GPG_CONTROL
&& node->pkt->pkt.gpg_control->control == CTRLPKT_PLAINTEXT_MARK)
diff --git a/g10/pkclist.c b/g10/pkclist.c
index 823d670..da4cc06 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -451,8 +451,8 @@ do_we_trust( PKT_public_key *pk, unsigned int trustlevel )
return 1; /* yes */
case TRUST_NEVER:
- /* This is retruned can be returned by TOFU, which can return
- negative assertions. */
+ /* This can be returned by TOFU, which can return negative
+ assertions. */
log_info(_("%s: This key is bad! It has been marked as untrusted!\n"),
keystr_from_pk(pk));
return 0; /* no */
diff --git a/g13/sh-cmd.c b/g13/sh-cmd.c
index 6a4a7d8..d9a0f6c 100644
--- a/g13/sh-cmd.c
+++ b/g13/sh-cmd.c
@@ -162,7 +162,7 @@ static const char hlp_finddevice[] =
"\n"
"Find the device matching NAME. NAME be any identifier from\n"
"g13tab permissible for the user. The corresponding block\n"
- "device is retruned using a status line.";
+ "device is returned using a status line.";
static gpg_error_t
cmd_finddevice (assuan_context_t ctx, char *line)
{
diff --git a/scd/apdu.c b/scd/apdu.c
index c139d76..5b7290e 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -692,7 +692,7 @@ ct_get_status (int slot, unsigned int *status)
}
/* Actually send the APDU of length APDULEN to SLOT and return a
- maximum of *BUFLEN data in BUFFER, the actual retruned size will be
+ maximum of *BUFLEN data in BUFFER, the actual returned size will be
set to BUFLEN. Returns: CT API error code. */
static int
ct_send_apdu (int slot, unsigned char *apdu, size_t apdulen,
commit 66a0091d74768ab3a4a5342d3645e1834c59045a
Author: Justus Winter <justus at g10code.com>
Date: Thu Oct 27 14:43:29 2016 +0200
g10: Assert preconditions.
* g10/getkey.c (get_pubkey_byname): Assert preconditions.
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/g10/getkey.c b/g10/getkey.c
index 7b1c22b..22842fe 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -1203,6 +1203,9 @@ get_pubkey_byname (ctrl_t ctrl, GETKEY_CTX * retctx, PKT_public_key * pk,
int nodefault = 0;
int anylocalfirst = 0;
+ /* If RETCTX is not NULL, then RET_KDBHD must be NULL. */
+ log_assert (retctx == NULL || ret_kdbhd == NULL);
+
if (retctx)
*retctx = NULL;
-----------------------------------------------------------------------
Summary of changes:
agent/command-ssh.c | 2 +-
build-aux/speedo/w32/exdll.h | 2 +-
build-aux/speedo/w32/g4wihelp.c | 2 +-
common/convert.c | 2 +-
common/get-passphrase.c | 2 +-
common/session-env.c | 2 +-
dirmngr/server.c | 2 +-
g10/getkey.c | 14 ++++++++++----
g10/import.c | 2 +-
g10/mainproc.c | 2 +-
g10/pkclist.c | 4 ++--
g13/sh-cmd.c | 2 +-
scd/apdu.c | 2 +-
13 files changed, 23 insertions(+), 17 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list