Skip to content

Commit 354bfbe

Browse files
authored
Allow RSA 2047 bit keys (#20272)
Unfortunately it appears that 2048 bit RSA keys can occasionally be created in such a way that they appear to have 2047 bit length. This PR simply changes our defaults to allow these. Fix #20249 Signed-off-by: Andrew Thornton <[email protected]>
1 parent 1e43a88 commit 354bfbe

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Diff for: custom/conf/app.example.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1231,7 +1231,7 @@ PATH =
12311231
;; Define allowed algorithms and their minimum key length (use -1 to disable a type)
12321232
;ED25519 = 256
12331233
;ECDSA = 256
1234-
;RSA = 2048
1234+
;RSA = 2047 ; we allow 2047 here because an otherwise valid 2048 bit RSA key can be reported as having 2047 bit length
12351235
;DSA = -1 ; set to 1024 to switch on
12361236

12371237
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

Diff for: docs/content/doc/advanced/config-cheat-sheet.en-us.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ Define allowed algorithms and their minimum key length (use -1 to disable a type
621621

622622
- `ED25519`: **256**
623623
- `ECDSA`: **256**
624-
- `RSA`: **2048**
624+
- `RSA`: **2047**: We set 2047 here because an otherwise valid 2048 RSA key can be reported as 2047 length.
625625
- `DSA`: **-1**: DSA is now disabled by default. Set to **1024** to re-enable but ensure you may need to reconfigure your SSHD provider
626626

627627
## Webhook (`webhook`)

Diff for: modules/setting/setting.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ var (
170170
ServerMACs: []string{"[email protected]", "hmac-sha2-256", "hmac-sha1"},
171171
KeygenPath: "ssh-keygen",
172172
MinimumKeySizeCheck: true,
173-
MinimumKeySizes: map[string]int{"ed25519": 256, "ed25519-sk": 256, "ecdsa": 256, "ecdsa-sk": 256, "rsa": 2048},
173+
MinimumKeySizes: map[string]int{"ed25519": 256, "ed25519-sk": 256, "ecdsa": 256, "ecdsa-sk": 256, "rsa": 2047},
174174
ServerHostKeys: []string{"ssh/gitea.rsa", "ssh/gogs.rsa"},
175175
AuthorizedKeysCommandTemplate: "{{.AppPath}} --config={{.CustomConf}} serv key-{{.Key.ID}}",
176176
PerWriteTimeout: PerWriteTimeout,

0 commit comments

Comments
 (0)