nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 09:27:59 +00:00
Code Issues Projects Releases Wiki Activity

GPG key rollover.

Browse Source 
Following the same pattern as the previous one (commit 6c924ba862),
except that this time, I don't have to _set up_ the pattern in the
front-end code of presenting the current and previous key details -
just change over the actual string literals in putty.h.

But the rest is the same: new keys at the top of pgpkeys.but, old ones
relegated to the historical appendix, key ids in sign.sh switched over.
This commit is contained in:
Simon Tatham 2021-08-14 08:02:27 +01:00
parent 9983ff53d5
commit dfb252d161
3 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
doc/pgpkeys.but
View File

@ -56,25 +56,25 @@ The current issue of those keys are available for download from the
PuTTY website, and are also available on PGP keyservers using the key PuTTY website, and are also available on PGP keyservers using the key
IDs listed below. IDs listed below.
\dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/master-2018.asc}{\s{Master Key} (2018)} \dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/master-2021.asc}{\s{Master Key} (2021)}
\dd RSA, 4096-bit. Key ID: \cw{76BC7FE4EBFD2D9E}. Fingerprint: \dd RSA, 3072-bit. Key ID: \cw{DD4355EAAC1119DE}. Fingerprint:
\cw{24E1\_B1C5\_75EA\_3C9F\_F752\_\_A922\_76BC\_7FE4\_EBFD\_2D9E} \cw{A872\_D42F\_1660\_890F\_0E05\_223E\_DD43\_55EA\_AC11\_19DE}
\dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/release-2018.asc}{\s{Release Key} (2018)} \dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/release-2021.asc}{\s{Release Key} (2021)}
\dd RSA, 3072-bit. Key ID: \cw{6289A25F4AE8DA82}. Fingerprint: \dd RSA, 3072-bit. Key ID: \cw{E4F83EA2AA4915EC}. Fingerprint:
\cw{E273\_94AC\_A3F9\_D904\_9522\_\_E054\_6289\_A25F\_4AE8\_DA82} \cw{2CF6\_134B\_D3F7\_7A65\_88EB\_D668\_E4F8\_3EA2\_AA49\_15EC}
\dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/snapshot-2018.asc}{\s{Snapshot Key} (2018)} \dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/snapshot-2021.asc}{\s{Snapshot Key} (2021)}
\dd RSA, 3072-bit. Key ID: \cw{38BA7229B7588FD1}. Fingerprint: \dd RSA, 3072-bit. Key ID: \cw{B43979F89F446CFD}. Fingerprint:
\cw{C92B\_52E9\_9AB6\_1DDA\_33DB\_\_2B7A\_38BA\_7229\_B758\_8FD1} \cw{1FD3\_BCAC\_E532\_FBE0\_6A8C\_09E2\_B439\_79F8\_9F44\_6CFD}
\dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/contact-2018.asc}{\s{Secure Contact Key} (2018)} \dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/contact-2021.asc}{\s{Secure Contact Key} (2021)}
\dd RSA, 3072-bit. Key ID: \cw{657D487977F95C98}. Fingerprint: \dd RSA, 3072-bit. Key ID: \cw{012C59D4211BD62A}. Fingerprint:
\cw{A680\_0082\_2998\_6E46\_22CA\_\_0E43\_657D\_4879\_77F9\_5C98} \cw{E30F\_1354\_2A04\_BE0E\_56F0\_5801\_012C\_59D4\_211B\_D62A}
\H{pgpkeys-security} Security details \H{pgpkeys-security} Security details
@ -169,6 +169,28 @@ generated keys.
The details of all previous keys are given here. The details of all previous keys are given here.
\s{Keys generated in the 2018 rollover}
\dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/master-2018.asc}{\s{Master Key} (2018)}
\dd RSA, 4096-bit. Key ID: \cw{76BC7FE4EBFD2D9E}. Fingerprint:
\cw{24E1\_B1C5\_75EA\_3C9F\_F752\_\_A922\_76BC\_7FE4\_EBFD\_2D9E}
\dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/release-2018.asc}{\s{Release Key} (2018)}
\dd RSA, 3072-bit. Key ID: \cw{6289A25F4AE8DA82}. Fingerprint:
\cw{E273\_94AC\_A3F9\_D904\_9522\_\_E054\_6289\_A25F\_4AE8\_DA82}
\dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/snapshot-2018.asc}{\s{Snapshot Key} (2018)}
\dd RSA, 3072-bit. Key ID: \cw{38BA7229B7588FD1}. Fingerprint:
\cw{C92B\_52E9\_9AB6\_1DDA\_33DB\_\_2B7A\_38BA\_7229\_B758\_8FD1}
\dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/contact-2018.asc}{\s{Secure Contact Key} (2018)}
\dd RSA, 3072-bit. Key ID: \cw{657D487977F95C98}. Fingerprint:
\cw{A680\_0082\_2998\_6E46\_22CA\_\_0E43\_657D\_4879\_77F9\_5C98}
\s{Key generated in 2016} (when we first introduced the Secure Contact Key) \s{Key generated in 2016} (when we first introduced the Secure Contact Key)
\dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/contact-2016.asc}{\s{Secure Contact Key} (2016)} \dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/contact-2016.asc}{\s{Secure Contact Key} (2016)}

12
putty.h
View File

@ -21,14 +21,14 @@
* Fingerprints of the current and previous PGP master keys, to * Fingerprints of the current and previous PGP master keys, to
* establish a trust path between an executable and other files. * establish a trust path between an executable and other files.
*/ */
#define PGP_MASTER_KEY_YEAR "2018" #define PGP_MASTER_KEY_YEAR "2021"
#define PGP_MASTER_KEY_DETAILS "RSA, 4096-bit" #define PGP_MASTER_KEY_DETAILS "RSA, 3072-bit"
#define PGP_MASTER_KEY_FP \ #define PGP_MASTER_KEY_FP \
"24E1 B1C5 75EA 3C9F F752 A922 76BC 7FE4 EBFD 2D9E" "A872 D42F 1660 890F 0E05 223E DD43 55EA AC11 19DE"
#define PGP_PREV_MASTER_KEY_YEAR "2015" #define PGP_PREV_MASTER_KEY_YEAR "2018"
#define PGP_PREV_MASTER_KEY_DETAILS "RSA, 4096-bit" #define PGP_PREV_MASTER_KEY_DETAILS "RSA, 4096-bit"
#define PGP_PREV_MASTER_KEY_FP \ #define PGP_PREV_MASTER_KEY_FP \
"440D E3B5 B7A1 CA85 B3CC 1718 AB58 5DC6 0467 6F7C" "24E1 B1C5 75EA 3C9F F752 A922 76BC 7FE4 EBFD 2D9E"
/* /*
* Definitions of three separate indexing schemes for colour palette * Definitions of three separate indexing schemes for colour palette

4
sign.sh
View File

@ -9,14 +9,14 @@
set -e set -e
keyname=38BA7229B7588FD1 keyname=B43979F89F446CFD
preliminary=false preliminary=false
while :; do while :; do
case "$1" in case "$1" in
-r) -r)
shift shift
keyname=6289A25F4AE8DA82 keyname=E4F83EA2AA4915EC
;; ;;
-p) -p)
shift shift