opendev/gerrit
Code Issues Proposed changes

InitSshd: Use correct flag to set empty passphrase for all key types

Browse Source 
From https://www.ssh.com/ssh/keygen/:
  -N "New" Provides a new passphrase for the key.
  -P "Passphrase" Provides the (old) passphrase when reading a key.

Change Iba3a674f8 did this for RSA keys, but not for other key types.

Also do it for the other types.

Change-Id: Ied6d8d97d2333a313a0abf215bbdba5e1bba51bc
This commit is contained in:
Paladox none
2019-12-11 19:05:39 +00:00
committed by David Pursehouse
parent d83119b0cd
commit ada0e04d66
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/com/google/gerrit/pgm/init/InitSshd.java
View File

@@ -124,7 +124,7 @@ public class InitSshd implements InitStep {
"-q" /* quiet */, "-q" /* quiet */,
"-t", "-t",
"ed25519", "ed25519",
"-P", "-N",
emptyPassphraseArg, emptyPassphraseArg,
"-C", "-C",
comment, comment,
@@ -152,7 +152,7 @@ public class InitSshd implements InitStep {
"ecdsa", "ecdsa",
"-b", "-b",
"256", "256",
"-P", "-N",
emptyPassphraseArg, emptyPassphraseArg,
"-C", "-C",
comment, comment,
@@ -180,7 +180,7 @@ public class InitSshd implements InitStep {
"ecdsa", "ecdsa",
"-b", "-b",
"384", "384",
"-P", "-N",
emptyPassphraseArg, emptyPassphraseArg,
"-C", "-C",
comment, comment,
@@ -208,7 +208,7 @@ public class InitSshd implements InitStep {
"ecdsa", "ecdsa",
"-b", "-b",
"521", "521",
"-P", "-N",
emptyPassphraseArg, emptyPassphraseArg,
"-C", "-C",
comment, comment,