diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 11 | ||||
| -rw-r--r-- | g10/import.c | 7 | ||||
| -rw-r--r-- | g10/keygen.c | 2 | ||||
| -rw-r--r-- | g10/sign.c | 4 |
4 files changed, 16 insertions, 8 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 7e09fb77e..92bfde68d 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,14 @@ +2011-01-10 Werner Koch <[email protected]> + + * keygen.c (ask_user_id): Fix duplicate test for AMAIL by correct + ANAME. See bug#1307. Reported by Steve Grubb. + + * import.c (import_keys_internal): Make loop code a bit more + readable. See bug#1307. Reported by Steve Grubb. + + * sign.c (sign_file): Fix TEMP_HASHLEN computation. See bug#1307. + Reported by Steve Grubb. + 2010-10-29 David Shaw <[email protected]> * pkclist.c (select_algo_from_prefs): Make sure the scores can't diff --git a/g10/import.c b/g10/import.c index e2d77b019..ba2439dcc 100644 --- a/g10/import.c +++ b/g10/import.c @@ -175,10 +175,9 @@ import_keys_internal( IOBUF inp, char **fnames, int nnames, rc = import( inp, "[stream]", stats, fpr, fpr_len, options); } else { - if( !fnames && !nnames ) - nnames = 1; /* Ohh what a ugly hack to jump into the loop */ + int once = (!fnames && !nnames); - for(i=0; i < nnames; i++ ) { + for(i=0; once || i < nnames; once=0, i++ ) { const char *fname = fnames? fnames[i] : NULL; IOBUF inp2 = iobuf_open(fname); if( !fname ) @@ -201,8 +200,6 @@ import_keys_internal( IOBUF inp, char **fnames, int nnames, log_error("import from `%s' failed: %s\n", fname, g10_errstr(rc) ); } - if( !fname ) - break; } } if (!stats_handle) { diff --git a/g10/keygen.c b/g10/keygen.c index 3aaae9c16..8c3e9f617 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -2247,7 +2247,7 @@ ask_user_id (int mode, KBNODE keyblock) xfree(answer); } xfree(answer); - if( !amail && !acomment && !amail ) + if( !aname && !acomment && !amail ) break; xfree(uid); uid = NULL; } diff --git a/g10/sign.c b/g10/sign.c index f54e0d9d5..94e107cf2 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -867,8 +867,8 @@ sign_file( strlist_t filenames, int detached, strlist_t locusr, { if (sk_rover->sk->pubkey_algo == PUBKEY_ALGO_DSA) { - int temp_hashlen = gcry_mpi_get_nbits - (sk_rover->sk->skey[1])+7/8; + int temp_hashlen = (gcry_mpi_get_nbits + (sk_rover->sk->skey[1])+7)/8; /* Pick a hash that is large enough for our largest q */ |