diff options
| author | Damien Miller <djm@mindrot.org> | 2002-02-05 02:19:52 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2002-02-05 02:19:52 +0100 |
| commit | 9ab47eeb229761173ce5da5b4976d9ea9a7b75e4 (patch) | |
| tree | 4c6a56b641c77b2d728cf6dd2f77bc1058020efb | |
| parent | - markus@cvs.openbsd.org 2002/01/29 23:50:37 (diff) | |
| download | openssh-9ab47eeb229761173ce5da5b4976d9ea9a7b75e4.tar.xz openssh-9ab47eeb229761173ce5da5b4976d9ea9a7b75e4.zip | |
- markus@cvs.openbsd.org 2002/01/31 13:35:11
[kexdh.c kexgex.c]
cross check announced key type and type from key blob
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | kexdh.c | 5 | ||||
| -rw-r--r-- | kexgex.c | 5 |
3 files changed, 10 insertions, 5 deletions
@@ -48,6 +48,9 @@ - markus@cvs.openbsd.org 2002/01/29 23:50:37 [scp.1 ssh.1] mention exit status; ok stevesk@ + - markus@cvs.openbsd.org 2002/01/31 13:35:11 + [kexdh.c kexgex.c] + cross check announced key type and type from key blob 20020130 - (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@ @@ -7450,4 +7453,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1812 2002/02/05 01:16:15 djm Exp $ +$Id: ChangeLog,v 1.1813 2002/02/05 01:19:52 djm Exp $ @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: kexdh.c,v 1.13 2002/01/25 22:07:40 markus Exp $"); +RCSID("$OpenBSD: kexdh.c,v 1.14 2002/01/31 13:35:11 markus Exp $"); #include <openssl/crypto.h> #include <openssl/bn.h> @@ -121,7 +121,8 @@ kexdh_client(Kex *kex) server_host_key = key_from_blob(server_host_key_blob, sbloblen); if (server_host_key == NULL) fatal("cannot decode server_host_key_blob"); - + if (server_host_key->type != kex->hostkey_type) + fatal("type mismatch for decoded server_host_key_blob"); if (kex->verify_host_key == NULL) fatal("cannot verify server_host_key"); if (kex->verify_host_key(server_host_key) == -1) @@ -24,7 +24,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: kexgex.c,v 1.16 2002/01/25 22:07:40 markus Exp $"); +RCSID("$OpenBSD: kexgex.c,v 1.17 2002/01/31 13:35:11 markus Exp $"); #include <openssl/bn.h> @@ -176,7 +176,8 @@ kexgex_client(Kex *kex) server_host_key = key_from_blob(server_host_key_blob, sbloblen); if (server_host_key == NULL) fatal("cannot decode server_host_key_blob"); - + if (server_host_key->type != kex->hostkey_type) + fatal("type mismatch for decoded server_host_key_blob"); if (kex->verify_host_key == NULL) fatal("cannot verify server_host_key"); if (kex->verify_host_key(server_host_key) == -1) |