pkg/ssh: specify ssh-keygen to always generate PEM format

gogs.go

@@ -16,7 +16,7 @@ import (
 	"github.com/gogs/gogs/pkg/setting"
 )
 
-const APP_VER = "0.11.83.1218"
+const APP_VER = "0.11.84.1219"
 
 func init() {
 	setting.AppVer = APP_VER

pkg/ssh/ssh.go

@@ -166,7 +166,7 @@ func Listen(host string, port int, ciphers []string) {
 	keyPath := filepath.Join(setting.AppDataPath, "ssh/gogs.rsa")
 	if !com.IsExist(keyPath) {
 		os.MkdirAll(filepath.Dir(keyPath), os.ModePerm)
-		_, stderr, err := com.ExecCmd(setting.SSH.KeygenPath, "-f", keyPath, "-t", "rsa", "-N", "")
+		_, stderr, err := com.ExecCmd(setting.SSH.KeygenPath, "-f", keyPath, "-t", "rsa", "-m", "PEM", "-N", "")
 		if err != nil {
 			panic(fmt.Sprintf("Fail to generate private key: %v - %s", err, stderr))
 		}

templates/.VERSION

@@ -1 +1 @@
-0.11.83.1218
+0.11.84.1219