mirrors/openssh
0
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-11-27 14:44:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2002/04/20 09:14:58

Browse Source 
[bufaux.c bufaux.h]
     add buffer_{get,put}_short
This commit is contained in:
Damien Miller 2002-04-23 20:42:36 +10:00
parent e4ccf100e0
commit 3b23566a5b
3 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -2,6 +2,13 @@
- (djm) Bug #222: Fix tests for getaddrinfo on OSF/1. Spotted by
Robert Urban <urban@spielwiese.de>
- (djm) Make privsep work with PAM (still experimental)
- (djm) OpenBSD CVS Sync
- deraadt@cvs.openbsd.org 2002/04/20 09:02:03
[servconf.c]
No, afs requires explicit enabling
- markus@cvs.openbsd.org 2002/04/20 09:14:58
[bufaux.c bufaux.h]
add buffer_{get,put}_short
20020421
- (tim) [entropy.c.] Portability fix for SCO Unix 3.2v4.x (SCO OSR 3.0).
@ -8268,4 +8275,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
$Id: ChangeLog,v 1.2063 2002/04/23 10:28:48 djm Exp $
$Id: ChangeLog,v 1.2064 2002/04/23 10:42:36 djm Exp $

24
bufaux.c
View File

@ -37,7 +37,7 @@
*/
#include "includes.h"
RCSID("$OpenBSD: bufaux.c,v 1.24 2002/03/26 15:23:40 markus Exp $");
RCSID("$OpenBSD: bufaux.c,v 1.25 2002/04/20 09:14:58 markus Exp $");
#include <openssl/bn.h>
#include "bufaux.h"
@ -137,10 +137,18 @@ buffer_get_bignum2(Buffer *buffer, BIGNUM *value)
BN_bin2bn(bin, len, value);
xfree(bin);
}
/*
* Returns an integer from the buffer (4 bytes, msb first).
* Returns integers from the buffer (msb first).
*/
u_short
buffer_get_short(Buffer *buffer)
{
u_char buf[2];
buffer_get(buffer, (char *) buf, 2);
return GET_16BIT(buf);
}
u_int
buffer_get_int(Buffer *buffer)
{
@ -160,8 +168,16 @@ buffer_get_int64(Buffer *buffer)
#endif
/*
* Stores an integer in the buffer in 4 bytes, msb first.
* Stores integers in the buffer, msb first.
*/
void
buffer_put_short(Buffer *buffer, u_short value)
{
char buf[2];
PUT_16BIT(buf, value);
buffer_append(buffer, buf, 2);
}
void
buffer_put_int(Buffer *buffer, u_int value)
{

5
bufaux.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: bufaux.h,v 1.17 2002/03/18 17:25:29 provos Exp $ */
/* $OpenBSD: bufaux.h,v 1.18 2002/04/20 09:14:58 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -23,6 +23,9 @@ void buffer_put_bignum2(Buffer *, BIGNUM *);
void buffer_get_bignum(Buffer *, BIGNUM *);
void buffer_get_bignum2(Buffer *, BIGNUM *);
u_short buffer_get_short(Buffer *);
void buffer_put_short(Buffer *, u_short);
u_int buffer_get_int(Buffer *);
void buffer_put_int(Buffer *, u_int);