commit ada0e04d66a2dafd0173e0cde25cfe608bf1a7a6
author Paladox none <thomasmulhall410@yahoo.com> Wed Dec 11 19:05:39 2019 +0000
committer David Pursehouse <dpursehouse@collab.net> Thu Dec 12 08:03:40 2019 +0900
tree 6b5e18fe8908f39fd1d69b3bd8b518073ba44d81
parent d83119b0cd74055719dc1e9898fc2769f1ad2d38

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

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

java/com/google/gerrit/pgm/init/InitSshd.java

diff --git a/java/com/google/gerrit/pgm/init/InitSshd.java b/java/com/google/gerrit/pgm/init/InitSshd.java
index 68bdefc..c0adbe7 100644
--- a/java/com/google/gerrit/pgm/init/InitSshd.java
+++ b/java/com/google/gerrit/pgm/init/InitSshd.java
@@ -124,7 +124,7 @@
                   "-q" /* quiet */,
                   "-t",
                   "ed25519",
-                  "-P",
+                  "-N",
                   emptyPassphraseArg,
                   "-C",
                   comment,
@@ -152,7 +152,7 @@
                   "ecdsa",
                   "-b",
                   "256",
-                  "-P",
+                  "-N",
                   emptyPassphraseArg,
                   "-C",
                   comment,
@@ -180,7 +180,7 @@
                   "ecdsa",
                   "-b",
                   "384",
-                  "-P",
+                  "-N",
                   emptyPassphraseArg,
                   "-C",
                   comment,
@@ -208,7 +208,7 @@
                   "ecdsa",
                   "-b",
                   "521",
-                  "-P",
+                  "-N",
                   emptyPassphraseArg,
                   "-C",
                   comment,