commit 7979dbede2757f5c8a00b79afe75618339510457
author David Benjamin <davidben@google.com> Tue Jan 23 19:42:56 2018 -0500
committer Adam Langley <agl@google.com> Fri Feb 02 18:52:49 2018 +0000
tree e9849e60b0d47d4883fc2c142fff8eb88a08ee7f
parent 76ce04bec8162a866ce42cc27ed792c48484908a

Use bn_resize_words in BN_from_montgomery_word.

Saves a bit of work, and we get a width sanity-check.

Bug: 232
Change-Id: I1c6bc376c9d8aaf60a078fdc39f35b6f44a688c6
Reviewed-on: https://boringssl-review.googlesource.com/25251
Reviewed-by: Adam Langley <agl@google.com>

crypto/fipsmodule/bn/montgomery.c

diff --git a/crypto/fipsmodule/bn/montgomery.c b/crypto/fipsmodule/bn/montgomery.c
index 624ab5f..eaf2ba0 100644
--- a/crypto/fipsmodule/bn/montgomery.c
+++ b/crypto/fipsmodule/bn/montgomery.c
@@ -316,15 +316,10 @@
   }
 
   int max = (2 * n->top);  // carry is stored separately
-  if (!bn_wexpand(r, max) ||
+  if (!bn_resize_words(r, max) ||
       !bn_wexpand(ret, n->top)) {
     return 0;
   }
-  // Clear the top words of |r|.
-  if (max > r->top) {
-    OPENSSL_memset(r->d + r->top, 0, (max - r->top) * sizeof(BN_ULONG));
-  }
-  r->top = max;
   ret->top = n->top;
 
   if (!bn_from_montgomery_in_place(ret->d, ret->top, r->d, r->top, mont)) {