Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1 | /* |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 2 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
| 4 | * All rights reserved |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 5 | * Auxiliary functions for storing and retrieving various data types to/from |
| 6 | * Buffers. |
| 7 | * |
Damien Miller | e4340be | 2000-09-16 13:29:08 +1100 | [diff] [blame] | 8 | * As far as I am concerned, the code I have written for this software |
| 9 | * can be used freely for any purpose. Any derived versions of this |
| 10 | * software must be clearly marked as such, and if the derived work is |
| 11 | * incompatible with the protocol description in the RFC file, it must be |
| 12 | * called by a name other than "ssh" or "Secure Shell". |
Damien Miller | b38eff8 | 2000-04-01 11:09:21 +1000 | [diff] [blame] | 13 | * |
Damien Miller | e4340be | 2000-09-16 13:29:08 +1100 | [diff] [blame] | 14 | * |
| 15 | * SSH2 packet format added by Markus Friedl |
| 16 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
| 17 | * |
| 18 | * Redistribution and use in source and binary forms, with or without |
| 19 | * modification, are permitted provided that the following conditions |
| 20 | * are met: |
| 21 | * 1. Redistributions of source code must retain the above copyright |
| 22 | * notice, this list of conditions and the following disclaimer. |
| 23 | * 2. Redistributions in binary form must reproduce the above copyright |
| 24 | * notice, this list of conditions and the following disclaimer in the |
| 25 | * documentation and/or other materials provided with the distribution. |
| 26 | * |
| 27 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| 28 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| 29 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| 30 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| 31 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| 32 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 33 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 34 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 35 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 36 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 37 | */ |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 38 | |
| 39 | #include "includes.h" |
Ben Lindstrom | ee84491 | 2002-11-09 15:43:23 +0000 | [diff] [blame] | 40 | RCSID("$OpenBSD: bufaux.c,v 1.28 2002/10/23 10:40:16 markus Exp $"); |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 41 | |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 42 | #include <openssl/bn.h> |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 43 | #include "bufaux.h" |
| 44 | #include "xmalloc.h" |
| 45 | #include "getput.h" |
Ben Lindstrom | 226cfa0 | 2001-01-22 05:34:40 +0000 | [diff] [blame] | 46 | #include "log.h" |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 47 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 48 | /* |
| 49 | * Stores an BIGNUM in the buffer with a 2-byte msb first bit count, followed |
| 50 | * by (bits+7)/8 bytes of binary data, msb first. |
| 51 | */ |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 52 | void |
| 53 | buffer_put_bignum(Buffer *buffer, BIGNUM *value) |
| 54 | { |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 55 | int bits = BN_num_bits(value); |
| 56 | int bin_size = (bits + 7) / 8; |
Ben Lindstrom | 46c1622 | 2000-12-22 01:43:59 +0000 | [diff] [blame] | 57 | u_char *buf = xmalloc(bin_size); |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 58 | int oi; |
| 59 | char msg[2]; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 60 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 61 | /* Get the value of in binary */ |
| 62 | oi = BN_bn2bin(value, buf); |
| 63 | if (oi != bin_size) |
| 64 | fatal("buffer_put_bignum: BN_bn2bin() failed: oi %d != bin_size %d", |
Damien Miller | 9f0f5c6 | 2001-12-21 14:45:46 +1100 | [diff] [blame] | 65 | oi, bin_size); |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 66 | |
| 67 | /* Store the number of bits in the buffer in two bytes, msb first. */ |
| 68 | PUT_16BIT(msg, bits); |
| 69 | buffer_append(buffer, msg, 2); |
| 70 | /* Store the binary data. */ |
Damien Miller | 7684ee1 | 2000-03-17 23:40:15 +1100 | [diff] [blame] | 71 | buffer_append(buffer, (char *)buf, oi); |
Damien Miller | 5428f64 | 1999-11-25 11:54:57 +1100 | [diff] [blame] | 72 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 73 | memset(buf, 0, bin_size); |
| 74 | xfree(buf); |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 75 | } |
| 76 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 77 | /* |
| 78 | * Retrieves an BIGNUM from the buffer. |
| 79 | */ |
Damien Miller | 76e1e36 | 2002-01-22 23:15:57 +1100 | [diff] [blame] | 80 | void |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 81 | buffer_get_bignum(Buffer *buffer, BIGNUM *value) |
| 82 | { |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 83 | int bits, bytes; |
Ben Lindstrom | 46c1622 | 2000-12-22 01:43:59 +0000 | [diff] [blame] | 84 | u_char buf[2], *bin; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 85 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 86 | /* Get the number for bits. */ |
| 87 | buffer_get(buffer, (char *) buf, 2); |
| 88 | bits = GET_16BIT(buf); |
| 89 | /* Compute the number of binary bytes that follow. */ |
| 90 | bytes = (bits + 7) / 8; |
Damien Miller | aa15137 | 2002-06-26 19:14:08 +1000 | [diff] [blame] | 91 | if (bytes > 8 * 1024) |
| 92 | fatal("buffer_get_bignum: cannot handle BN of size %d", bytes); |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 93 | if (buffer_len(buffer) < bytes) |
| 94 | fatal("buffer_get_bignum: input buffer too small"); |
Damien Miller | 4a8ed54 | 2002-01-22 23:33:31 +1100 | [diff] [blame] | 95 | bin = buffer_ptr(buffer); |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 96 | BN_bin2bn(bin, bytes, value); |
| 97 | buffer_consume(buffer, bytes); |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 98 | } |
| 99 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 100 | /* |
Damien Miller | b38eff8 | 2000-04-01 11:09:21 +1000 | [diff] [blame] | 101 | * Stores an BIGNUM in the buffer in SSH2 format. |
| 102 | */ |
| 103 | void |
| 104 | buffer_put_bignum2(Buffer *buffer, BIGNUM *value) |
| 105 | { |
| 106 | int bytes = BN_num_bytes(value) + 1; |
Ben Lindstrom | 46c1622 | 2000-12-22 01:43:59 +0000 | [diff] [blame] | 107 | u_char *buf = xmalloc(bytes); |
Damien Miller | b38eff8 | 2000-04-01 11:09:21 +1000 | [diff] [blame] | 108 | int oi; |
| 109 | int hasnohigh = 0; |
Ben Lindstrom | e135363 | 2002-06-23 21:29:23 +0000 | [diff] [blame] | 110 | |
Damien Miller | b38eff8 | 2000-04-01 11:09:21 +1000 | [diff] [blame] | 111 | buf[0] = '\0'; |
| 112 | /* Get the value of in binary */ |
| 113 | oi = BN_bn2bin(value, buf+1); |
| 114 | if (oi != bytes-1) |
| 115 | fatal("buffer_put_bignum: BN_bn2bin() failed: oi %d != bin_size %d", |
Damien Miller | 9f0f5c6 | 2001-12-21 14:45:46 +1100 | [diff] [blame] | 116 | oi, bytes); |
Damien Miller | b38eff8 | 2000-04-01 11:09:21 +1000 | [diff] [blame] | 117 | hasnohigh = (buf[1] & 0x80) ? 0 : 1; |
| 118 | if (value->neg) { |
| 119 | /**XXX should be two's-complement */ |
| 120 | int i, carry; |
Ben Lindstrom | 46c1622 | 2000-12-22 01:43:59 +0000 | [diff] [blame] | 121 | u_char *uc = buf; |
Damien Miller | b38eff8 | 2000-04-01 11:09:21 +1000 | [diff] [blame] | 122 | log("negativ!"); |
Damien Miller | 9f0f5c6 | 2001-12-21 14:45:46 +1100 | [diff] [blame] | 123 | for (i = bytes-1, carry = 1; i>=0; i--) { |
Damien Miller | b38eff8 | 2000-04-01 11:09:21 +1000 | [diff] [blame] | 124 | uc[i] ^= 0xff; |
Ben Lindstrom | 1c37c6a | 2001-12-06 18:00:18 +0000 | [diff] [blame] | 125 | if (carry) |
Damien Miller | b38eff8 | 2000-04-01 11:09:21 +1000 | [diff] [blame] | 126 | carry = !++uc[i]; |
| 127 | } |
| 128 | } |
| 129 | buffer_put_string(buffer, buf+hasnohigh, bytes-hasnohigh); |
| 130 | memset(buf, 0, bytes); |
| 131 | xfree(buf); |
| 132 | } |
| 133 | |
Damien Miller | aa15137 | 2002-06-26 19:14:08 +1000 | [diff] [blame] | 134 | /* XXX does not handle negative BNs */ |
Damien Miller | 76e1e36 | 2002-01-22 23:15:57 +1100 | [diff] [blame] | 135 | void |
Damien Miller | b38eff8 | 2000-04-01 11:09:21 +1000 | [diff] [blame] | 136 | buffer_get_bignum2(Buffer *buffer, BIGNUM *value) |
| 137 | { |
Damien Miller | aa15137 | 2002-06-26 19:14:08 +1000 | [diff] [blame] | 138 | u_int len; |
| 139 | u_char *bin = buffer_get_string(buffer, &len); |
Ben Lindstrom | e135363 | 2002-06-23 21:29:23 +0000 | [diff] [blame] | 140 | |
Damien Miller | aa15137 | 2002-06-26 19:14:08 +1000 | [diff] [blame] | 141 | if (len > 8 * 1024) |
| 142 | fatal("buffer_get_bignum2: cannot handle BN of size %d", len); |
Damien Miller | b38eff8 | 2000-04-01 11:09:21 +1000 | [diff] [blame] | 143 | BN_bin2bn(bin, len, value); |
| 144 | xfree(bin); |
Damien Miller | b38eff8 | 2000-04-01 11:09:21 +1000 | [diff] [blame] | 145 | } |
Damien Miller | b38eff8 | 2000-04-01 11:09:21 +1000 | [diff] [blame] | 146 | /* |
Damien Miller | 3b23566 | 2002-04-23 20:42:36 +1000 | [diff] [blame] | 147 | * Returns integers from the buffer (msb first). |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 148 | */ |
Damien Miller | 3b23566 | 2002-04-23 20:42:36 +1000 | [diff] [blame] | 149 | |
| 150 | u_short |
| 151 | buffer_get_short(Buffer *buffer) |
| 152 | { |
| 153 | u_char buf[2]; |
Ben Lindstrom | e135363 | 2002-06-23 21:29:23 +0000 | [diff] [blame] | 154 | |
Damien Miller | 3b23566 | 2002-04-23 20:42:36 +1000 | [diff] [blame] | 155 | buffer_get(buffer, (char *) buf, 2); |
| 156 | return GET_16BIT(buf); |
| 157 | } |
| 158 | |
Ben Lindstrom | 46c1622 | 2000-12-22 01:43:59 +0000 | [diff] [blame] | 159 | u_int |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 160 | buffer_get_int(Buffer *buffer) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 161 | { |
Ben Lindstrom | 46c1622 | 2000-12-22 01:43:59 +0000 | [diff] [blame] | 162 | u_char buf[4]; |
Ben Lindstrom | e135363 | 2002-06-23 21:29:23 +0000 | [diff] [blame] | 163 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 164 | buffer_get(buffer, (char *) buf, 4); |
| 165 | return GET_32BIT(buf); |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 166 | } |
| 167 | |
Ben Lindstrom | 16a86be | 2001-01-23 16:26:52 +0000 | [diff] [blame] | 168 | #ifdef HAVE_U_INT64_T |
Ben Lindstrom | 2f959b4 | 2001-01-11 06:20:23 +0000 | [diff] [blame] | 169 | u_int64_t |
| 170 | buffer_get_int64(Buffer *buffer) |
| 171 | { |
| 172 | u_char buf[8]; |
Ben Lindstrom | e135363 | 2002-06-23 21:29:23 +0000 | [diff] [blame] | 173 | |
Ben Lindstrom | 2f959b4 | 2001-01-11 06:20:23 +0000 | [diff] [blame] | 174 | buffer_get(buffer, (char *) buf, 8); |
| 175 | return GET_64BIT(buf); |
| 176 | } |
Ben Lindstrom | 16a86be | 2001-01-23 16:26:52 +0000 | [diff] [blame] | 177 | #endif |
Ben Lindstrom | 2f959b4 | 2001-01-11 06:20:23 +0000 | [diff] [blame] | 178 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 179 | /* |
Damien Miller | 3b23566 | 2002-04-23 20:42:36 +1000 | [diff] [blame] | 180 | * Stores integers in the buffer, msb first. |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 181 | */ |
Damien Miller | 5f05637 | 2000-04-16 12:31:48 +1000 | [diff] [blame] | 182 | void |
Damien Miller | 3b23566 | 2002-04-23 20:42:36 +1000 | [diff] [blame] | 183 | buffer_put_short(Buffer *buffer, u_short value) |
| 184 | { |
| 185 | char buf[2]; |
Ben Lindstrom | e135363 | 2002-06-23 21:29:23 +0000 | [diff] [blame] | 186 | |
Damien Miller | 3b23566 | 2002-04-23 20:42:36 +1000 | [diff] [blame] | 187 | PUT_16BIT(buf, value); |
| 188 | buffer_append(buffer, buf, 2); |
| 189 | } |
| 190 | |
| 191 | void |
Ben Lindstrom | 46c1622 | 2000-12-22 01:43:59 +0000 | [diff] [blame] | 192 | buffer_put_int(Buffer *buffer, u_int value) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 193 | { |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 194 | char buf[4]; |
Ben Lindstrom | e135363 | 2002-06-23 21:29:23 +0000 | [diff] [blame] | 195 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 196 | PUT_32BIT(buf, value); |
| 197 | buffer_append(buffer, buf, 4); |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 198 | } |
| 199 | |
Ben Lindstrom | 16a86be | 2001-01-23 16:26:52 +0000 | [diff] [blame] | 200 | #ifdef HAVE_U_INT64_T |
Ben Lindstrom | 2f959b4 | 2001-01-11 06:20:23 +0000 | [diff] [blame] | 201 | void |
| 202 | buffer_put_int64(Buffer *buffer, u_int64_t value) |
| 203 | { |
| 204 | char buf[8]; |
Ben Lindstrom | e135363 | 2002-06-23 21:29:23 +0000 | [diff] [blame] | 205 | |
Ben Lindstrom | 2f959b4 | 2001-01-11 06:20:23 +0000 | [diff] [blame] | 206 | PUT_64BIT(buf, value); |
| 207 | buffer_append(buffer, buf, 8); |
| 208 | } |
Ben Lindstrom | 16a86be | 2001-01-23 16:26:52 +0000 | [diff] [blame] | 209 | #endif |
Ben Lindstrom | 2f959b4 | 2001-01-11 06:20:23 +0000 | [diff] [blame] | 210 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 211 | /* |
| 212 | * Returns an arbitrary binary string from the buffer. The string cannot |
| 213 | * be longer than 256k. The returned value points to memory allocated |
| 214 | * with xmalloc; it is the responsibility of the calling function to free |
| 215 | * the data. If length_ptr is non-NULL, the length of the returned data |
| 216 | * will be stored there. A null character will be automatically appended |
| 217 | * to the returned string, and is not counted in length. |
| 218 | */ |
Damien Miller | 5a6b4fe | 2001-12-21 14:56:54 +1100 | [diff] [blame] | 219 | void * |
Ben Lindstrom | 46c1622 | 2000-12-22 01:43:59 +0000 | [diff] [blame] | 220 | buffer_get_string(Buffer *buffer, u_int *length_ptr) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 221 | { |
Damien Miller | 5a6b4fe | 2001-12-21 14:56:54 +1100 | [diff] [blame] | 222 | u_char *value; |
Ben Lindstrom | e135363 | 2002-06-23 21:29:23 +0000 | [diff] [blame] | 223 | u_int len; |
| 224 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 225 | /* Get the length. */ |
| 226 | len = buffer_get_int(buffer); |
| 227 | if (len > 256 * 1024) |
Ben Lindstrom | ee84491 | 2002-11-09 15:43:23 +0000 | [diff] [blame] | 228 | fatal("buffer_get_string: bad string length %u", len); |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 229 | /* Allocate space for the string. Add one byte for a null character. */ |
| 230 | value = xmalloc(len + 1); |
| 231 | /* Get the string. */ |
| 232 | buffer_get(buffer, value, len); |
| 233 | /* Append a null character to make processing easier. */ |
| 234 | value[len] = 0; |
| 235 | /* Optionally return the length of the string. */ |
| 236 | if (length_ptr) |
| 237 | *length_ptr = len; |
| 238 | return value; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 239 | } |
| 240 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 241 | /* |
| 242 | * Stores and arbitrary binary string in the buffer. |
| 243 | */ |
Damien Miller | 5f05637 | 2000-04-16 12:31:48 +1000 | [diff] [blame] | 244 | void |
Ben Lindstrom | 46c1622 | 2000-12-22 01:43:59 +0000 | [diff] [blame] | 245 | buffer_put_string(Buffer *buffer, const void *buf, u_int len) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 246 | { |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 247 | buffer_put_int(buffer, len); |
| 248 | buffer_append(buffer, buf, len); |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 249 | } |
Damien Miller | 5f05637 | 2000-04-16 12:31:48 +1000 | [diff] [blame] | 250 | void |
Damien Miller | b38eff8 | 2000-04-01 11:09:21 +1000 | [diff] [blame] | 251 | buffer_put_cstring(Buffer *buffer, const char *s) |
| 252 | { |
Ben Lindstrom | 88aa1b4 | 2002-03-22 01:47:52 +0000 | [diff] [blame] | 253 | if (s == NULL) |
| 254 | fatal("buffer_put_cstring: s == NULL"); |
Damien Miller | b38eff8 | 2000-04-01 11:09:21 +1000 | [diff] [blame] | 255 | buffer_put_string(buffer, s, strlen(s)); |
| 256 | } |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 257 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 258 | /* |
| 259 | * Returns a character from the buffer (0 - 255). |
| 260 | */ |
Damien Miller | 5f05637 | 2000-04-16 12:31:48 +1000 | [diff] [blame] | 261 | int |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 262 | buffer_get_char(Buffer *buffer) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 263 | { |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 264 | char ch; |
Ben Lindstrom | e135363 | 2002-06-23 21:29:23 +0000 | [diff] [blame] | 265 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 266 | buffer_get(buffer, &ch, 1); |
Ben Lindstrom | 46c1622 | 2000-12-22 01:43:59 +0000 | [diff] [blame] | 267 | return (u_char) ch; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 268 | } |
| 269 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 270 | /* |
| 271 | * Stores a character in the buffer. |
| 272 | */ |
Damien Miller | 5f05637 | 2000-04-16 12:31:48 +1000 | [diff] [blame] | 273 | void |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 274 | buffer_put_char(Buffer *buffer, int value) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 275 | { |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 276 | char ch = value; |
Ben Lindstrom | e135363 | 2002-06-23 21:29:23 +0000 | [diff] [blame] | 277 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 278 | buffer_append(buffer, &ch, 1); |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 279 | } |