diff options
author | Colin Watson <cjwatson@debian.org> | 2003-09-23 18:08:35 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2003-09-23 18:08:35 +0000 |
commit | d59fd3e421aa81b8e5e118f3f806081df2aca879 (patch) | |
tree | 356a4e607edc979c625bb33db63c656d771478bd /bufaux.c | |
parent | 7505658c58e96b8d270f1928a0e1fa7f3e0c266b (diff) | |
parent | 45431c9b4677608680cd071768cbf156b316a7e8 (diff) |
Merge 3.7.1p2 to the trunk. I have absolutely no idea yet whether this will
work.
Diffstat (limited to 'bufaux.c')
-rw-r--r-- | bufaux.c | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -37,7 +37,7 @@ | |||
37 | */ | 37 | */ |
38 | 38 | ||
39 | #include "includes.h" | 39 | #include "includes.h" |
40 | RCSID("$OpenBSD: bufaux.c,v 1.28 2002/10/23 10:40:16 markus Exp $"); | 40 | RCSID("$OpenBSD: bufaux.c,v 1.29 2003/04/08 20:21:28 itojun Exp $"); |
41 | 41 | ||
42 | #include <openssl/bn.h> | 42 | #include <openssl/bn.h> |
43 | #include "bufaux.h" | 43 | #include "bufaux.h" |
@@ -119,7 +119,7 @@ buffer_put_bignum2(Buffer *buffer, BIGNUM *value) | |||
119 | /**XXX should be two's-complement */ | 119 | /**XXX should be two's-complement */ |
120 | int i, carry; | 120 | int i, carry; |
121 | u_char *uc = buf; | 121 | u_char *uc = buf; |
122 | log("negativ!"); | 122 | logit("negativ!"); |
123 | for (i = bytes-1, carry = 1; i>=0; i--) { | 123 | for (i = bytes-1, carry = 1; i>=0; i--) { |
124 | uc[i] ^= 0xff; | 124 | uc[i] ^= 0xff; |
125 | if (carry) | 125 | if (carry) |
@@ -165,7 +165,6 @@ buffer_get_int(Buffer *buffer) | |||
165 | return GET_32BIT(buf); | 165 | return GET_32BIT(buf); |
166 | } | 166 | } |
167 | 167 | ||
168 | #ifdef HAVE_U_INT64_T | ||
169 | u_int64_t | 168 | u_int64_t |
170 | buffer_get_int64(Buffer *buffer) | 169 | buffer_get_int64(Buffer *buffer) |
171 | { | 170 | { |
@@ -174,7 +173,6 @@ buffer_get_int64(Buffer *buffer) | |||
174 | buffer_get(buffer, (char *) buf, 8); | 173 | buffer_get(buffer, (char *) buf, 8); |
175 | return GET_64BIT(buf); | 174 | return GET_64BIT(buf); |
176 | } | 175 | } |
177 | #endif | ||
178 | 176 | ||
179 | /* | 177 | /* |
180 | * Stores integers in the buffer, msb first. | 178 | * Stores integers in the buffer, msb first. |
@@ -197,7 +195,6 @@ buffer_put_int(Buffer *buffer, u_int value) | |||
197 | buffer_append(buffer, buf, 4); | 195 | buffer_append(buffer, buf, 4); |
198 | } | 196 | } |
199 | 197 | ||
200 | #ifdef HAVE_U_INT64_T | ||
201 | void | 198 | void |
202 | buffer_put_int64(Buffer *buffer, u_int64_t value) | 199 | buffer_put_int64(Buffer *buffer, u_int64_t value) |
203 | { | 200 | { |
@@ -206,7 +203,6 @@ buffer_put_int64(Buffer *buffer, u_int64_t value) | |||
206 | PUT_64BIT(buf, value); | 203 | PUT_64BIT(buf, value); |
207 | buffer_append(buffer, buf, 8); | 204 | buffer_append(buffer, buf, 8); |
208 | } | 205 | } |
209 | #endif | ||
210 | 206 | ||
211 | /* | 207 | /* |
212 | * Returns an arbitrary binary string from the buffer. The string cannot | 208 | * Returns an arbitrary binary string from the buffer. The string cannot |