From 236cc6d2ede3fb9f6b55695115d4246a69489e02 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Thu, 20 Sep 2012 11:20:36 -0400
Subject: [PATCH] test:key: add a subkey to the testing key.

I updated `key.conf` to generate the appropriate key type, but
rerunning `key.sh` would create a whole new key.  I didn't want to
rewrite the old tests to use a new primary key fingerprint, so I added
a subkey to the old pgp-mime-test key by hand:

  $ gpg --expert --edit-key 4332B6E3
  ...
  gpg> addkey
  Please select what kind of key you want:
  ...
  (8) RSA (set your own capabilities)
  Your selection? 8
  ...
  Current allowed actions: Sign Encrypt
  ...
     (Q) Finished

  Your selection? Q
  What keysize do you want? (2048)
  Requested keysize is 2048 bits
  ...
  Key is valid for? (0) 0
  Is this correct? (y/N) y
  Really create? (y/N) y
  gpg> save
  $ gpg --export --armor -o test/key.txt 4332B6E3
---
 test/key.conf |  3 +++
 test/key.txt  | 60 +++++++++++++++++++++++++++------------------------
 2 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/test/key.conf b/test/key.conf
index 57d94c6..8cc1bb6 100644
--- a/test/key.conf
+++ b/test/key.conf
@@ -6,6 +6,9 @@ Name-Real: pgp-mime-test
 Name-Comment: http://blog.tremily.us/posts/pgp-mime/
 Name-Email: pgp-mime@invalid.com
 Expire-Date: 0
+Subkey-Type: default
+Subkey-Length: 2048
+Subkey-Usage: encrypt sign
 %pubring key.pub
 %secring key.sec
 %commit
diff --git a/test/key.txt b/test/key.txt
index c75b62e..3547798 100644
--- a/test/key.txt
+++ b/test/key.txt
@@ -1,33 +1,37 @@
------BEGIN PGP PRIVATE KEY BLOCK-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-lQOYBE9qIUQBCACquHmPRH+pMguMOx6P7wHpD/CfVNwHZ/lmdDA3COxnEtT3Lf1+
+mQENBE9qIUQBCACquHmPRH+pMguMOx6P7wHpD/CfVNwHZ/lmdDA3COxnEtT3Lf1+
 9yz9h8+v+HHOYu0kIdwiYLOS1b5kNXlCMidT7POh8wLmrbvI/kSatWhAG/uR24vT
 aFbCAVCsnHn87jUsR0RFMa382YGa90tHhapWM4djS0MO2gEMgGK2tAT/h3mhCl04
 UTJHBMbA3UFO50Zbd7qiFKoydTq85GLe/3EzpzjqTn7haRY2B4gvL35TD2eMVaI4
 hjoe2HTXXE1Jld+EQCy+YY4MrwlIVhwSgfRYg5eAl2k8l6I3bIHL7a5Icjbl7kxs
-B61kbLeLraxCGdyKK9gbbb6wvGn9EOI3mEkrABEBAAEAB/0SNhGJjeYMV3FR6TCO
-bBGJGhEx/exmwdmh6z0Fcec9641aPMaw148uEGHARMFnIbhoRVBlPmmJfVGNAQNJ
-Y248jqdCnFiv4NKKU01gL3/KbvG8Em5tA9FVaqx/bUW6DHMRoRyQQQdtVIp1zHF0
-VLbh8Sc9GVcy62B3Q+7DzJpH47AkoJFhqdTQ2B1czqSTEPANRlS0Sy2nf5LdnR0/
-N8GMdl/5lvWmVHAxHhS3tbtsonqPahXAHFTlvnZz2SEL1KJVd9hwoU3kZ69RfNHU
-93NF5USwQ6ncdeHFe3wBhPhU/GgkoRei0boLliTPqtXuF2DcwJQleWd6fY8NW+QT
-7anhBADQAe64uko8a8+h9QjJeN0AG5HvnD7X5vPdaHzWamF2y4JBHJbOO7L8vI2P
-9zIXHWvVrk/UGIAHkvFFBl43aHvOwhRghgvK9qsFbH5u21d3U4TVcVhO+yt97fXt
-ZLhcdC/+UP4hVZo72aMeYs+GJum0v4Jm1HQbVbLaNfSwIt/XUQQA0hwrt77Cy7hi
-zKiHjiW9aGgp+jzgjXbHsgV+CZr+QbtOzpKLX3QXC9UDQii9dlstLM3ZrICMLyzB
-R4imUJSLUguoafSG4o1MM0X+lyRxjl0wdu98QDly8b12FfWU+P6GqAK2OmW63Cns
-s2wJ/va0bFYy6X5umW+UN096w+cHsbsEAKgZcxv61qXsaPa+wYHSfw/y5gfbeq80
-YhOUrpI+PQGfPv71vlJBNZP4cp/ES6N8Okb/7kDMLPcYSSs8o2Dxwum7eD6vM6az
-8g5R/mP+ymFuwH4E1b2ShJ8IbUJwamjBQkaGAIjJ6OzOnXA7jtf4+CgpSu79h8hv
-bXN24XIBumD+SPq0TXBncC1taW1lLXRlc3QgKGh0dHA6Ly9ibG9nLnRyZW1pbHku
-dXMvcG9zdHMvcGdwLW1pbWUvKSA8cGdwLW1pbWVAaW52YWxpZC5jb20+iQE4BBMB
-AgAiBQJPaiFEAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBRGu2mQzK2
-42xmB/4+TiUluiUXRQLXa6/sutaC55cEj3ZyGKfk/cWPFeNN5Qco/iQZra/ZDKo5
-ayf5h313goJqJJp1hxGkGUUsXj7cUcqX7osPfOkYZe5plw/7WNGYjcZZMLb3QEiT
-S94HEEZ2D/4Kqr6XwkS30pLTOjXfi37DHVPtO04It6SXOqApOvbTl5cJ2/qNVVMe
-QUR1wb07kF1+8msms+T6p11RU3H3uA4OZMfSb894tNGymmoaQfIEu/TLNWxt5ka8
-5vA3t7A4vZpGelLfkqKofKpP1FrEuGVbdLhtyd+cSWjT4TpymP7vSURhfCkP1xBH
-NTEyRh1ckIGM+dgrFZXsMKxcXuVR
-=GQ/U
------END PGP PRIVATE KEY BLOCK-----
+B61kbLeLraxCGdyKK9gbbb6wvGn9EOI3mEkrABEBAAG0TXBncC1taW1lLXRlc3Qg
+KGh0dHA6Ly9ibG9nLnRyZW1pbHkudXMvcG9zdHMvcGdwLW1pbWUvKSA8cGdwLW1p
+bWVAaW52YWxpZC5jb20+iQE4BBMBAgAiBQJPaiFEAhsPBgsJCAcDAgYVCAIJCgsE
+FgIDAQIeAQIXgAAKCRBRGu2mQzK242xmB/4+TiUluiUXRQLXa6/sutaC55cEj3Zy
+GKfk/cWPFeNN5Qco/iQZra/ZDKo5ayf5h313goJqJJp1hxGkGUUsXj7cUcqX7osP
+fOkYZe5plw/7WNGYjcZZMLb3QEiTS94HEEZ2D/4Kqr6XwkS30pLTOjXfi37DHVPt
+O04It6SXOqApOvbTl5cJ2/qNVVMeQUR1wb07kF1+8msms+T6p11RU3H3uA4OZMfS
+b894tNGymmoaQfIEu/TLNWxt5ka85vA3t7A4vZpGelLfkqKofKpP1FrEuGVbdLht
+yd+cSWjT4TpymP7vSURhfCkP1xBHNTEyRh1ckIGM+dgrFZXsMKxcXuVRuQENBFBb
+MyIBCAC7u4Jgz920BdGcIUaxFBCHIktb3zOUfWdVlusjHJzBFQLd/cG+kR4rUdWD
+gqgj/gdz/I3oqUmnPx4OwxT/98RgqbV1J7QoFOFgFpgU9qTQnYXM6Kk/iCDf7CIs
+D0i/EHGYDagXaHj2V2NUHhGr1fyi6HBj8MRv9iVNd6Dn+m275XrIzt23KL4TgvxS
+K2Y3WfwOcQ5lm53J7fDIZDLAWelL3y8sPh8ze33oSgEiV4ppwL6jpV8uVJi9R6/E
+HGZdpbpgbe0mKjCmJcq2Hx6HKpCH7W+SRBuL+2rQFLES6wIn6OZd/G56gUsA+6dD
+ele4OdevS0uoieNnUIVgyXGWHS0lABEBAAGJAj4EGAECAAkFAlBbMyICGw4BKQkQ
+URrtpkMytuPAXSAEGQECAAYFAlBbMyIACgkQFxAIui9z3i41vAf+ItwEYc3c5AAl
+gBNip/UPopvbcXaYr5SFL0UfKXtThQEbaFaSv8ursrfOrE6K98kJEJNM1rMCmG0D
+oxNaik0Pd5kAhi5Cdfv5Helv3QmL9Gtyz/GVM6P/71uy0lfcmqyhpyWxYFBPFt9a
+T2Vnm7VuCuw9S48J1+Bj/EV1xzw/fZcl9GmFyd2cuqCCEUGjTjYa8or3VEw7E0kh
+d+R500HaQGdY6OzpPuldyazhph/TPW7uX3xXS216MfTPt2Z4r+tr0IwQROixbY6C
+9nyFE2LuPUFR/3Dxy1trthQjfyvYDcgj1OoqNGaq5FvmsYbgkLw+TaeVLcKQu/4f
+aflSFWU1NnpbB/0Z+KbR5Y9y1EriXYaGDzei292lhO531MIM9PHmzPF597QKDri6
+WQkI9WWQScPwzM2ayCV7QlY2+AH05+EX2qPdXgwVqzyqSYP8dj0FZSzmI+7D214+
+wnv2QsYEYsaDg8DEMzalGB5uWKzGpplF4VnGbb2PoDkaKdmjsprhm3JibsJRkuuh
+h1k1dgi+hU24WaxxGW55GMU5p/Tffmwy27E1kd13Iugm5fgNo285/mdVXiZT6VUT
+AoMMix0Pr8Toa83t8huvcyKwa3fRRIwHEQ/+7HxjHwUUbqNKHBhc7p261aNU8tiE
+pgTfRUhF9P1xEwn4KTPj85//wQSwXd7gSEvS
+=O6cs
+-----END PGP PUBLIC KEY BLOCK-----
-- 
2.26.2