1 files changed, 5 insertions, 7 deletions
diff --git a/src/hash/gost_3411/gost_3411.cpp b/src/hash/gost_3411/gost_3411.cpp
index 3c7f5f92b..16b1311da 100644
--- a/src/hash/gost_3411/gost_3411.cpp
+++ b/src/hash/gost_3411/gost_3411.cpp
@@ -1,6 +1,8 @@
 /*
 * GOST 34.11
 * (C) 2009 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
 */
 
 #include <botan/gost_3411.h>
@@ -21,7 +23,7 @@ GOST_34_11::GOST_34_11() :
    position = 0;
    }
 
-void GOST_34_11::clear() throw()
+void GOST_34_11::clear()
    {
    cipher.clear();
    sum.clear();
@@ -77,12 +79,8 @@ void GOST_34_11::compress_n(const byte input[], u32bit blocks)
       byte S[32] = { 0 };
 
       u64bit U[4], V[4];
-
-      for(u32bit j = 0; j != 4; ++j)
-         {
-         U[j] = load_be<u64bit>(hash, j);
-         V[j] = load_be<u64bit>(input + 32*i, j);
-         }
+      load_be(U, hash, 4);
+      load_be(V, input + 32*i, 4);
 
       for(u32bit j = 0; j != 4; ++j)
          {