a45a04ff4d
The `-v` is only recognized by `dbclient` when dropbear is built in its DEBUG_TRACE mode. Omit that flag by default to avoid a warning log emitted to stderr. Signed-off-by: Jon Simons <jon@jonsimons.org> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
105 строки
2.8 KiB
C
105 строки
2.8 KiB
C
/*
|
|
* pkd_client.h -- macros for generating client-specific command
|
|
* invocations for use with pkd testing
|
|
*
|
|
* (c) 2014, 2018 Jon Simons <jon@jonsimons.org>
|
|
*/
|
|
|
|
#ifndef __PKD_CLIENT_H__
|
|
#define __PKD_CLIENT_H__
|
|
|
|
#include "config.h"
|
|
|
|
/* OpenSSH */
|
|
|
|
#define OPENSSH_BINARY "ssh"
|
|
#define OPENSSH_KEYGEN "ssh-keygen"
|
|
|
|
#define OPENSSH_HOSTKEY_ALGOS_DEFAULT "ssh-ed25519,ssh-rsa"
|
|
#define OPENSSH_PKACCEPTED_DEFAULT "ssh-ed25519,ssh-rsa"
|
|
|
|
#if HAVE_ECC
|
|
#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 */
|
|
#define OPENSSH_HOSTKEY_ALGOS_ECDSA ""
|
|
#define OPENSSH_PKACCEPTED_ECDSA ""
|
|
#endif /* HAVE_ECC */
|
|
|
|
#if HAVE_DSA
|
|
#define OPENSSH_HOSTKEY_ALGOS_DSA ",ssh-dss"
|
|
#define OPENSSH_PKACCEPTED_DSA ",ssh-dss"
|
|
#else /* HAVE_DSA */
|
|
#define OPENSSH_HOSTKEY_ALGOS_DSA ""
|
|
#define OPENSSH_PKACCEPTED_DSA ""
|
|
#endif /* HAVE_DSA */
|
|
|
|
#define OPENSSH_HOSTKEY_ALGOS \
|
|
"-o HostKeyAlgorithms=" \
|
|
OPENSSH_HOSTKEY_ALGOS_DEFAULT \
|
|
OPENSSH_HOSTKEY_ALGOS_ECDSA \
|
|
OPENSSH_HOSTKEY_ALGOS_DSA
|
|
|
|
#define OPENSSH_PKACCEPTED_TYPES \
|
|
"-o PubkeyAcceptedKeyTypes=" \
|
|
OPENSSH_PKACCEPTED_DEFAULT \
|
|
OPENSSH_PKACCEPTED_ECDSA \
|
|
OPENSSH_PKACCEPTED_DSA
|
|
|
|
#define OPENSSH_CMD_START \
|
|
OPENSSH_BINARY " " \
|
|
"-o UserKnownHostsFile=/dev/null " \
|
|
"-o StrictHostKeyChecking=no " \
|
|
"-F /dev/null " \
|
|
OPENSSH_HOSTKEY_ALGOS " " \
|
|
OPENSSH_PKACCEPTED_TYPES " " \
|
|
"-i " CLIENT_ID_FILE " " \
|
|
"1> %s.out " \
|
|
"2> %s.err " \
|
|
"-vvv "
|
|
|
|
#define OPENSSH_CMD_END "-p 1234 localhost ls"
|
|
|
|
#define OPENSSH_CMD \
|
|
OPENSSH_CMD_START OPENSSH_CMD_END
|
|
|
|
#define OPENSSH_KEX_CMD(kexalgo) \
|
|
OPENSSH_CMD_START "-o KexAlgorithms=" kexalgo " " OPENSSH_CMD_END
|
|
|
|
#define OPENSSH_CIPHER_CMD(ciphers) \
|
|
OPENSSH_CMD_START "-c " ciphers " " OPENSSH_CMD_END
|
|
|
|
#define OPENSSH_MAC_CMD(macs) \
|
|
OPENSSH_CMD_START "-o MACs=" macs " " OPENSSH_CMD_END
|
|
|
|
|
|
/* Dropbear */
|
|
|
|
#define DROPBEAR_BINARY "dbclient"
|
|
#define DROPBEAR_KEYGEN "dropbearkey"
|
|
|
|
#define DROPBEAR_CMD_START \
|
|
DROPBEAR_BINARY " " \
|
|
"-y -y " \
|
|
"-i " CLIENT_ID_FILE " " \
|
|
"1> %s.out " \
|
|
"2> %s.err "
|
|
|
|
#define DROPBEAR_CMD_END "-p 1234 localhost ls"
|
|
|
|
#define DROPBEAR_CMD \
|
|
DROPBEAR_CMD_START DROPBEAR_CMD_END
|
|
|
|
#if 0 /* dbclient does not expose control over kex algo */
|
|
#define DROPBEAR_KEX_CMD(kexalgo) \
|
|
DROPBEAR_CMD
|
|
#endif
|
|
|
|
#define DROPBEAR_CIPHER_CMD(ciphers) \
|
|
DROPBEAR_CMD_START "-c " ciphers " " DROPBEAR_CMD_END
|
|
|
|
#define DROPBEAR_MAC_CMD(macs) \
|
|
DROPBEAR_CMD_START "-m " macs " " DROPBEAR_CMD_END
|
|
|
|
#endif /* __PKD_CLIENT_H__ */
|