upstream: remove obsolete (SSH v.1) sshbuf_get/put_bignum1

functions

from markus@ ok djm@

OpenBSD-Commit-ID: 0380b1b2d9de063de3c5a097481a622e6a04943e

diff --git a/sshbuf-getput-crypto.c b/sshbuf-getput-crypto.c
index d0d791b50a34b69fbd28be134ecf531131b17c42..a49b72ef7a3dc05f6236d2851641febb852d3b5d 100644 (file)
--- a/sshbuf-getput-crypto.c
+++ b/sshbuf-getput-crypto.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: sshbuf-getput-crypto.c,v 1.5 2016/01/12 23:42:54 djm Exp $    */
+/*     $OpenBSD: sshbuf-getput-crypto.c,v 1.6 2019/01/21 09:52:25 djm Exp $    */
 /*
  * Copyright (c) 2011 Damien Miller
  *
@@ -45,32 +45,6 @@ sshbuf_get_bignum2(struct sshbuf *buf, BIGNUM *v)
        return 0;
 }
 
-int
-sshbuf_get_bignum1(struct sshbuf *buf, BIGNUM *v)
-{
-       const u_char *d = sshbuf_ptr(buf);
-       u_int16_t len_bits;
-       size_t len_bytes;
-
-       /* Length in bits */
-       if (sshbuf_len(buf) < 2)
-               return SSH_ERR_MESSAGE_INCOMPLETE;
-       len_bits = PEEK_U16(d);
-       len_bytes = (len_bits + 7) >> 3;
-       if (len_bytes > SSHBUF_MAX_BIGNUM)
-               return SSH_ERR_BIGNUM_TOO_LARGE;
-       if (sshbuf_len(buf) < 2 + len_bytes)
-               return SSH_ERR_MESSAGE_INCOMPLETE;
-       if (v != NULL && BN_bin2bn(d + 2, len_bytes, v) == NULL)
-               return SSH_ERR_ALLOC_FAIL;
-       if (sshbuf_consume(buf, 2 + len_bytes) != 0) {
-               SSHBUF_DBG(("SSH_ERR_INTERNAL_ERROR"));
-               SSHBUF_ABORT();
-               return SSH_ERR_INTERNAL_ERROR;
-       }
-       return 0;
-}
-
 #ifdef OPENSSL_HAS_ECC
 static int
 get_ec(const u_char *d, size_t len, EC_POINT *v, const EC_GROUP *g)
@@ -165,28 +139,6 @@ sshbuf_put_bignum2(struct sshbuf *buf, const BIGNUM *v)
        return 0;
 }
 
-int
-sshbuf_put_bignum1(struct sshbuf *buf, const BIGNUM *v)
-{
-       int r, len_bits = BN_num_bits(v);
-       size_t len_bytes = (len_bits + 7) / 8;
-       u_char d[SSHBUF_MAX_BIGNUM], *dp;
-
-       if (len_bits < 0 || len_bytes > SSHBUF_MAX_BIGNUM)
-               return SSH_ERR_INVALID_ARGUMENT;
-       if (BN_bn2bin(v, d) != (int)len_bytes)
-               return SSH_ERR_INTERNAL_ERROR; /* Shouldn't happen */
-       if ((r = sshbuf_reserve(buf, len_bytes + 2, &dp)) < 0) {
-               explicit_bzero(d, sizeof(d));
-               return r;
-       }
-       POKE_U16(dp, len_bits);
-       if (len_bytes != 0)
-               memcpy(dp + 2, d, len_bytes);
-       explicit_bzero(d, sizeof(d));
-       return 0;
-}
-
 #ifdef OPENSSL_HAS_ECC
 int
 sshbuf_put_ec(struct sshbuf *buf, const EC_POINT *v, const EC_GROUP *g)

diff --git a/sshbuf.h b/sshbuf.h
index a43598cac4de1f34e9d9665abcda0dcc7b423dcf..fa54b495062cae046f4eac7f96a4583a9c6cd92e 100644 (file)
--- a/sshbuf.h
+++ b/sshbuf.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: sshbuf.h,v 1.11 2018/07/09 21:56:06 markus Exp $      */
+/*     $OpenBSD: sshbuf.h,v 1.12 2019/01/21 09:52:25 djm Exp $ */
 /*
  * Copyright (c) 2011 Damien Miller
  *
@@ -213,9 +213,7 @@ int sshbuf_get_bignum2_bytes_direct(struct sshbuf *buf,
            const u_char **valp, size_t *lenp);
 #ifdef WITH_OPENSSL
 int    sshbuf_get_bignum2(struct sshbuf *buf, BIGNUM *v);
-int    sshbuf_get_bignum1(struct sshbuf *buf, BIGNUM *v);
 int    sshbuf_put_bignum2(struct sshbuf *buf, const BIGNUM *v);
-int    sshbuf_put_bignum1(struct sshbuf *buf, const BIGNUM *v);
 # ifdef OPENSSL_HAS_ECC
 int    sshbuf_get_ec(struct sshbuf *buf, EC_POINT *v, const EC_GROUP *g);
 int    sshbuf_get_eckey(struct sshbuf *buf, EC_KEY *v);