diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | monitor.c | 4 |
2 files changed, 7 insertions, 4 deletions
@@ -23,7 +23,10 @@ | |||
23 | - markus@cvs.openbsd.org 2002/03/26 23:14:51 | 23 | - markus@cvs.openbsd.org 2002/03/26 23:14:51 |
24 | [kex.c] | 24 | [kex.c] |
25 | generate a new cookie for each SSH2_MSG_KEXINIT message we send out | 25 | generate a new cookie for each SSH2_MSG_KEXINIT message we send out |
26 | 26 | - mouring@cvs.openbsd.org 2002/03/27 11:45:42 | |
27 | [monitor.c] | ||
28 | monitor_allowed_key() returns int instead of pointer. ok markus@ | ||
29 | |||
27 | 20020325 | 30 | 20020325 |
28 | - (stevesk) import OpenBSD <sys/tree.h> as "openbsd-compat/tree.h" | 31 | - (stevesk) import OpenBSD <sys/tree.h> as "openbsd-compat/tree.h" |
29 | - (bal) OpenBSD CVS Sync | 32 | - (bal) OpenBSD CVS Sync |
@@ -8086,4 +8089,4 @@ | |||
8086 | - Wrote replacements for strlcpy and mkdtemp | 8089 | - Wrote replacements for strlcpy and mkdtemp |
8087 | - Released 1.0pre1 | 8090 | - Released 1.0pre1 |
8088 | 8091 | ||
8089 | $Id: ChangeLog,v 1.2000 2002/03/27 17:42:57 mouring Exp $ | 8092 | $Id: ChangeLog,v 1.2001 2002/03/27 18:00:59 mouring Exp $ |
@@ -25,7 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | RCSID("$OpenBSD: monitor.c,v 1.7 2002/03/24 23:20:00 stevesk Exp $"); | 28 | RCSID("$OpenBSD: monitor.c,v 1.8 2002/03/27 17:45:42 mouring Exp $"); |
29 | 29 | ||
30 | #include <openssl/dh.h> | 30 | #include <openssl/dh.h> |
31 | 31 | ||
@@ -866,7 +866,7 @@ mm_answer_keyverify(int socket, Buffer *m) | |||
866 | data = buffer_get_string(m, &datalen); | 866 | data = buffer_get_string(m, &datalen); |
867 | 867 | ||
868 | if (hostbased_cuser == NULL || hostbased_chost == NULL || | 868 | if (hostbased_cuser == NULL || hostbased_chost == NULL || |
869 | monitor_allowed_key(blob, bloblen) == NULL) | 869 | !monitor_allowed_key(blob, bloblen)) |
870 | fatal("%s: bad key, not previously allowed", __FUNCTION__); | 870 | fatal("%s: bad key, not previously allowed", __FUNCTION__); |
871 | 871 | ||
872 | key = key_from_blob(blob, bloblen); | 872 | key = key_from_blob(blob, bloblen); |