diff options
Diffstat (limited to 'dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0006-Modern-GnuPG-2.1-reports-more-detail-about-secret-ke.patch')
-rw-r--r-- | dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0006-Modern-GnuPG-2.1-reports-more-detail-about-secret-ke.patch | 120 |
1 files changed, 0 insertions, 120 deletions
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0006-Modern-GnuPG-2.1-reports-more-detail-about-secret-ke.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0006-Modern-GnuPG-2.1-reports-more-detail-about-secret-ke.patch deleted file mode 100644 index bea8bfc68dfa..000000000000 --- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0006-Modern-GnuPG-2.1-reports-more-detail-about-secret-ke.patch +++ /dev/null @@ -1,120 +0,0 @@ -From: Daniel Kahn Gillmor <dkg@fifthhorseman.net> -Date: Tue, 13 Sep 2016 14:12:40 -0400 -Subject: Modern GnuPG (2.1) reports more detail about secret keys - -the GnuPG "modern" suite (version 2.1 or later) reports more detail -about secret keys than previous versions did. In particular, it -reports stored ownertrust, public key data, and designated revokers -for secret keys. Older versions only reported those attributes for -public keys. - -This patch adjusts the test suite to ensure that our handmade key -matches the produced key when /usr/bin/gpg is supplied by the modern -suite. ---- - t/get_secret_keys.t | 66 +++++++++++++++++++++++++++++++++++++++++++---------- - 1 file changed, 54 insertions(+), 12 deletions(-) - -diff --git a/t/get_secret_keys.t b/t/get_secret_keys.t -index 7bba083..c798cce 100644 ---- a/t/get_secret_keys.t -+++ b/t/get_secret_keys.t -@@ -23,16 +23,34 @@ TEST - return 0 unless @returned_keys == 1; - - $given_key = shift @returned_keys; -- -- $handmade_key = GnuPG::PrimaryKey->new -- ( length => 1024, -+ my $pubkey_data = [ -+ Math::BigInt->from_hex('0x'. -+ '88FCAAA5BCDCD52084D46143F44ED1715A339794641158DE03AA2092AFD3174E3DCA2CB7DF2DDC6FEDF7C3620F5A8BDAD06713E6153F8748DD76CB97305F30CBA8F8801DB47FAC11EED725F55672CB9BDAD629178A677CBB089B3E8AE0D9A9AD7741697A35F2868C62D25670994A92D810480173DC24263EEA0F103A43C0B64B'), -+ Math::BigInt->from_hex('0x'. -+ '8F2A3842C70FF17660CBB78C78FC93F534AB9A17'), -+ Math::BigInt->from_hex('0x'. -+ '83E348C2AA65F56DE84E8FDCE6DA7B0991B1C75EC8CA446FA85869A43350907BFF36BE512385E8E7E095578BB2138C04E318495873218286DE2B8C86F36EA670135434967AC798EBA28581F709F0C6B696EB512D3E561E381A06E4B5239BCC655015F9A926C74E4B859B26EAD604F208A556511A76A40EDCD9C38E6BD82CCCB4'), -+ Math::BigInt->from_hex('0x'. -+ '80DE04C85E30C9D62C13F90CFF927A84A5A59D0900B3533D4D6193FEF8C5DAEF9FF8A7D5F76B244FBC17644F50D524E0B19CD3A4B5FC2D78DAECA3FE58FA1C1A64E6C7B96C4EE618173543163A72EF954DFD593E84342699096E9CA76578AC1DE3D893BCCD0BF470CEF625FAF816A0F503EF75C18C6173E35C8675AF919E5704') -+ ]; -+ -+ -+ my $args = { -+ length => 1024, - algo_num => 17, - hex_id => '53AE596EF950DA9C', - creation_date => 949813093, - creation_date_string => '2000-02-06', -- owner_trust => '', # secret keys do not report ownertrust? -+ owner_trust => '-', - usage_flags => 'scaESCA', -- ); -+ pubkey_data => $pubkey_data, -+ }; -+ if (!$gpg_is_modern) { -+ # older versions don't report ownertrust or pubkey_data for secret keys: -+ delete $args->{pubkey_data}; -+ $args->{owner_trust} = ''; -+ } -+ $handmade_key = GnuPG::PrimaryKey->new($args); - - $handmade_key->fingerprint - ( GnuPG::Fingerprint->new( as_hex_string => -@@ -42,20 +60,42 @@ TEST - - $handmade_key->push_user_ids( - GnuPG::UserId->new( as_string => 'GnuPG test key (for testing purposes only)', -- validity => ''), # secret keys do not report uid validity? -+ validity => $args->{owner_trust}), - GnuPG::UserId->new( as_string => 'Foo Bar (1)', -- validity => '')); # secret keys do not report uid validity? -- -- -- my $subkey = GnuPG::SubKey->new -- ( validity => '-', -+ validity => $args->{owner_trust})); -+ -+ my $revoker = GnuPG::Revoker->new -+ ( algo_num => 17, -+ class => 0x80, -+ fingerprint => GnuPG::Fingerprint->new( as_hex_string => -+ '4F863BBBA8166F0A340F600356FFD10A260C4FA3'), -+ ); -+ -+ my $subkey_pub_data = [ -+ Math::BigInt->from_hex('0x'. -+ '8831982DADC4C5D05CBB01D9EAF612131DDC9C24CEA7246557679423FB0BA42F74D10D8E7F5564F6A4FB8837F8DC4A46571C19B122E6DF4B443D15197A6A22688863D0685FADB6E402316DAA9B560D1F915475364580A67E6DF0A727778A5CF3'), -+ Math::BigInt->from_hex('0x'. -+ '6'), -+ Math::BigInt->from_hex('0x'. -+ '2F3850FF130C6AC9AA0962720E86539626FAA9B67B33A74DFC0DE843FF3E90E43E2F379EE0182D914FA539CCCF5C83A20DB3A7C45E365B8A2A092E799A3DFF4AD8274EB977BAAF5B1AFB2ACB8D6F92454F01682F555565E73E56793C46EF7C3E') -+ ]; -+ -+ my $sub_args = { -+ validity => '-', - length => 768, - algo_num => 16, - hex_id => 'ADB99D9C2E854A6B', - creation_date => 949813119, - creation_date_string => '2000-02-06', - usage_flags => 'e', -- ); -+ pubkey_data => $subkey_pub_data, -+ }; -+ -+ if (!$gpg_is_modern) { -+ # older versions do not report pubkey data for secret keys -+ delete $sub_args->{pubkey_data}; -+ } -+ my $subkey = GnuPG::SubKey->new($sub_args); - - $subkey->fingerprint - ( GnuPG::Fingerprint->new( as_hex_string => -@@ -64,6 +104,8 @@ TEST - ); - - $handmade_key->push_subkeys( $subkey ); -+ # older versions do not report designated revokers for secret keys -+ $handmade_key->push_revokers( $revoker ) if ($gpg_is_modern); - - $handmade_key->compare( $given_key ); - }; |