Merge bitcoin#551: secp256k1_fe_sqrt: Verify that the arguments don't alias.

gmaxwell · gmaxwell · commit 1c131affd3c3 · 2019-02-21T04:23:50.000Z
bf8b86c secp256k1_fe_sqrt: Verify that the arguments don't alias. (Russell O'Connor) Pull request description: Tree-SHA512: 4e9128625817be83a1259e7dbdb82c4be8ee0174af7d5e76eeac3245d23d6bf01378d9697dcb870eb61577afd7c0556cb3c6633e3b27504add14c10b18f7c607
diff --git a/src/field_impl.h b/src/field_impl.h
@@ -49,6 +49,8 @@ static int secp256k1_fe_sqrt(secp256k1_fe *r, const secp256k1_fe *a) {
     secp256k1_fe x2, x3, x6, x9, x11, x22, x44, x88, x176, x220, x223, t1;
     int j;
 
+    VERIFY_CHECK(r != a);
+
     /** The binary representation of (p + 1)/4 has 3 blocks of 1s, with lengths in
      *  { 2, 22, 223 }. Use an addition chain to calculate 2^n - 1 for each block:
      *  1, [2], 3, 6, 9, 11, [22], 44, 88, 176, 220, [223]
