- dtucker@cvs.openbsd.org 2006/04/18 10:44:28

[openssh.git] / bufaux.c

diff --git a/bufaux.c b/bufaux.c
index 4f9a89881d9fee6c3757605a90159442ee2a5ff3..4c9cb662c3610c09e3ce804b211d97f51d1504a8 100644 (file)
--- a/bufaux.c
+++ b/bufaux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bufaux.c,v 1.41 2006/03/30 09:58:15 djm Exp $ */
+/* $OpenBSD: bufaux.c,v 1.42 2006/04/18 10:44:28 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -45,169 +45,6 @@
 #include "log.h"
 #include "misc.h"
 
-/*
- * Stores an BIGNUM in the buffer with a 2-byte msb first bit count, followed
- * by (bits+7)/8 bytes of binary data, msb first.
- */
-int
-buffer_put_bignum_ret(Buffer *buffer, const BIGNUM *value)
-{
-       int bits = BN_num_bits(value);
-       int bin_size = (bits + 7) / 8;
-       u_char *buf = xmalloc(bin_size);
-       int oi;
-       char msg[2];
-
-       /* Get the value of in binary */
-       oi = BN_bn2bin(value, buf);
-       if (oi != bin_size) {
-               error("buffer_put_bignum_ret: BN_bn2bin() failed: oi %d != bin_size %d",
-                   oi, bin_size);
-               xfree(buf);
-               return (-1);
-       }
-
-       /* Store the number of bits in the buffer in two bytes, msb first. */
-       put_u16(msg, bits);
-       buffer_append(buffer, msg, 2);
-       /* Store the binary data. */
-       buffer_append(buffer, buf, oi);
-
-       memset(buf, 0, bin_size);
-       xfree(buf);
-
-       return (0);
-}
-
-void
-buffer_put_bignum(Buffer *buffer, const BIGNUM *value)
-{
-       if (buffer_put_bignum_ret(buffer, value) == -1)
-               fatal("buffer_put_bignum: buffer error");
-}
-
-/*
- * Retrieves an BIGNUM from the buffer.
- */
-int
-buffer_get_bignum_ret(Buffer *buffer, BIGNUM *value)
-{
-       u_int bits, bytes;
-       u_char buf[2], *bin;
-
-       /* Get the number for bits. */
-       if (buffer_get_ret(buffer, (char *) buf, 2) == -1) {
-               error("buffer_get_bignum_ret: invalid length");
-               return (-1);
-       }
-       bits = get_u16(buf);
-       /* Compute the number of binary bytes that follow. */
-       bytes = (bits + 7) / 8;
-       if (bytes > 8 * 1024) {
-               error("buffer_get_bignum_ret: cannot handle BN of size %d", bytes);
-               return (-1);
-       }
-       if (buffer_len(buffer) < bytes) {
-               error("buffer_get_bignum_ret: input buffer too small");
-               return (-1);
-       }
-       bin = buffer_ptr(buffer);
-       BN_bin2bn(bin, bytes, value);
-       if (buffer_consume_ret(buffer, bytes) == -1) {
-               error("buffer_get_bignum_ret: buffer_consume failed");
-               return (-1);
-       }
-       return (0);
-}
-
-void
-buffer_get_bignum(Buffer *buffer, BIGNUM *value)
-{
-       if (buffer_get_bignum_ret(buffer, value) == -1)
-               fatal("buffer_get_bignum: buffer error");
-}
-
-/*
- * Stores an BIGNUM in the buffer in SSH2 format.
- */
-int
-buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
-{
-       u_int bytes;
-       u_char *buf;
-       int oi;
-       u_int hasnohigh = 0;
-
-       if (BN_is_zero(value)) {
-               buffer_put_int(buffer, 0);
-               return 0;
-       }
-       if (value->neg) {
-               error("buffer_put_bignum2_ret: negative numbers not supported");
-               return (-1);
-       }
-       bytes = BN_num_bytes(value) + 1; /* extra padding byte */
-       if (bytes < 2) {
-               error("buffer_put_bignum2_ret: BN too small");
-               return (-1);
-       }
-       buf = xmalloc(bytes);
-       buf[0] = 0x00;
-       /* Get the value of in binary */
-       oi = BN_bn2bin(value, buf+1);
-       if (oi < 0 || (u_int)oi != bytes - 1) {
-               error("buffer_put_bignum2_ret: BN_bn2bin() failed: "
-                   "oi %d != bin_size %d", oi, bytes);
-               xfree(buf);
-               return (-1);
-       }
-       hasnohigh = (buf[1] & 0x80) ? 0 : 1;
-       buffer_put_string(buffer, buf+hasnohigh, bytes-hasnohigh);
-       memset(buf, 0, bytes);
-       xfree(buf);
-       return (0);
-}
-
-void
-buffer_put_bignum2(Buffer *buffer, const BIGNUM *value)
-{
-       if (buffer_put_bignum2_ret(buffer, value) == -1)
-               fatal("buffer_put_bignum2: buffer error");
-}
-
-int
-buffer_get_bignum2_ret(Buffer *buffer, BIGNUM *value)
-{
-       u_int len;
-       u_char *bin;
-
-       if ((bin = buffer_get_string_ret(buffer, &len)) == NULL) {
-               error("buffer_get_bignum2_ret: invalid bignum");
-               return (-1);
-       }
-
-       if (len > 0 && (bin[0] & 0x80)) {
-               error("buffer_get_bignum2_ret: negative numbers not supported");
-               xfree(bin);
-               return (-1);
-       }
-       if (len > 8 * 1024) {
-               error("buffer_get_bignum2_ret: cannot handle BN of size %d", len);
-               xfree(bin);
-               return (-1);
-       }
-       BN_bin2bn(bin, len, value);
-       xfree(bin);
-       return (0);
-}
-
-void
-buffer_get_bignum2(Buffer *buffer, BIGNUM *value)
-{
-       if (buffer_get_bignum2_ret(buffer, value) == -1)
-               fatal("buffer_get_bignum2: buffer error");
-}
-
 /*
  * Returns integers from the buffer (msb first).
  */