diff options
-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 @@ | |||
53 | - markus@cvs.openbsd.org 2002/03/18 17:23:31 | 53 | - markus@cvs.openbsd.org 2002/03/18 17:23:31 |
54 | [key.c key.h] | 54 | [key.c key.h] |
55 | add key_demote() for ssh-privsep | 55 | add key_demote() for ssh-privsep |
56 | - provos@cvs.openbsd.org 2002/03/18 17:25:29 | ||
57 | [bufaux.c bufaux.h] | ||
58 | buffer_skip_string and extra sanity checking; needed by ssh-privsep | ||
56 | 59 | ||
57 | 20020317 | 60 | 20020317 |
58 | - (tim) [configure.ac] Assume path given with --with-pid-dir=PATH is wanted, | 61 | - (tim) [configure.ac] Assume path given with --with-pid-dir=PATH is wanted, |
@@ -7899,4 +7902,4 @@ | |||
7899 | - Wrote replacements for strlcpy and mkdtemp | 7902 | - Wrote replacements for strlcpy and mkdtemp |
7900 | - Released 1.0pre1 | 7903 | - Released 1.0pre1 |
7901 | 7904 | ||
7902 | $Id: ChangeLog,v 1.1940 2002/03/22 01:45:53 mouring Exp $ | 7905 | $Id: ChangeLog,v 1.1941 2002/03/22 01:47:52 mouring Exp $ |
@@ -37,7 +37,7 @@ | |||
37 | */ | 37 | */ |
38 | 38 | ||
39 | #include "includes.h" | 39 | #include "includes.h" |
40 | RCSID("$OpenBSD: bufaux.c,v 1.22 2002/01/18 18:14:17 stevesk Exp $"); | 40 | RCSID("$OpenBSD: bufaux.c,v 1.23 2002/03/18 17:25:29 provos Exp $"); |
41 | 41 | ||
42 | #include <openssl/bn.h> | 42 | #include <openssl/bn.h> |
43 | #include "bufaux.h" | 43 | #include "bufaux.h" |
@@ -221,6 +221,8 @@ buffer_put_string(Buffer *buffer, const void *buf, u_int len) | |||
221 | void | 221 | void |
222 | buffer_put_cstring(Buffer *buffer, const char *s) | 222 | buffer_put_cstring(Buffer *buffer, const char *s) |
223 | { | 223 | { |
224 | if (s == NULL) | ||
225 | fatal("buffer_put_cstring: s == NULL"); | ||
224 | buffer_put_string(buffer, s, strlen(s)); | 226 | buffer_put_string(buffer, s, strlen(s)); |
225 | } | 227 | } |
226 | 228 | ||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bufaux.h,v 1.16 2002/03/04 17:27:39 stevesk Exp $ */ | 1 | /* $OpenBSD: bufaux.h,v 1.17 2002/03/18 17:25:29 provos Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -38,4 +38,7 @@ void *buffer_get_string(Buffer *, u_int *); | |||
38 | void buffer_put_string(Buffer *, const void *, u_int); | 38 | void buffer_put_string(Buffer *, const void *, u_int); |
39 | void buffer_put_cstring(Buffer *, const char *); | 39 | void buffer_put_cstring(Buffer *, const char *); |
40 | 40 | ||
41 | #define buffer_skip_string(b) \ | ||
42 | do { u_int l = buffer_get_int(b); buffer_consume(b, l); } while(0) | ||
43 | |||
41 | #endif /* BUFAUX_H */ | 44 | #endif /* BUFAUX_H */ |