diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-03-22 01:47:52 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-03-22 01:47:52 +0000 |
commit | 88aa1b45273168af3722b41c45882c6f02445255 (patch) | |
tree | b90933978727a896841c0ec026d1fb251b4f1678 | |
parent | a674e8df809e0b746cd6ae0490709aad3850bbb8 (diff) |
- 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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | bufaux.c | 4 | ||||
-rw-r--r-- | bufaux.h | 5 |
3 files changed, 11 insertions, 3 deletions
@@ -53,6 +53,9 @@ - markus@cvs.openbsd.org 2002/03/18 17:23:31 [key.c key.h] 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 - (tim) [configure.ac] Assume path given with --with-pid-dir=PATH is wanted, @@ -7899,4 +7902,4 @@ - Wrote replacements for strlcpy and mkdtemp - 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 $ @@ -37,7 +37,7 @@ */ #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 "bufaux.h" @@ -221,6 +221,8 @@ buffer_put_string(Buffer *buffer, const void *buf, u_int len) void buffer_put_cstring(Buffer *buffer, const char *s) { + if (s == NULL) + fatal("buffer_put_cstring: s == NULL"); buffer_put_string(buffer, s, strlen(s)); } @@ -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> @@ -38,4 +38,7 @@ void *buffer_get_string(Buffer *, u_int *); void buffer_put_string(Buffer *, const void *, u_int); 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 */ |