[monitor.c]
     monitor_allowed_key() returns int instead of pointer.  ok markus@
This commit is contained in:
Ben Lindstrom 2002-03-27 18:00:59 +00:00
parent 599717246c
commit b57a4bf93f
2 changed files with 7 additions and 4 deletions

View File

@ -23,7 +23,10 @@
- markus@cvs.openbsd.org 2002/03/26 23:14:51
[kex.c]
generate a new cookie for each SSH2_MSG_KEXINIT message we send out
- mouring@cvs.openbsd.org 2002/03/27 11:45:42
[monitor.c]
monitor_allowed_key() returns int instead of pointer. ok markus@
20020325
- (stevesk) import OpenBSD <sys/tree.h> as "openbsd-compat/tree.h"
- (bal) OpenBSD CVS Sync
@ -8086,4 +8089,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
$Id: ChangeLog,v 1.2000 2002/03/27 17:42:57 mouring Exp $
$Id: ChangeLog,v 1.2001 2002/03/27 18:00:59 mouring Exp $

View File

@ -25,7 +25,7 @@
*/
#include "includes.h"
RCSID("$OpenBSD: monitor.c,v 1.7 2002/03/24 23:20:00 stevesk Exp $");
RCSID("$OpenBSD: monitor.c,v 1.8 2002/03/27 17:45:42 mouring Exp $");
#include <openssl/dh.h>
@ -866,7 +866,7 @@ mm_answer_keyverify(int socket, Buffer *m)
data = buffer_get_string(m, &datalen);
if (hostbased_cuser == NULL || hostbased_chost == NULL ||
monitor_allowed_key(blob, bloblen) == NULL)
!monitor_allowed_key(blob, bloblen))
fatal("%s: bad key, not previously allowed", __FUNCTION__);
key = key_from_blob(blob, bloblen);