lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-07-31 00:03:07 +03:00
Code Activity

pkd: Generate host keys in old format

Browse Source 
This is required to work against OpenSSH 7.8, which is now
writing keys in new openssh format by default

Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Jakub Jelen
2018-08-29 20:15:47 +02:00
committed by Andreas Schneider
parent d7a64b9519
commit 100c9c98ce
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/pkd/pkd_keyutil.c
View File

@ -21,7 +21,7 @@
void setup_rsa_key() { void setup_rsa_key() {
int rc = 0; int rc = 0;
if (access(LIBSSH_RSA_TESTKEY, F_OK) != 0) { if (access(LIBSSH_RSA_TESTKEY, F_OK) != 0) {
rc = system_checked(OPENSSH_KEYGEN " -t rsa -q -N \"\" -f " rc = system_checked(OPENSSH_KEYGEN " -m PEM -t rsa -q -N \"\" -f "
LIBSSH_RSA_TESTKEY); LIBSSH_RSA_TESTKEY);
} }
assert_int_equal(rc, 0); assert_int_equal(rc, 0);
@ -40,7 +40,7 @@ void setup_ed25519_key() {
void setup_dsa_key() { void setup_dsa_key() {
int rc = 0; int rc = 0;
if (access(LIBSSH_DSA_TESTKEY, F_OK) != 0) { if (access(LIBSSH_DSA_TESTKEY, F_OK) != 0) {
rc = system_checked(OPENSSH_KEYGEN " -t dsa -q -N \"\" -f " rc = system_checked(OPENSSH_KEYGEN " -m PEM -t dsa -q -N \"\" -f "
LIBSSH_DSA_TESTKEY); LIBSSH_DSA_TESTKEY);
} }
assert_int_equal(rc, 0); assert_int_equal(rc, 0);
@ -51,17 +51,17 @@ void setup_ecdsa_keys() {
int rc = 0; int rc = 0;
if (access(LIBSSH_ECDSA_256_TESTKEY, F_OK) != 0) { if (access(LIBSSH_ECDSA_256_TESTKEY, F_OK) != 0) {
rc = system_checked(OPENSSH_KEYGEN " -t ecdsa -b 256 -q -N \"\" -f " rc = system_checked(OPENSSH_KEYGEN " -m PEM -t ecdsa -b 256 -q -N \"\" -f "
LIBSSH_ECDSA_256_TESTKEY); LIBSSH_ECDSA_256_TESTKEY);
assert_int_equal(rc, 0); assert_int_equal(rc, 0);
} }
if (access(LIBSSH_ECDSA_384_TESTKEY, F_OK) != 0) { if (access(LIBSSH_ECDSA_384_TESTKEY, F_OK) != 0) {
rc = system_checked(OPENSSH_KEYGEN " -t ecdsa -b 384 -q -N \"\" -f " rc = system_checked(OPENSSH_KEYGEN " -m PEM -t ecdsa -b 384 -q -N \"\" -f "
LIBSSH_ECDSA_384_TESTKEY); LIBSSH_ECDSA_384_TESTKEY);
assert_int_equal(rc, 0); assert_int_equal(rc, 0);
} }
if (access(LIBSSH_ECDSA_521_TESTKEY, F_OK) != 0) { if (access(LIBSSH_ECDSA_521_TESTKEY, F_OK) != 0) {
rc = system_checked(OPENSSH_KEYGEN " -t ecdsa -b 521 -q -N \"\" -f " rc = system_checked(OPENSSH_KEYGEN " -m PEM -t ecdsa -b 521 -q -N \"\" -f "
LIBSSH_ECDSA_521_TESTKEY); LIBSSH_ECDSA_521_TESTKEY);
assert_int_equal(rc, 0); assert_int_equal(rc, 0);
} }