Merge branch 'master' into master_stokito

stokito · stokito · commit 0512720ed2d1 · 2023-12-15T22:39:49.000+02:00
# Conflicts:
#	internal/keys.go
diff --git a/internal/keys.go b/internal/keys.go
@@ -76,7 +76,7 @@ func SetupHostKey(config *ssh.ServerConfig) {
 		}
 	} else {
 		Debug("no host key provided, generating host key")
-		key, err := rsa.GenerateKey(rand.Reader, 768)
+		key, err := rsa.GenerateKey(rand.Reader, 1024)
 		if err != nil {
 			log.Fatalln("failed key generate:", err)
 		}

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ func SetupHostKey(config *ssh.ServerConfig) {`
`76`	`76`	`}`
`77`	`77`	`} else {`
`78`	`78`	`Debug("no host key provided, generating host key")`
`79`		`- key, err := rsa.GenerateKey(rand.Reader, 768)`
	`79`	`+ key, err := rsa.GenerateKey(rand.Reader, 1024)`
`80`	`80`	`if err != nil {`
`81`	`81`	`log.Fatalln("failed key generate:", err)`
`82`	`82`	`}`