From 5eaa7aa1c042e06cd4826a79af6af73ea5bf8370 Mon Sep 17 00:00:00 2001
From: Marc Hoersken <info@marc-hoersken.de>
Date: Mon, 6 Jul 2020 21:43:03 +0200
Subject: [PATCH] wincng: make more use of new helper functions (#496)

---
 src/wincng.c | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/wincng.c b/src/wincng.c
index 69bacb92..88c82ca2 100644
--- a/src/wincng.c
+++ b/src/wincng.c
@@ -423,6 +423,24 @@ _libssh2_wincng_safe_free(void *buf, int len)
     free(buf);
 }
 
+/* Copy a big endian set of bits from src to dest.
+ * if the size of src is smaller than dest then pad the "left" (MSB)
+ * end with zeroes and copy the bits into the "right" (LSB) end. */
+static void
+memcpy_with_be_padding(unsigned char *dest, unsigned long dest_len,
+                       unsigned char *src, unsigned long src_len)
+{
+    if(dest_len > src_len) {
+        memset(dest, 0, dest_len - src_len);
+    }
+    memcpy((dest + dest_len) - src_len, src, src_len);
+}
+
+static int
+round_down(int number, int multiple)
+{
+    return (number / multiple) * multiple;
+}
 
 /*******************************************************************/
 /*
@@ -2060,6 +2078,7 @@ _libssh2_wincng_bignum_mod_exp(_libssh2_bn *r,
     offset += p->length;
 
     memcpy(key + offset, m->bignum, m->length);
+    offset = 0;
 
     ret = BCryptImportKeyPair(_libssh2_wincng.hAlgRSA, NULL,
                               BCRYPT_RSAPUBLIC_BLOB, &hKey, key, keylen, 0);
@@ -2071,9 +2090,8 @@ _libssh2_wincng_bignum_mod_exp(_libssh2_bn *r,
                 length = max(a->length, length);
                 bignum = malloc(length);
                 if(bignum) {
-                    offset = length - a->length;
-                    memset(bignum, 0, offset);
-                    memcpy(bignum + offset, a->bignum, a->length);
+                    memcpy_with_be_padding(bignum, length,
+                                           a->bignum, a->length);
 
                     ret = BCryptEncrypt(hKey, bignum, length, NULL, NULL, 0,
                                         r->bignum, r->length, &offset,
@@ -2204,6 +2222,7 @@ _libssh2_wincng_bignum_free(_libssh2_bn *bn)
     }
 }
 
+
 /*******************************************************************/
 /*
  * Windows CNG backend: Diffie-Hellman support.
@@ -2237,25 +2256,6 @@ _libssh2_dh_dtor(_libssh2_dh_ctx *dhctx)
     }
 }
 
-/* Copy a big endian set of bits from src to dest.
- * if the size of src is smaller than dest then pad the "left" (MSB)
- * end with zeroes and copy the bits into the "right" (LSB) end. */
-static void
-memcpy_with_be_padding(unsigned char *dest, unsigned long dest_len,
-                       unsigned char *src, unsigned long src_len)
-{
-    if(dest_len > src_len) {
-        memset(dest, 0, dest_len - src_len);
-    }
-    memcpy(dest + dest_len - src_len, src, src_len);
-}
-
-static int
-round_down(int number, int multiple)
-{
-    return (number / multiple) * multiple;
-}
-
 /* Generates a Diffie-Hellman key pair using base `g', prime `p' and the given
  * `group_order'. Can use the given big number context `bnctx' if needed.  The
  * private key is stored as opaque in the Diffie-Hellman context `*dhctx' and