[bufaux.c bufaux.h]
     buffer_skip_string and extra sanity checking; needed by ssh-privsep
This commit is contained in:
Ben Lindstrom 2002-03-22 01:47:52 +00:00
parent a674e8df80
commit 88aa1b4527
3 changed files with 11 additions and 3 deletions

View File

@ -53,6 +53,9 @@
- markus@cvs.openbsd.org 2002/03/18 17:23:31 - markus@cvs.openbsd.org 2002/03/18 17:23:31
[key.c key.h] [key.c key.h]
add key_demote() for ssh-privsep add key_demote() for ssh-privsep
- provos@cvs.openbsd.org 2002/03/18 17:25:29
[bufaux.c bufaux.h]
buffer_skip_string and extra sanity checking; needed by ssh-privsep
20020317 20020317
- (tim) [configure.ac] Assume path given with --with-pid-dir=PATH is wanted, - (tim) [configure.ac] Assume path given with --with-pid-dir=PATH is wanted,
@ -7899,4 +7902,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1940 2002/03/22 01:45:53 mouring Exp $ $Id: ChangeLog,v 1.1941 2002/03/22 01:47:52 mouring Exp $

View File

@ -37,7 +37,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: bufaux.c,v 1.22 2002/01/18 18:14:17 stevesk Exp $"); RCSID("$OpenBSD: bufaux.c,v 1.23 2002/03/18 17:25:29 provos Exp $");
#include <openssl/bn.h> #include <openssl/bn.h>
#include "bufaux.h" #include "bufaux.h"
@ -221,6 +221,8 @@ buffer_put_string(Buffer *buffer, const void *buf, u_int len)
void void
buffer_put_cstring(Buffer *buffer, const char *s) buffer_put_cstring(Buffer *buffer, const char *s)
{ {
if (s == NULL)
fatal("buffer_put_cstring: s == NULL");
buffer_put_string(buffer, s, strlen(s)); buffer_put_string(buffer, s, strlen(s));
} }

View File

@ -1,4 +1,4 @@
/* $OpenBSD: bufaux.h,v 1.16 2002/03/04 17:27:39 stevesk Exp $ */ /* $OpenBSD: bufaux.h,v 1.17 2002/03/18 17:25:29 provos Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -38,4 +38,7 @@ void *buffer_get_string(Buffer *, u_int *);
void buffer_put_string(Buffer *, const void *, u_int); void buffer_put_string(Buffer *, const void *, u_int);
void buffer_put_cstring(Buffer *, const char *); void buffer_put_cstring(Buffer *, const char *);
#define buffer_skip_string(b) \
do { u_int l = buffer_get_int(b); buffer_consume(b, l); } while(0)
#endif /* BUFAUX_H */ #endif /* BUFAUX_H */