1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-23 10:29:58 +01:00
Justus Winter 4ba11251af g10: Fix key import statistics.
'transfer_secret_keys' collects statistics on a subkey-basis, while
the other code does not.  This leads to inflated numbers when
importing secret keys.  E.g. 'count' is incremented by the main
parsing loop in 'import', and again in 'transfer_secret_keys', leading
to a total of 3 if one key with two secret subkeys is imported.

* g10/import.c (import_secret_one): Adjust to the fact that
'transfer_secret_keys' collects subkey statistics.
* tests/openpgp/Makefile.am (TESTS): Add new test.
* tests/openpgp/issue2346.scm: New file.
* tests/openpgp/samplekeys/issue2346.gpg: Likewise.

GnuPG-bug-id: 2346
Signed-off-by: Justus Winter <justus@g10code.com>
2016-07-25 12:50:35 +02:00
..
2016-07-25 12:50:35 +02:00
2009-01-13 14:01:56 +00:00
2016-06-28 15:53:59 +02:00
2016-07-19 16:38:21 +02:00
2016-07-19 16:38:21 +02:00
2016-07-19 16:38:21 +02:00

no-creation-time.gpg   A key with a zero creation time.
ecc-sample-1-pub.asc   A NIST P-256 ECC sample key.
ecc-sample-1-sec.asc   Ditto, but the secret keyblock.
ecc-sample-2-pub.asc   A NIST P-384 ECC sample key.
ecc-sample-2-sec.asc   Ditto, but the secret keyblock.
ecc-sample-3-pub.asc   A NIST P-521 ECC sample key.
ecc-sample-3-sec.asc   Ditto, but the secret keyblock.
eddsa-sample-1-pub.asc An Ed25519 sample key.
eddsa-sample-1-sec.asc Ditto, but as protected secret keyblock.
dda252ebb8ebe1af-1.asc rsa4096 key 1
dda252ebb8ebe1af-2.asc rsa4096 key 2 with a long keyid collision.
whats-new-in-2.1.asc   Collection of sample keys.
e2e-p256-1-clr.asc     Google End-end-End test key (no protection)
e2e-p256-1-prt.asc     Ditto, but protected with passphrase "a".
E657FB607BB4F21C90BB6651BC067AF28BC90111.asc Key with subkeys (no protection)
rsa-rsa-sample-1.asc   RSA+RSA sample key (no passphrase)
ed25519-cv25519-sample-1.asc  Ed25519+CV25519 sample key (no passphrase)
silent-running.asc     Collection of sample secret keys (no passphrases)