diff options
Diffstat (limited to 'src/protocol_ssh.c')
| -rw-r--r-- | src/protocol_ssh.c | 60 |
1 files changed, 35 insertions, 25 deletions
diff --git a/src/protocol_ssh.c b/src/protocol_ssh.c index 1aaa974..da60f9f 100644 --- a/src/protocol_ssh.c +++ b/src/protocol_ssh.c @@ -18,6 +18,8 @@ #pragma message "Unsupported libssh version < 0.7.3" #endif +static int version_logged = 0; + typedef struct ssh_data { ssh_bind sshbind; protocol_ctx *ctx; @@ -58,26 +60,30 @@ struct ssh_channel_callbacks_struct ssh_channel_cb = { int ssh_init_cb(protocol_ctx *ctx) { - N("libssh version: %s", ssh_version(0)); - if (ssh_version(SSH_VERSION_INT(LIBSSH_VERSION_MAJOR, - LIBSSH_VERSION_MINOR, - LIBSSH_VERSION_MICRO)) == NULL) - { - W("This software was compiled/linked for libssh %d.%d.%d," - " which you aren't currently using.", - LIBSSH_VERSION_MAJOR, LIBSSH_VERSION_MINOR, LIBSSH_VERSION_MICRO); - } - if (ssh_version(SSH_VERSION_INT(0,7,3)) == NULL) - { - W("%s", "Unsupported libssh version < 0.7.3"); - } - if (ssh_version(SSH_VERSION_INT(0,7,4)) != NULL || - ssh_version(SSH_VERSION_INT(0,7,90)) != NULL) - { - W("%s", - "libssh versions > 0.7.3 may suffer " - "from problems with the pki key generation/export"); + if (!version_logged) { + N("libssh version: %s", ssh_version(0)); + if (ssh_version(SSH_VERSION_INT(LIBSSH_VERSION_MAJOR, + LIBSSH_VERSION_MINOR, + LIBSSH_VERSION_MICRO)) == NULL) + { + W("This software was compiled/linked for libssh %d.%d.%d," + " which you aren't currently using.", + LIBSSH_VERSION_MAJOR, LIBSSH_VERSION_MINOR, LIBSSH_VERSION_MICRO); + } + if (ssh_version(SSH_VERSION_INT(0,7,3)) == NULL) + { + W("%s", "Unsupported libssh version < 0.7.3"); + } + if (ssh_version(SSH_VERSION_INT(0,7,4)) != NULL || + ssh_version(SSH_VERSION_INT(0,7,90)) != NULL) + { + W("%s", + "libssh versions > 0.7.3 may suffer " + "from problems with the pki key generation/export"); + } + version_logged = 1; } + ctx->cbs = potd_ssh_callbacks; if (ssh_init()) @@ -138,6 +144,10 @@ int ssh_on_listen(protocol_ctx *ctx) ssh_bind_get_fd(d->sshbind)); return 1; case 0: + if (change_default_user_group()) { + E_STRERR("%s", "Change user/group"); + return -1; + } ssh_mainloop(d); break; } @@ -201,17 +211,17 @@ static int gen_default_keys(void) if (gen_export_sshkey(SSH_KEYTYPE_RSA, 1024, "./ssh_host_rsa_key")) { W("libssh %s key generation failed, using fallback ssh-keygen", "RSA"); remove("./ssh_host_rsa_key"); - s |= system("ssh-keygen -t rsa -b 1024 -f ./ssh_host_rsa_key -N '' >/dev/null 2>/dev/null"); + s = system("ssh-keygen -t rsa -b 1024 -f ./ssh_host_rsa_key -N '' >/dev/null 2>/dev/null"); } - if (gen_export_sshkey(SSH_KEYTYPE_DSS, 1024, "./ssh_host_dsa_key")) { + if (!s && gen_export_sshkey(SSH_KEYTYPE_DSS, 1024, "./ssh_host_dsa_key")) { W("libssh %s key generation failed, using fallback ssh-keygen", "DSA"); remove("./ssh_host_dsa_key"); - s |= system("ssh-keygen -t dsa -b 1024 -f ./ssh_host_dsa_key -N '' >/dev/null 2>/dev/null"); + s = system("ssh-keygen -t dsa -b 1024 -f ./ssh_host_dsa_key -N '' >/dev/null 2>/dev/null"); } - if (gen_export_sshkey(SSH_KEYTYPE_ECDSA, 1024, "./ssh_host_ecdsa_key")) { + if (!s && gen_export_sshkey(SSH_KEYTYPE_ECDSA, 1024, "./ssh_host_ecdsa_key")) { W("libssh %s key generation failed, using fallback ssh-keygen", "ECDSA"); remove("./ssh_host_ecdsa_key"); - s |= system("ssh-keygen -t ecdsa -b 256 -f ./ssh_host_ecdsa_key -N '' >/dev/null 2>/dev/null"); + s = system("ssh-keygen -t ecdsa -b 256 -f ./ssh_host_ecdsa_key -N '' >/dev/null 2>/dev/null"); } return s != 0; @@ -241,7 +251,7 @@ static int gen_export_sshkey(enum ssh_keytypes_e type, int length, const char *p W2("Unknown SSH key type: %d", type); return 1; } - N2("Generating %s key with length %d bits and save it on disk: %s", + D2("Generating %s key with length %d bits and save it on disk: %s", type_str, length, path); s = ssh_pki_generate(type, length, &priv_key); if (s != SSH_OK) { |