mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
g10: Minor fixes.
* g10/export.c (cleartext_secret_key_to_openpgp): No initialization. (do_export_one_keyblock): Initialize with GPG_ERR_NOT_FOUND. * g10/getkey.c (get_best_pubkey_byname): Add non-null check. * g10/tofu.c (tofu_set_policy): ERR initialize to 0. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
af5f8ecf51
commit
0dec0cc281
@ -580,7 +580,7 @@ canon_pk_algo (enum gcry_pk_algos algo)
|
||||
static gpg_error_t
|
||||
cleartext_secret_key_to_openpgp (gcry_sexp_t s_key, PKT_public_key *pk)
|
||||
{
|
||||
gpg_error_t err = gpg_error (GPG_ERR_NOT_IMPLEMENTED);
|
||||
gpg_error_t err;
|
||||
gcry_sexp_t top_list;
|
||||
gcry_sexp_t key = NULL;
|
||||
char *key_type = NULL;
|
||||
@ -1539,7 +1539,7 @@ do_export_one_keyblock (ctrl_t ctrl, kbnode_t keyblock, u32 *keyid,
|
||||
KEYDB_SEARCH_DESC *desc, size_t ndesc,
|
||||
size_t descindex, gcry_cipher_hd_t cipherhd)
|
||||
{
|
||||
gpg_error_t err;
|
||||
gpg_error_t err = gpg_error (GPG_ERR_NOT_FOUND);
|
||||
char *cache_nonce = NULL;
|
||||
subkey_list_t subkey_list = NULL; /* Track already processed subkeys. */
|
||||
int skip_until_subkey = 0;
|
||||
|
@ -1654,6 +1654,7 @@ get_best_pubkey_byname (ctrl_t ctrl, GETKEY_CTX *retctx, PKT_public_key *pk,
|
||||
if (! ctx->kr_handle)
|
||||
{
|
||||
xfree (ctx);
|
||||
if (retctx)
|
||||
*retctx = NULL;
|
||||
rc = gpg_error_from_syserror ();
|
||||
}
|
||||
|
@ -3857,7 +3857,7 @@ tofu_get_validity (ctrl_t ctrl, PKT_public_key *pk, strlist_t user_id_list,
|
||||
gpg_error_t
|
||||
tofu_set_policy (ctrl_t ctrl, kbnode_t kb, enum tofu_policy policy)
|
||||
{
|
||||
gpg_error_t err;
|
||||
gpg_error_t err = 0;
|
||||
time_t now = gnupg_get_time ();
|
||||
tofu_dbs_t dbs;
|
||||
PKT_public_key *pk;
|
||||
|
Loading…
x
Reference in New Issue
Block a user