aboutsummaryrefslogtreecommitdiffstats
path: root/src/hash/skein
diff options
context:
space:
mode:
authorlloyd <[email protected]>2009-10-28 22:55:12 +0000
committerlloyd <[email protected]>2009-10-28 22:55:12 +0000
commit3623be3fd05d890309cc3da4b3a1e319e357df65 (patch)
tree34ca43fcf8a7007cc01a3919f63e9ab6763cb673 /src/hash/skein
parentfc1e61500e77fcabe67e6d2607810c1ba071bbdd (diff)
parent9462f875b13a321f42a127166d49670ca04afcde (diff)
propagate from branch 'net.randombit.botan.1_8' (head 3158f8272a3582dd44dfb771665eb71f7d005339)
to branch 'net.randombit.botan' (head bf629b13dd132b263e76a72b7eca0f7e4ab19aac)
Diffstat (limited to 'src/hash/skein')
-rw-r--r--src/hash/skein/info.txt7
-rw-r--r--src/hash/skein/skein_512.cpp2
-rw-r--r--src/hash/skein/skein_512.h2
3 files changed, 2 insertions, 9 deletions
diff --git a/src/hash/skein/info.txt b/src/hash/skein/info.txt
index bab8497c5..908033852 100644
--- a/src/hash/skein/info.txt
+++ b/src/hash/skein/info.txt
@@ -2,13 +2,6 @@ realname "Skein"
define SKEIN_512
-load_on auto
-
-<add>
-skein_512.cpp
-skein_512.h
-</add>
-
<requires>
alloc
</requires>
diff --git a/src/hash/skein/skein_512.cpp b/src/hash/skein/skein_512.cpp
index a48cfc186..b24efd5f7 100644
--- a/src/hash/skein/skein_512.cpp
+++ b/src/hash/skein/skein_512.cpp
@@ -183,7 +183,7 @@ HashFunction* Skein_512::clone() const
return new Skein_512(output_bits, personalization);
}
-void Skein_512::clear() throw()
+void Skein_512::clear()
{
H.clear();
T.clear();
diff --git a/src/hash/skein/skein_512.h b/src/hash/skein/skein_512.h
index fa558fc0d..db8d3c8b7 100644
--- a/src/hash/skein/skein_512.h
+++ b/src/hash/skein/skein_512.h
@@ -22,7 +22,7 @@ class BOTAN_DLL Skein_512 : public HashFunction
HashFunction* clone() const;
std::string name() const;
- void clear() throw();
+ void clear();
private:
void add_data(const byte input[], u32bit length);
void final_result(byte out[]);