Skip to content

Commit 687a17d

Browse files
authored
Update GPG key generation instructions (for older Git for Windows versions)
Clarified the option for ECC key generation and added a note about Git for Windows versions.
1 parent 3bde995 commit 687a17d

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

practices/guides/commit-signing.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ If you have already committed and need to retrospectively sign commits, follow t
3636
gpg --full-generate-key
3737
```
3838

39-
1. Pick `ECC (sign and encrypt)` then `Curve 25519` ([Ed25519](https://en.wikipedia.org/wiki/EdDSA#Ed25519) offers the strongest encryption at time of writing)
39+
1. Pick `(9) ECC (sign and encrypt)` then `Curve 25519` ([Ed25519](https://en.wikipedia.org/wiki/EdDSA#Ed25519) offers the strongest encryption at time of writing)
4040
1. Select a key expiry time (personal choice)
4141
1. `Real name` = Your GitHub handle
4242
1. `Email address` = An email address [registered against your GitHub account](https://github.com/settings/emails) - to enable [Smart Commits](https://nhsd-confluence.digital.nhs.uk/x/SZNYRg#UsingtheGitHubintegrationinJira-SmartCommits) ([Jira/GitHub integration](https://support.atlassian.com/jira-software-cloud/docs/process-issues-with-smart-commits/)), use your `@nhs.net` address
@@ -96,7 +96,10 @@ If you have already committed and need to retrospectively sign commits, follow t
9696
gpg --full-generate-key
9797
```
9898
99-
1. Pick `ECC (sign and encrypt)` then `Curve 25519` ([Ed25519](https://en.wikipedia.org/wiki/EdDSA#Ed25519) offers the strongest encryption at time of writing)
99+
1. Pick `(9) ECC (sign and encrypt)` then `Curve 25519` ([Ed25519](https://en.wikipedia.org/wiki/EdDSA#Ed25519) offers the strongest encryption at time of writing)
100+
101+
> If you already had Git for Windows installed, and its version is between `2.5.0` and `2.30.x`, the `(9) ECC and ECC` option is available if you run `gpg --expert --full-generate-key`, however if you can upgrade to the latest version, this is advised.
102+
100103
1. Select a key expiry time (personal choice)
101104
1. `Real name` = Your GitHub handle
102105
1. `Email address` = An email address [registered against your GitHub account](https://github.com/settings/emails) - to enable [Smart Commits](https://nhsd-confluence.digital.nhs.uk/x/SZNYRg#UsingtheGitHubintegrationinJira-SmartCommits) ([Jira/GitHub integration](https://support.atlassian.com/jira-software-cloud/docs/process-issues-with-smart-commits/)), use your `@nhs.net` address

0 commit comments

Comments
 (0)