diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 10 | ||||
| -rw-r--r-- | g10/getkey.c | 2 | ||||
| -rw-r--r-- | g10/skclist.c | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 42fe7ddc9..f32db206c 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,11 @@ +2001-04-28 Werner Koch <[email protected]> + + * getkey.c (merge_public_with_secret): pkttype was not set to subkey. + +2001-04-27 Werner Koch <[email protected]> + + * skclist.c (build_sk_list): Changed one log_debug to log_info. + 2001-04-25 Werner Koch <[email protected]> * keyedit.c (show_prefs): Add a verbose mode. @@ -12,7 +20,7 @@ error and made it translatable. * build-packet.c (do_secret_key): Ugly, we wrote a zero - instead of the calucalted ndays. Thanks to M Taylor for complaining + instead of the computed ndays. Thanks to M Taylor for complaining about a secret key import problem. 2001-04-23 Werner Koch <[email protected]> diff --git a/g10/getkey.c b/g10/getkey.c index b70918352..6fec97064 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -1886,7 +1886,7 @@ merge_public_with_secret ( KBNODE pubblock, KBNODE secblock ) if ( !cmp_public_secret_key ( pk, sk ) ) { copy_public_parts_to_secret_key ( pk, sk ); free_public_key ( pk ); - pub->pkt->pkttype = PKT_SECRET_KEY; + pub->pkt->pkttype = PKT_SECRET_SUBKEY; pub->pkt->pkt.secret_key = copy_secret_key (NULL, sk); break; } diff --git a/g10/skclist.c b/g10/skclist.c index dfa4d9865..c40bff91d 100644 --- a/g10/skclist.c +++ b/g10/skclist.c @@ -146,7 +146,7 @@ build_sk_list( STRLIST locusr, SK_LIST *ret_sk_list, int unlock, } else if ( key_present_in_sk_list(sk_list, sk) == 0) { free_secret_key(sk); sk = NULL; - log_debug(_("skipped: secret key already present\n")); + log_info(_("skipped: secret key already present\n")); } else if ( unlock && (rc = check_secret_key( sk, 0 )) ) { free_secret_key( sk ); sk = NULL; |