diff options
| author | Jan Moskyto Matejka <mq@ucw.cz> | 2016-12-07 14:15:35 +0100 |
|---|---|---|
| committer | Jan Moskyto Matejka <mq@ucw.cz> | 2016-12-07 14:15:35 +0100 |
| commit | af62c0f9f1f6382fe88c8ae5e514f70c0b5b6d05 (patch) | |
| tree | 49c82267598c92cc758203f8ed06d822c6c2deb2 /proto/rpki | |
| parent | cdbe1defa4b783715ed29d8d253a55d3efe0b9ed (diff) | |
LibSSH may be switched off together with RPKI
Diffstat (limited to 'proto/rpki')
| -rw-r--r-- | proto/rpki/packets.c | 2 | ||||
| -rw-r--r-- | proto/rpki/rpki.c | 2 | ||||
| -rw-r--r-- | proto/rpki/ssh_transport.c | 8 |
3 files changed, 2 insertions, 10 deletions
diff --git a/proto/rpki/packets.c b/proto/rpki/packets.c index c80343c5..22b0b54f 100644 --- a/proto/rpki/packets.c +++ b/proto/rpki/packets.c @@ -1019,7 +1019,7 @@ rpki_send_error_pdu(struct rpki_cache *cache, const enum pdu_error_type error_co u32 pdu_size = 16 + err_pdu_len + msg_len; byte pdu[pdu_size]; - memset(pdu, sizeof(pdu), 0); + memset(pdu, 0, sizeof(pdu)); struct pdu_error *e = (void *) pdu; e->ver = cache->version; diff --git a/proto/rpki/rpki.c b/proto/rpki/rpki.c index 6eac2b82..6360dbaf 100644 --- a/proto/rpki/rpki.c +++ b/proto/rpki/rpki.c @@ -887,7 +887,7 @@ rpki_check_config(struct rpki_config *cf) /* Set default port numbers */ switch (cf->tr_config.type) { - case RPKI_SSH_PORT: + case RPKI_TR_SSH: cf->port = RPKI_SSH_PORT; break; default: diff --git a/proto/rpki/ssh_transport.c b/proto/rpki/ssh_transport.c index 8fc32626..cd49ab90 100644 --- a/proto/rpki/ssh_transport.c +++ b/proto/rpki/ssh_transport.c @@ -16,7 +16,6 @@ #include <sys/time.h> #include "rpki.h" -#include "lib/libssh.h" static int rpki_tr_ssh_open(struct rpki_tr_sock *tr) @@ -26,13 +25,6 @@ rpki_tr_ssh_open(struct rpki_tr_sock *tr) struct rpki_tr_ssh_config *ssh_cf = (void *) cf->tr_config.spec; sock *sk = tr->sk; - const char *err_msg; - if ((err_msg = load_libssh()) != NULL) - { - CACHE_TRACE(D_EVENTS, cache, "%s", err_msg); - return RPKI_TR_ERROR; - } - sk->type = SK_SSH_ACTIVE; sk->ssh = mb_allocz(sk->pool, sizeof(struct ssh_sock)); sk->ssh->username = ssh_cf->user; |