lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-05-25 18:22:29 +03:00
Code

pkd: specify PubkeyAcceptedTypes for OpenSSH client

Browse Source 
As of OpenSSH 6.9, support for `ssh-dss` user keys is disabled by default
at runtime.  Specify an explicit `-o PubkeyAcceptedKeyTYpes` in the pkd
tests to explicitly enable each user key type being tested, including
`ssh-dss`.

Signed-off-by: Jon Simons <jon@jonsimons.org>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Jon Simons 2018-06-18 18:57:51 -04:00
parent 787a649390
commit adc817cf13
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/pkd/pkd_client.h
View File

@ -15,18 +15,23 @@
#define OPENSSH_BINARY "ssh" #define OPENSSH_BINARY "ssh"
#define OPENSSH_KEYGEN "ssh-keygen" #define OPENSSH_KEYGEN "ssh-keygen"
#define OPENSSH_HOSTKEY_ALGOS_DEFAULT "ssh-rsa" #define OPENSSH_HOSTKEY_ALGOS_DEFAULT "ssh-ed25519,ssh-rsa"
#define OPENSSH_PKACCEPTED_DEFAULT "ssh-ed25519,ssh-rsa"
#if HAVE_ECC #if HAVE_ECC
#define OPENSSH_HOSTKEY_ALGOS_ECDSA ",ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521" #define OPENSSH_HOSTKEY_ALGOS_ECDSA ",ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521"
#define OPENSSH_PKACCEPTED_ECDSA ",ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521"
#else /* HAVE_ECC */ #else /* HAVE_ECC */
#define OPENSSH_HOSTKEY_ALGOS_ECDSA "" #define OPENSSH_HOSTKEY_ALGOS_ECDSA ""
#define OPENSSH_PKACCEPTED_ECDSA ""
#endif /* HAVE_ECC */ #endif /* HAVE_ECC */
#if HAVE_DSA #if HAVE_DSA
#define OPENSSH_HOSTKEY_ALGOS_DSA ",ssh-dss" #define OPENSSH_HOSTKEY_ALGOS_DSA ",ssh-dss"
#define OPENSSH_PKACCEPTED_DSA ",ssh-dss"
#else /* HAVE_DSA */ #else /* HAVE_DSA */
#define OPENSSH_HOSTKEY_ALGOS_DSA "" #define OPENSSH_HOSTKEY_ALGOS_DSA ""
#define OPENSSH_PKACCEPTED_DSA ""
#endif /* HAVE_DSA */ #endif /* HAVE_DSA */
#define OPENSSH_HOSTKEY_ALGOS \ #define OPENSSH_HOSTKEY_ALGOS \
@ -35,11 +40,19 @@
OPENSSH_HOSTKEY_ALGOS_ECDSA \ OPENSSH_HOSTKEY_ALGOS_ECDSA \
OPENSSH_HOSTKEY_ALGOS_DSA OPENSSH_HOSTKEY_ALGOS_DSA
#define OPENSSH_PKACCEPTED_TYPES \
"-o PubkeyAcceptedKeyTypes=" \
OPENSSH_PKACCEPTED_DEFAULT \
OPENSSH_PKACCEPTED_ECDSA \
OPENSSH_PKACCEPTED_DSA
#define OPENSSH_CMD_START \ #define OPENSSH_CMD_START \
OPENSSH_BINARY " " \ OPENSSH_BINARY " " \
"-o UserKnownHostsFile=/dev/null " \ "-o UserKnownHostsFile=/dev/null " \
"-o StrictHostKeyChecking=no " \ "-o StrictHostKeyChecking=no " \
"-F /dev/null " \
OPENSSH_HOSTKEY_ALGOS " " \ OPENSSH_HOSTKEY_ALGOS " " \
OPENSSH_PKACCEPTED_TYPES " " \
"-i " CLIENT_ID_FILE " " \ "-i " CLIENT_ID_FILE " " \
"1> %s.out " \ "1> %s.out " \
"2> %s.err " \ "2> %s.err " \