diff options
| author | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-10-05 10:01:24 +0200 |
|---|---|---|
| committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-10-05 10:01:24 +0200 |
| commit | 40778d4ba94ab5bfbe71bd3a304d6664c9a02560 (patch) | |
| tree | 5864e2c4bda6c2d1782ef0ba765a40fcd8b8e8c5 /libssh/dh.c | |
| parent | a3a7f17d0f971edce873970863cfe660b21d8f57 (diff) | |
| parent | 60d6954b7560df62634b305fec65dffbc98ff0b8 (diff) | |
| download | libssh-40778d4ba94ab5bfbe71bd3a304d6664c9a02560.tar.gz libssh-40778d4ba94ab5bfbe71bd3a304d6664c9a02560.tar.xz libssh-40778d4ba94ab5bfbe71bd3a304d6664c9a02560.zip | |
Merge branch 'master' of git://git.libssh.org/projects/libssh/libssh
Diffstat (limited to 'libssh/dh.c')
| -rw-r--r-- | libssh/dh.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libssh/dh.c b/libssh/dh.c index 1f1b20b9..0142c8d5 100644 --- a/libssh/dh.c +++ b/libssh/dh.c @@ -53,7 +53,6 @@ #include "libssh/crypto.h" #include "libssh/buffer.h" #include "libssh/session.h" -#include "libssh/options.h" #include "libssh/keys.h" #include "libssh/dh.h" @@ -1006,11 +1005,11 @@ int signature_verify(ssh_session session, ssh_string signature) { return -1; } - if (session->options->wanted_methods[SSH_HOSTKEYS]) { - if(!match(session->options->wanted_methods[SSH_HOSTKEYS],pubkey->type_c)) { + if (session->wanted_methods[SSH_HOSTKEYS]) { + if(!match(session->wanted_methods[SSH_HOSTKEYS],pubkey->type_c)) { ssh_set_error(session, SSH_FATAL, "Public key from server (%s) doesn't match user preference (%s)", - pubkey->type_c, session->options->wanted_methods[SSH_HOSTKEYS]); + pubkey->type_c, session->wanted_methods[SSH_HOSTKEYS]); publickey_free(pubkey); leave_function(); return -1; |