security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-02 12:01:32 +01:00
Code Activity

gpg: Remove extra RSA import status line.

Browse Source 
* g10/import.c (stats_s): Remove field "imported_rsa".
(import_print_stats): Do not print separate value for RSA.
(import_one): Remove the RSA counter.
--

RSA is the standard key format and thus there is no more need to have
a separate counter.  This is a remain from the RSA patent times.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2014-10-13 15:00:39 +02:00
parent 21c0ea6baf
commit fab89f159b
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/DETAILS
View File

@ -739,7 +739,7 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB:
- <count> - <count>
- <no_user_id> - <no_user_id>
- <imported> - <imported>
- <imported_rsa> - always 0 (formerly used for the number of RSA keys)
- <unchanged> - <unchanged>
- <n_uids> - <n_uids>
- <n_subk> - <n_subk>

10
g10/import.c
View File

@ -45,7 +45,6 @@ struct stats_s {
ulong count; ulong count;
ulong no_user_id; ulong no_user_id;
ulong imported; ulong imported;
ulong imported_rsa;
ulong n_uids; ulong n_uids;
ulong n_sigs; ulong n_sigs;
ulong n_subk; ulong n_subk;
@ -399,10 +398,8 @@ import_print_stats (void *hd)
stats->skipped_new_keys ); stats->skipped_new_keys );
if( stats->no_user_id ) if( stats->no_user_id )
log_info(_(" w/o user IDs: %lu\n"), stats->no_user_id ); log_info(_(" w/o user IDs: %lu\n"), stats->no_user_id );
if( stats->imported || stats->imported_rsa ) { if( stats->imported) {
log_info(_(" imported: %lu"), stats->imported ); log_info(_(" imported: %lu"), stats->imported );
if (stats->imported_rsa)
log_printf (" (RSA: %lu)", stats->imported_rsa );
log_printf ("\n"); log_printf ("\n");
} }
if( stats->unchanged ) if( stats->unchanged )
@ -431,11 +428,10 @@ import_print_stats (void *hd)
if( is_status_enabled() ) { if( is_status_enabled() ) {
char buf[14*20]; char buf[14*20];
sprintf(buf, "%lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu", sprintf(buf, "%lu %lu %lu 0 %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu",
stats->count, stats->count,
stats->no_user_id, stats->no_user_id,
stats->imported, stats->imported,
stats->imported_rsa,
stats->unchanged, stats->unchanged,
stats->n_uids, stats->n_uids,
stats->n_subk, stats->n_subk,
@ -1022,8 +1018,6 @@ import_one (ctrl_t ctrl,
print_import_ok (pk, 1); print_import_ok (pk, 1);
} }
stats->imported++; stats->imported++;
if( is_RSA( pk->pubkey_algo ) )
stats->imported_rsa++;
new_key = 1; new_key = 1;
} }
else { /* merge */ else { /* merge */

4
tests/openpgp/import.test
View File

@ -43,4 +43,6 @@ $GPG --import $key1 || true
$GPG --import $key2 || true $GPG --import $key2 || true
n=$($GPG --list-keys --with-colons $fpr1 $fpr2 2>/dev/null \ n=$($GPG --list-keys --with-colons $fpr1 $fpr2 2>/dev/null \
| grep '^pub:.:4096:1:DDA252EBB8EBE1AF:' | wc -l) | grep '^pub:.:4096:1:DDA252EBB8EBE1AF:' | wc -l)
[ $n -ne 2 ] && error "Importing keys with long id collision failed" if [ $n -ne 2 ] ; then
error "Importing keys with long id collision failed"
fi