Merge GH #567/GH #457 TLS refactoring and Callbacks interface

2 files changed, 4 insertions, 7 deletions

diff --git a/src/lib/math/bigint/big_ops2.cpp b/src/lib/math/bigint/big_ops2.cpp
index 9a3408247..6e234f036 100644
--- a/src/lib/math/bigint/big_ops2.cpp
+++ b/src/lib/math/bigint/big_ops2.cpp
@@ -1,6 +1,7 @@
 /*
 * BigInt Assignment Operators
 * (C) 1999-2007 Jack Lloyd
+*     2016 Matthias Gierlings
 *
 * Botan is released under the Simplified BSD License (see license.txt)
 */
@@ -118,10 +119,7 @@ BigInt& BigInt::operator*=(const BigInt& y)
 
       secure_vector<word> z(data(), data() + x_sw);
       secure_vector<word> workspace(size());
-
-      bigint_mul(mutable_data(), size(), workspace.data(),
-                 z.data(), z.size(), x_sw,
-                 y.data(), y.size(), y_sw);
+      bigint_mul(*this, BigInt(*this), y, workspace.data());
       }
 
    return (*this);
diff --git a/src/lib/math/bigint/big_ops3.cpp b/src/lib/math/bigint/big_ops3.cpp
index 6cf837020..24927b4fc 100644
--- a/src/lib/math/bigint/big_ops3.cpp
+++ b/src/lib/math/bigint/big_ops3.cpp
@@ -1,6 +1,7 @@
 /*
 * BigInt Binary Operators
 * (C) 1999-2007 Jack Lloyd
+*     2016 Matthias Gierlings
 *
 * Botan is released under the Simplified BSD License (see license.txt)
 */
@@ -93,9 +94,7 @@ BigInt operator*(const BigInt& x, const BigInt& y)
    else if(x_sw && y_sw)
       {
       secure_vector<word> workspace(z.size());
-      bigint_mul(z.mutable_data(), z.size(), workspace.data(),
-                 x.data(), x.size(), x_sw,
-                 y.data(), y.size(), y_sw);
+      bigint_mul(z, x, y, workspace.data());
       }
 
    if(x_sw && y_sw && x.sign() != y.sign())