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
This commit is contained in:
Simon Tatham 2023-07-31 20:01:24 +01:00
parent 0fffc62fc6
commit 74820e9408
3 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
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-2021.asc}{\s{Master Key} (2021)} \dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/master-2023.asc}{\s{Master Key} (2023)}
\dd RSA, 3072-bit. Key ID: \cw{DD4355EAAC1119DE}. Fingerprint: \dd RSA, 4096-bit. Key ID: \cw{B15D9EFC216B06A1}. Fingerprint:
\cw{A872\_D42F\_1660\_890F\_0E05\_223E\_DD43\_55EA\_AC11\_19DE} \cw{28D4\_7C46\_55E7\_65A6\_D827\_AC66\_B15D\_9EFC\_216B\_06A1}
\dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/release-2021.asc}{\s{Release Key} (2021)} \dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/release-2023.asc}{\s{Release Key} (2023)}
\dd RSA, 3072-bit. Key ID: \cw{E4F83EA2AA4915EC}. Fingerprint: \dd RSA, 3072-bit. Key ID: \cw{1993D21BCAD1AA77}. Fingerprint:
\cw{2CF6\_134B\_D3F7\_7A65\_88EB\_D668\_E4F8\_3EA2\_AA49\_15EC} \cw{F412\_BA3A\_A30F\_DC0E\_77B4\_E387\_1993\_D21B\_CAD1\_AA77}
\dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/snapshot-2021.asc}{\s{Snapshot Key} (2021)} \dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/snapshot-2023.asc}{\s{Snapshot Key} (2023)}
\dd RSA, 3072-bit. Key ID: \cw{B43979F89F446CFD}. Fingerprint: \dd RSA, 3072-bit. Key ID: \cw{10625E553F53FAAD}. Fingerprint:
\cw{1FD3\_BCAC\_E532\_FBE0\_6A8C\_09E2\_B439\_79F8\_9F44\_6CFD} \cw{74CC\_6DD9\_ABA7\_31D4\_C5A0\_C2D0\_1062\_5E55\_3F53\_FAAD}
\dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/contact-2021.asc}{\s{Secure Contact Key} (2021)} \dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/contact-2023.asc}{\s{Secure Contact Key} (2023)}
\dd RSA, 3072-bit. Key ID: \cw{012C59D4211BD62A}. Fingerprint: \dd RSA, 3072-bit. Key ID: \cw{1559F6A8929F5EFC}. Fingerprint:
\cw{E30F\_1354\_2A04\_BE0E\_56F0\_5801\_012C\_59D4\_211B\_D62A} \cw{01F5\_A2B1\_1388\_D64B\_707F\_897F\_1559\_F6A8\_929F\_5EFC}
\H{pgpkeys-security} Security details \H{pgpkeys-security} Security details
@ -153,7 +153,7 @@ once.
\H{pgpkeys-rollover} Key rollover \H{pgpkeys-rollover} Key rollover
Our current keys were generated in August 2018. Our current keys were generated in July 2023.
Each new Master Key is signed with the old one, to show that it really Each new Master Key is signed with the old one, to show that it really
is owned by the same people and not substituted by an attacker. is owned by the same people and not substituted by an attacker.
@ -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 2021 rollover}
\dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/master-2021.asc}{\s{Master Key} (2021)}
\dd RSA, 3072-bit. Key ID: \cw{DD4355EAAC1119DE}. Fingerprint:
\cw{A872\_D42F\_1660\_890F\_0E05\_223E\_DD43\_55EA\_AC11\_19DE}
\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{E4F83EA2AA4915EC}. Fingerprint:
\cw{2CF6\_134B\_D3F7\_7A65\_88EB\_D668\_E4F8\_3EA2\_AA49\_15EC}
\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{B43979F89F446CFD}. Fingerprint:
\cw{1FD3\_BCAC\_E532\_FBE0\_6A8C\_09E2\_B439\_79F8\_9F44\_6CFD}
\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{012C59D4211BD62A}. Fingerprint:
\cw{E30F\_1354\_2A04\_BE0E\_56F0\_5801\_012C\_59D4\_211B\_D62A}
\s{Keys generated in the 2018 rollover} \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)} \dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/master-2018.asc}{\s{Master Key} (2018)}

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 "2021" #define PGP_MASTER_KEY_YEAR "2023"
#define PGP_MASTER_KEY_DETAILS "RSA, 3072-bit" #define PGP_MASTER_KEY_DETAILS "RSA, 4096-bit"
#define PGP_MASTER_KEY_FP \ #define PGP_MASTER_KEY_FP \
"A872 D42F 1660 890F 0E05 223E DD43 55EA AC11 19DE" "28D4 7C46 55E7 65A6 D827 AC66 B15D 9EFC 216B 06A1"
#define PGP_PREV_MASTER_KEY_YEAR "2018" #define PGP_PREV_MASTER_KEY_YEAR "2021"
#define PGP_PREV_MASTER_KEY_DETAILS "RSA, 4096-bit" #define PGP_PREV_MASTER_KEY_DETAILS "RSA, 3072-bit"
#define PGP_PREV_MASTER_KEY_FP \ #define PGP_PREV_MASTER_KEY_FP \
"24E1 B1C5 75EA 3C9F F752 A922 76BC 7FE4 EBFD 2D9E" "A872 D42F 1660 890F 0E05 223E DD43 55EA AC11 19DE"
/* /*
* 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=B43979F89F446CFD keyname=10625E553F53FAAD
preliminary=false preliminary=false
while :; do while :; do
case "$1" in case "$1" in
-r) -r)
shift shift
keyname=E4F83EA2AA4915EC keyname=1993D21BCAD1AA77
;; ;;
-p) -p)
shift shift