From fab89f159bcb36ea7285af661d5756eefa981822 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Mon, 13 Oct 2014 15:00:39 +0200
Subject: [PATCH] gpg: Remove extra RSA import status line.

* 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>
---
 doc/DETAILS               |  2 +-
 g10/import.c              | 10 ++--------
 tests/openpgp/import.test |  4 +++-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/doc/DETAILS b/doc/DETAILS
index 311dfe3a4..eafd312c3 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -739,7 +739,7 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB:
     - <count>
     - <no_user_id>
     - <imported>
-    - <imported_rsa>
+    - always 0 (formerly used for the number of RSA keys)
     - <unchanged>
     - <n_uids>
     - <n_subk>
diff --git a/g10/import.c b/g10/import.c
index 8f7595c7f..16e2b0b4b 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -45,7 +45,6 @@ struct stats_s {
     ulong count;
     ulong no_user_id;
     ulong imported;
-    ulong imported_rsa;
     ulong n_uids;
     ulong n_sigs;
     ulong n_subk;
@@ -399,10 +398,8 @@ import_print_stats (void *hd)
 						stats->skipped_new_keys );
 	if( 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 );
-	    if (stats->imported_rsa)
-              log_printf ("  (RSA: %lu)", stats->imported_rsa );
 	    log_printf ("\n");
 	}
 	if( stats->unchanged )
@@ -431,11 +428,10 @@ import_print_stats (void *hd)
 
     if( is_status_enabled() ) {
 	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->no_user_id,
 		stats->imported,
-		stats->imported_rsa,
 		stats->unchanged,
 		stats->n_uids,
 		stats->n_subk,
@@ -1022,8 +1018,6 @@ import_one (ctrl_t ctrl,
             print_import_ok (pk, 1);
 	  }
 	stats->imported++;
-	if( is_RSA( pk->pubkey_algo ) )
-	    stats->imported_rsa++;
 	new_key = 1;
     }
     else { /* merge */
diff --git a/tests/openpgp/import.test b/tests/openpgp/import.test
index a58db40fe..783d059bb 100755
--- a/tests/openpgp/import.test
+++ b/tests/openpgp/import.test
@@ -43,4 +43,6 @@ $GPG --import $key1 || true
 $GPG --import $key2 || true
 n=$($GPG --list-keys --with-colons $fpr1 $fpr2 2>/dev/null \
     | 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