diff options
author | Damien Miller <djm@mindrot.org> | 2002-04-23 20:42:36 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-04-23 20:42:36 +1000 |
commit | 3b23566a5b266f4915697616b5a4e2ecc23b930a (patch) | |
tree | f82d424caf4a3a75f485e51c4f242127f86970f2 | |
parent | e4ccf100e05d24c3cfb20a18685d1c507670c7c3 (diff) |
- markus@cvs.openbsd.org 2002/04/20 09:14:58
[bufaux.c bufaux.h]
add buffer_{get,put}_short
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | bufaux.c | 24 | ||||
-rw-r--r-- | bufaux.h | 5 |
3 files changed, 32 insertions, 6 deletions
@@ -2,6 +2,13 @@ | |||
2 | - (djm) Bug #222: Fix tests for getaddrinfo on OSF/1. Spotted by | 2 | - (djm) Bug #222: Fix tests for getaddrinfo on OSF/1. Spotted by |
3 | Robert Urban <urban@spielwiese.de> | 3 | Robert Urban <urban@spielwiese.de> |
4 | - (djm) Make privsep work with PAM (still experimental) | 4 | - (djm) Make privsep work with PAM (still experimental) |
5 | - (djm) OpenBSD CVS Sync | ||
6 | - deraadt@cvs.openbsd.org 2002/04/20 09:02:03 | ||
7 | [servconf.c] | ||
8 | No, afs requires explicit enabling | ||
9 | - markus@cvs.openbsd.org 2002/04/20 09:14:58 | ||
10 | [bufaux.c bufaux.h] | ||
11 | add buffer_{get,put}_short | ||
5 | 12 | ||
6 | 20020421 | 13 | 20020421 |
7 | - (tim) [entropy.c.] Portability fix for SCO Unix 3.2v4.x (SCO OSR 3.0). | 14 | - (tim) [entropy.c.] Portability fix for SCO Unix 3.2v4.x (SCO OSR 3.0). |
@@ -8268,4 +8275,4 @@ | |||
8268 | - Wrote replacements for strlcpy and mkdtemp | 8275 | - Wrote replacements for strlcpy and mkdtemp |
8269 | - Released 1.0pre1 | 8276 | - Released 1.0pre1 |
8270 | 8277 | ||
8271 | $Id: ChangeLog,v 1.2063 2002/04/23 10:28:48 djm Exp $ | 8278 | $Id: ChangeLog,v 1.2064 2002/04/23 10:42:36 djm Exp $ |
@@ -37,7 +37,7 @@ | |||
37 | */ | 37 | */ |
38 | 38 | ||
39 | #include "includes.h" | 39 | #include "includes.h" |
40 | RCSID("$OpenBSD: bufaux.c,v 1.24 2002/03/26 15:23:40 markus Exp $"); | 40 | RCSID("$OpenBSD: bufaux.c,v 1.25 2002/04/20 09:14:58 markus Exp $"); |
41 | 41 | ||
42 | #include <openssl/bn.h> | 42 | #include <openssl/bn.h> |
43 | #include "bufaux.h" | 43 | #include "bufaux.h" |
@@ -137,10 +137,18 @@ buffer_get_bignum2(Buffer *buffer, BIGNUM *value) | |||
137 | BN_bin2bn(bin, len, value); | 137 | BN_bin2bn(bin, len, value); |
138 | xfree(bin); | 138 | xfree(bin); |
139 | } | 139 | } |
140 | |||
141 | /* | 140 | /* |
142 | * Returns an integer from the buffer (4 bytes, msb first). | 141 | * Returns integers from the buffer (msb first). |
143 | */ | 142 | */ |
143 | |||
144 | u_short | ||
145 | buffer_get_short(Buffer *buffer) | ||
146 | { | ||
147 | u_char buf[2]; | ||
148 | buffer_get(buffer, (char *) buf, 2); | ||
149 | return GET_16BIT(buf); | ||
150 | } | ||
151 | |||
144 | u_int | 152 | u_int |
145 | buffer_get_int(Buffer *buffer) | 153 | buffer_get_int(Buffer *buffer) |
146 | { | 154 | { |
@@ -160,9 +168,17 @@ buffer_get_int64(Buffer *buffer) | |||
160 | #endif | 168 | #endif |
161 | 169 | ||
162 | /* | 170 | /* |
163 | * Stores an integer in the buffer in 4 bytes, msb first. | 171 | * Stores integers in the buffer, msb first. |
164 | */ | 172 | */ |
165 | void | 173 | void |
174 | buffer_put_short(Buffer *buffer, u_short value) | ||
175 | { | ||
176 | char buf[2]; | ||
177 | PUT_16BIT(buf, value); | ||
178 | buffer_append(buffer, buf, 2); | ||
179 | } | ||
180 | |||
181 | void | ||
166 | buffer_put_int(Buffer *buffer, u_int value) | 182 | buffer_put_int(Buffer *buffer, u_int value) |
167 | { | 183 | { |
168 | char buf[4]; | 184 | char buf[4]; |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bufaux.h,v 1.17 2002/03/18 17:25:29 provos Exp $ */ | 1 | /* $OpenBSD: bufaux.h,v 1.18 2002/04/20 09:14:58 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -23,6 +23,9 @@ void buffer_put_bignum2(Buffer *, BIGNUM *); | |||
23 | void buffer_get_bignum(Buffer *, BIGNUM *); | 23 | void buffer_get_bignum(Buffer *, BIGNUM *); |
24 | void buffer_get_bignum2(Buffer *, BIGNUM *); | 24 | void buffer_get_bignum2(Buffer *, BIGNUM *); |
25 | 25 | ||
26 | u_short buffer_get_short(Buffer *); | ||
27 | void buffer_put_short(Buffer *, u_short); | ||
28 | |||
26 | u_int buffer_get_int(Buffer *); | 29 | u_int buffer_get_int(Buffer *); |
27 | void buffer_put_int(Buffer *, u_int); | 30 | void buffer_put_int(Buffer *, u_int); |
28 | 31 | ||