From 2307be32cf7d235076a201cf666b844ac206166a Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Thu, 6 Sep 2018 18:23:36 +0200 Subject: [PATCH] Revert "pkd: Generate host keys in old format" This is no longer needed since libssh can read the private keys in new OpenSSH format. This reverts commit 100c9c98cea75e3935a7abebb240fc155cc3b664. Signed-off-by: Jakub Jelen Reviewed-by: Andreas Schneider --- tests/pkd/pkd_keyutil.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/pkd/pkd_keyutil.c b/tests/pkd/pkd_keyutil.c index f0e0c710..14856d3c 100644 --- a/tests/pkd/pkd_keyutil.c +++ b/tests/pkd/pkd_keyutil.c @@ -21,7 +21,7 @@ void setup_rsa_key() { int rc = 0; if (access(LIBSSH_RSA_TESTKEY, F_OK) != 0) { - rc = system_checked(OPENSSH_KEYGEN " -m PEM -t rsa -q -N \"\" -f " + rc = system_checked(OPENSSH_KEYGEN " -t rsa -q -N \"\" -f " LIBSSH_RSA_TESTKEY); } assert_int_equal(rc, 0); @@ -40,7 +40,7 @@ void setup_ed25519_key() { void setup_dsa_key() { int rc = 0; if (access(LIBSSH_DSA_TESTKEY, F_OK) != 0) { - rc = system_checked(OPENSSH_KEYGEN " -m PEM -t dsa -q -N \"\" -f " + rc = system_checked(OPENSSH_KEYGEN " -t dsa -q -N \"\" -f " LIBSSH_DSA_TESTKEY); } assert_int_equal(rc, 0); @@ -51,17 +51,17 @@ void setup_ecdsa_keys() { int rc = 0; if (access(LIBSSH_ECDSA_256_TESTKEY, F_OK) != 0) { - rc = system_checked(OPENSSH_KEYGEN " -m PEM -t ecdsa -b 256 -q -N \"\" -f " + rc = system_checked(OPENSSH_KEYGEN " -t ecdsa -b 256 -q -N \"\" -f " LIBSSH_ECDSA_256_TESTKEY); assert_int_equal(rc, 0); } if (access(LIBSSH_ECDSA_384_TESTKEY, F_OK) != 0) { - rc = system_checked(OPENSSH_KEYGEN " -m PEM -t ecdsa -b 384 -q -N \"\" -f " + rc = system_checked(OPENSSH_KEYGEN " -t ecdsa -b 384 -q -N \"\" -f " LIBSSH_ECDSA_384_TESTKEY); assert_int_equal(rc, 0); } if (access(LIBSSH_ECDSA_521_TESTKEY, F_OK) != 0) { - rc = system_checked(OPENSSH_KEYGEN " -m PEM -t ecdsa -b 521 -q -N \"\" -f " + rc = system_checked(OPENSSH_KEYGEN " -t ecdsa -b 521 -q -N \"\" -f " LIBSSH_ECDSA_521_TESTKEY); assert_int_equal(rc, 0); }