aboutsummaryrefslogtreecommitdiffstats
path: root/src/hash
diff options
context:
space:
mode:
authorlloyd <[email protected]>2009-10-22 17:35:04 +0000
committerlloyd <[email protected]>2009-10-22 17:35:04 +0000
commitbbe91cb8030c2d1a910082650a02a0747a718a8e (patch)
treed06232e2cedc05662eafe827a8471b1ec688e146 /src/hash
parent8addfadd8cb724158fefd4f9e36a177b2290d11f (diff)
Remove all exception specifications. The way these are designed in C++ is
just too fragile and not that useful. Something like Java's checked exceptions might be nice, but simply killing the process entirely if an unexpected exception is thrown is not exactly useful for something trying to be robust.
Diffstat (limited to 'src/hash')
-rw-r--r--src/hash/bmw/bmw_512.cpp2
-rw-r--r--src/hash/bmw/bmw_512.h2
-rw-r--r--src/hash/fork256/fork256.cpp2
-rw-r--r--src/hash/fork256/fork256.h2
-rw-r--r--src/hash/gost_3411/gost_3411.cpp2
-rw-r--r--src/hash/gost_3411/gost_3411.h2
-rw-r--r--src/hash/has160/has160.cpp2
-rw-r--r--src/hash/has160/has160.h2
-rw-r--r--src/hash/hash.h2
-rw-r--r--src/hash/md2/md2.cpp2
-rw-r--r--src/hash/md2/md2.h2
-rw-r--r--src/hash/md4/md4.cpp2
-rw-r--r--src/hash/md4/md4.h2
-rw-r--r--src/hash/md5/md5.cpp2
-rw-r--r--src/hash/md5/md5.h2
-rw-r--r--src/hash/mdx_hash/mdx_hash.cpp2
-rw-r--r--src/hash/mdx_hash/mdx_hash.h2
-rw-r--r--src/hash/par_hash/par_hash.cpp2
-rw-r--r--src/hash/par_hash/par_hash.h2
-rw-r--r--src/hash/rmd128/rmd128.cpp2
-rw-r--r--src/hash/rmd128/rmd128.h2
-rw-r--r--src/hash/rmd160/rmd160.cpp2
-rw-r--r--src/hash/rmd160/rmd160.h2
-rw-r--r--src/hash/sha1/sha160.cpp2
-rw-r--r--src/hash/sha1/sha160.h2
-rw-r--r--src/hash/sha2/sha2_32.cpp6
-rw-r--r--src/hash/sha2/sha2_32.h6
-rw-r--r--src/hash/sha2/sha2_64.cpp6
-rw-r--r--src/hash/sha2/sha2_64.h6
-rw-r--r--src/hash/skein/skein_512.cpp2
-rw-r--r--src/hash/skein/skein_512.h2
-rw-r--r--src/hash/tiger/tiger.cpp2
-rw-r--r--src/hash/tiger/tiger.h2
-rw-r--r--src/hash/whirlpool/whrlpool.cpp2
-rw-r--r--src/hash/whirlpool/whrlpool.h2
35 files changed, 43 insertions, 43 deletions
diff --git a/src/hash/bmw/bmw_512.cpp b/src/hash/bmw/bmw_512.cpp
index ad3826351..ae80d5725 100644
--- a/src/hash/bmw/bmw_512.cpp
+++ b/src/hash/bmw/bmw_512.cpp
@@ -176,7 +176,7 @@ void BMW_512::copy_out(byte output[])
/*
* Clear memory of sensitive data
*/
-void BMW_512::clear() throw()
+void BMW_512::clear()
{
MDx_HashFunction::clear();
M.clear();
diff --git a/src/hash/bmw/bmw_512.h b/src/hash/bmw/bmw_512.h
index d1f2539e9..55cd761a9 100644
--- a/src/hash/bmw/bmw_512.h
+++ b/src/hash/bmw/bmw_512.h
@@ -15,7 +15,7 @@ namespace Botan {
class BMW_512 : public MDx_HashFunction
{
public:
- void clear() throw();
+ void clear();
std::string name() const { return "BMW512"; }
HashFunction* clone() const { return new BMW_512; }
BMW_512() : MDx_HashFunction(64, 128, false, true) { clear(); }
diff --git a/src/hash/fork256/fork256.cpp b/src/hash/fork256/fork256.cpp
index f80bff43a..6718f9f97 100644
--- a/src/hash/fork256/fork256.cpp
+++ b/src/hash/fork256/fork256.cpp
@@ -133,7 +133,7 @@ void FORK_256::copy_out(byte output[])
/*
* Clear memory of sensitive data
*/
-void FORK_256::clear() throw()
+void FORK_256::clear()
{
MDx_HashFunction::clear();
digest[0] = 0x6A09E667;
diff --git a/src/hash/fork256/fork256.h b/src/hash/fork256/fork256.h
index 70d336cc9..f535370e6 100644
--- a/src/hash/fork256/fork256.h
+++ b/src/hash/fork256/fork256.h
@@ -18,7 +18,7 @@ namespace Botan {
class BOTAN_DLL FORK_256 : public MDx_HashFunction
{
public:
- void clear() throw();
+ void clear();
std::string name() const { return "FORK-256"; }
HashFunction* clone() const { return new FORK_256; }
FORK_256() : MDx_HashFunction(32, 64, true, true) { clear(); }
diff --git a/src/hash/gost_3411/gost_3411.cpp b/src/hash/gost_3411/gost_3411.cpp
index 8f3982fca..90ef3e805 100644
--- a/src/hash/gost_3411/gost_3411.cpp
+++ b/src/hash/gost_3411/gost_3411.cpp
@@ -23,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();
diff --git a/src/hash/gost_3411/gost_3411.h b/src/hash/gost_3411/gost_3411.h
index 960adaa44..7b17bdc1f 100644
--- a/src/hash/gost_3411/gost_3411.h
+++ b/src/hash/gost_3411/gost_3411.h
@@ -19,7 +19,7 @@ namespace Botan {
class BOTAN_DLL GOST_34_11 : public HashFunction
{
public:
- void clear() throw();
+ void clear();
std::string name() const { return "GOST-R-34.11-94" ; }
HashFunction* clone() const { return new GOST_34_11; }
diff --git a/src/hash/has160/has160.cpp b/src/hash/has160/has160.cpp
index 9a505d31d..533efe595 100644
--- a/src/hash/has160/has160.cpp
+++ b/src/hash/has160/has160.cpp
@@ -145,7 +145,7 @@ void HAS_160::copy_out(byte output[])
/*
* Clear memory of sensitive data
*/
-void HAS_160::clear() throw()
+void HAS_160::clear()
{
MDx_HashFunction::clear();
X.clear();
diff --git a/src/hash/has160/has160.h b/src/hash/has160/has160.h
index 44bb63b9d..cae66c93a 100644
--- a/src/hash/has160/has160.h
+++ b/src/hash/has160/has160.h
@@ -18,7 +18,7 @@ namespace Botan {
class BOTAN_DLL HAS_160 : public MDx_HashFunction
{
public:
- void clear() throw();
+ void clear();
std::string name() const { return "HAS-160"; }
HashFunction* clone() const { return new HAS_160; }
HAS_160() : MDx_HashFunction(20, 64, false, true) { clear(); }
diff --git a/src/hash/hash.h b/src/hash/hash.h
index a30234be0..1098951d8 100644
--- a/src/hash/hash.h
+++ b/src/hash/hash.h
@@ -38,7 +38,7 @@ class BOTAN_DLL HashFunction : public BufferedComputation
/**
* Reset the internal state of this object.
*/
- virtual void clear() throw() = 0;
+ virtual void clear() = 0;
HashFunction(u32bit hash_len, u32bit block_len = 0) :
BufferedComputation(hash_len), HASH_BLOCK_SIZE(block_len) {}
diff --git a/src/hash/md2/md2.cpp b/src/hash/md2/md2.cpp
index c67e72b5a..f03518ec0 100644
--- a/src/hash/md2/md2.cpp
+++ b/src/hash/md2/md2.cpp
@@ -97,7 +97,7 @@ void MD2::final_result(byte output[])
/**
* Clear memory of sensitive data
*/
-void MD2::clear() throw()
+void MD2::clear()
{
X.clear();
checksum.clear();
diff --git a/src/hash/md2/md2.h b/src/hash/md2/md2.h
index 9337c43f4..0a7125759 100644
--- a/src/hash/md2/md2.h
+++ b/src/hash/md2/md2.h
@@ -18,7 +18,7 @@ namespace Botan {
class BOTAN_DLL MD2 : public HashFunction
{
public:
- void clear() throw();
+ void clear();
std::string name() const { return "MD2"; }
HashFunction* clone() const { return new MD2; }
MD2() : HashFunction(16, 16) { clear(); }
diff --git a/src/hash/md4/md4.cpp b/src/hash/md4/md4.cpp
index 39e3c8c41..b2870066d 100644
--- a/src/hash/md4/md4.cpp
+++ b/src/hash/md4/md4.cpp
@@ -95,7 +95,7 @@ void MD4::copy_out(byte output[])
/*
* Clear memory of sensitive data
*/
-void MD4::clear() throw()
+void MD4::clear()
{
MDx_HashFunction::clear();
M.clear();
diff --git a/src/hash/md4/md4.h b/src/hash/md4/md4.h
index df6f2292d..0b76a70e4 100644
--- a/src/hash/md4/md4.h
+++ b/src/hash/md4/md4.h
@@ -18,7 +18,7 @@ namespace Botan {
class BOTAN_DLL MD4 : public MDx_HashFunction
{
public:
- void clear() throw();
+ void clear();
std::string name() const { return "MD4"; }
HashFunction* clone() const { return new MD4; }
MD4() : MDx_HashFunction(16, 64, false, true) { clear(); }
diff --git a/src/hash/md5/md5.cpp b/src/hash/md5/md5.cpp
index 7c280aab7..163413bec 100644
--- a/src/hash/md5/md5.cpp
+++ b/src/hash/md5/md5.cpp
@@ -123,7 +123,7 @@ void MD5::copy_out(byte output[])
/*
* Clear memory of sensitive data
*/
-void MD5::clear() throw()
+void MD5::clear()
{
MDx_HashFunction::clear();
M.clear();
diff --git a/src/hash/md5/md5.h b/src/hash/md5/md5.h
index 85f684d8b..456a02c28 100644
--- a/src/hash/md5/md5.h
+++ b/src/hash/md5/md5.h
@@ -18,7 +18,7 @@ namespace Botan {
class BOTAN_DLL MD5 : public MDx_HashFunction
{
public:
- void clear() throw();
+ void clear();
std::string name() const { return "MD5"; }
HashFunction* clone() const { return new MD5; }
MD5() : MDx_HashFunction(16, 64, false, true) { clear(); }
diff --git a/src/hash/mdx_hash/mdx_hash.cpp b/src/hash/mdx_hash/mdx_hash.cpp
index b630ec227..28402c2c5 100644
--- a/src/hash/mdx_hash/mdx_hash.cpp
+++ b/src/hash/mdx_hash/mdx_hash.cpp
@@ -28,7 +28,7 @@ MDx_HashFunction::MDx_HashFunction(u32bit hash_len, u32bit block_len,
/**
* Clear memory of sensitive data
*/
-void MDx_HashFunction::clear() throw()
+void MDx_HashFunction::clear()
{
buffer.clear();
count = position = 0;
diff --git a/src/hash/mdx_hash/mdx_hash.h b/src/hash/mdx_hash/mdx_hash.h
index 0c3aa7806..2d70deed3 100644
--- a/src/hash/mdx_hash/mdx_hash.h
+++ b/src/hash/mdx_hash/mdx_hash.h
@@ -25,7 +25,7 @@ class BOTAN_DLL MDx_HashFunction : public HashFunction
void final_result(byte output[]);
virtual void compress_n(const byte block[], u32bit block_n) = 0;
- void clear() throw();
+ void clear();
virtual void copy_out(byte[]) = 0;
virtual void write_count(byte[]);
private:
diff --git a/src/hash/par_hash/par_hash.cpp b/src/hash/par_hash/par_hash.cpp
index 4b0c7c466..0ba3f5a4f 100644
--- a/src/hash/par_hash/par_hash.cpp
+++ b/src/hash/par_hash/par_hash.cpp
@@ -77,7 +77,7 @@ HashFunction* Parallel::clone() const
/*
* Clear memory of sensitive data
*/
-void Parallel::clear() throw()
+void Parallel::clear()
{
for(u32bit j = 0; j != hashes.size(); ++j)
hashes[j]->clear();
diff --git a/src/hash/par_hash/par_hash.h b/src/hash/par_hash/par_hash.h
index 7e75c27be..874e491b1 100644
--- a/src/hash/par_hash/par_hash.h
+++ b/src/hash/par_hash/par_hash.h
@@ -19,7 +19,7 @@ namespace Botan {
class BOTAN_DLL Parallel : public HashFunction
{
public:
- void clear() throw();
+ void clear();
std::string name() const;
HashFunction* clone() const;
diff --git a/src/hash/rmd128/rmd128.cpp b/src/hash/rmd128/rmd128.cpp
index 8b2c0ccf8..899e50914 100644
--- a/src/hash/rmd128/rmd128.cpp
+++ b/src/hash/rmd128/rmd128.cpp
@@ -159,7 +159,7 @@ void RIPEMD_128::copy_out(byte output[])
/*
* Clear memory of sensitive data
*/
-void RIPEMD_128::clear() throw()
+void RIPEMD_128::clear()
{
MDx_HashFunction::clear();
M.clear();
diff --git a/src/hash/rmd128/rmd128.h b/src/hash/rmd128/rmd128.h
index 031ae5746..d9cb4ebb4 100644
--- a/src/hash/rmd128/rmd128.h
+++ b/src/hash/rmd128/rmd128.h
@@ -18,7 +18,7 @@ namespace Botan {
class BOTAN_DLL RIPEMD_128 : public MDx_HashFunction
{
public:
- void clear() throw();
+ void clear();
std::string name() const { return "RIPEMD-128"; }
HashFunction* clone() const { return new RIPEMD_128; }
RIPEMD_128() : MDx_HashFunction(16, 64, false, true) { clear(); }
diff --git a/src/hash/rmd160/rmd160.cpp b/src/hash/rmd160/rmd160.cpp
index 863de8487..2baf5ab08 100644
--- a/src/hash/rmd160/rmd160.cpp
+++ b/src/hash/rmd160/rmd160.cpp
@@ -196,7 +196,7 @@ void RIPEMD_160::copy_out(byte output[])
/*
* Clear memory of sensitive data
*/
-void RIPEMD_160::clear() throw()
+void RIPEMD_160::clear()
{
MDx_HashFunction::clear();
M.clear();
diff --git a/src/hash/rmd160/rmd160.h b/src/hash/rmd160/rmd160.h
index f2babc582..aee007b98 100644
--- a/src/hash/rmd160/rmd160.h
+++ b/src/hash/rmd160/rmd160.h
@@ -18,7 +18,7 @@ namespace Botan {
class BOTAN_DLL RIPEMD_160 : public MDx_HashFunction
{
public:
- void clear() throw();
+ void clear();
std::string name() const { return "RIPEMD-160"; }
HashFunction* clone() const { return new RIPEMD_160; }
RIPEMD_160() : MDx_HashFunction(20, 64, false, true) { clear(); }
diff --git a/src/hash/sha1/sha160.cpp b/src/hash/sha1/sha160.cpp
index 45323a11b..a9e6880a7 100644
--- a/src/hash/sha1/sha160.cpp
+++ b/src/hash/sha1/sha160.cpp
@@ -130,7 +130,7 @@ void SHA_160::copy_out(byte output[])
/*
* Clear memory of sensitive data
*/
-void SHA_160::clear() throw()
+void SHA_160::clear()
{
MDx_HashFunction::clear();
W.clear();
diff --git a/src/hash/sha1/sha160.h b/src/hash/sha1/sha160.h
index 232cf0322..142c6bf17 100644
--- a/src/hash/sha1/sha160.h
+++ b/src/hash/sha1/sha160.h
@@ -18,7 +18,7 @@ namespace Botan {
class BOTAN_DLL SHA_160 : public MDx_HashFunction
{
public:
- void clear() throw();
+ void clear();
std::string name() const { return "SHA-160"; }
HashFunction* clone() const { return new SHA_160; }
SHA_160();
diff --git a/src/hash/sha2/sha2_32.cpp b/src/hash/sha2/sha2_32.cpp
index 9da2ec23f..9fbcae44d 100644
--- a/src/hash/sha2/sha2_32.cpp
+++ b/src/hash/sha2/sha2_32.cpp
@@ -152,7 +152,7 @@ void SHA_224_256_BASE::copy_out(byte output[])
/*
* Clear memory of sensitive data
*/
-void SHA_224_256_BASE::clear() throw()
+void SHA_224_256_BASE::clear()
{
MDx_HashFunction::clear();
W.clear();
@@ -161,7 +161,7 @@ void SHA_224_256_BASE::clear() throw()
/*
* Clear memory of sensitive data
*/
-void SHA_224::clear() throw()
+void SHA_224::clear()
{
SHA_224_256_BASE::clear();
digest[0] = 0xc1059ed8;
@@ -177,7 +177,7 @@ void SHA_224::clear() throw()
/*
* Clear memory of sensitive data
*/
-void SHA_256::clear() throw()
+void SHA_256::clear()
{
SHA_224_256_BASE::clear();
digest[0] = 0x6A09E667;
diff --git a/src/hash/sha2/sha2_32.h b/src/hash/sha2/sha2_32.h
index 05083d19d..313eec676 100644
--- a/src/hash/sha2/sha2_32.h
+++ b/src/hash/sha2/sha2_32.h
@@ -19,7 +19,7 @@ namespace Botan {
class BOTAN_DLL SHA_224_256_BASE : public MDx_HashFunction
{
protected:
- void clear() throw();
+ void clear();
SHA_224_256_BASE(u32bit out) :
MDx_HashFunction(out, 64, true, true) { clear(); }
@@ -36,7 +36,7 @@ class BOTAN_DLL SHA_224_256_BASE : public MDx_HashFunction
class BOTAN_DLL SHA_224 : public SHA_224_256_BASE
{
public:
- void clear() throw();
+ void clear();
std::string name() const { return "SHA-224"; }
HashFunction* clone() const { return new SHA_224; }
SHA_224() : SHA_224_256_BASE(28) { clear(); }
@@ -48,7 +48,7 @@ class BOTAN_DLL SHA_224 : public SHA_224_256_BASE
class BOTAN_DLL SHA_256 : public SHA_224_256_BASE
{
public:
- void clear() throw();
+ void clear();
std::string name() const { return "SHA-256"; }
HashFunction* clone() const { return new SHA_256; }
SHA_256() : SHA_224_256_BASE(32) { clear (); }
diff --git a/src/hash/sha2/sha2_64.cpp b/src/hash/sha2/sha2_64.cpp
index e9b4c2e5a..3c771eb44 100644
--- a/src/hash/sha2/sha2_64.cpp
+++ b/src/hash/sha2/sha2_64.cpp
@@ -167,7 +167,7 @@ void SHA_384_512_BASE::copy_out(byte output[])
/*
* Clear memory of sensitive data
*/
-void SHA_384_512_BASE::clear() throw()
+void SHA_384_512_BASE::clear()
{
MDx_HashFunction::clear();
W.clear();
@@ -176,7 +176,7 @@ void SHA_384_512_BASE::clear() throw()
/*
* Clear memory of sensitive data
*/
-void SHA_384::clear() throw()
+void SHA_384::clear()
{
SHA_384_512_BASE::clear();
digest[0] = 0xCBBB9D5DC1059ED8;
@@ -192,7 +192,7 @@ void SHA_384::clear() throw()
/*
* Clear memory of sensitive data
*/
-void SHA_512::clear() throw()
+void SHA_512::clear()
{
SHA_384_512_BASE::clear();
digest[0] = 0x6A09E667F3BCC908;
diff --git a/src/hash/sha2/sha2_64.h b/src/hash/sha2/sha2_64.h
index dcc6dc83b..8e4d171f8 100644
--- a/src/hash/sha2/sha2_64.h
+++ b/src/hash/sha2/sha2_64.h
@@ -18,7 +18,7 @@ namespace Botan {
class BOTAN_DLL SHA_384_512_BASE : public MDx_HashFunction
{
protected:
- void clear() throw();
+ void clear();
SHA_384_512_BASE(u32bit out) :
MDx_HashFunction(out, 128, true, true, 16) {}
@@ -37,7 +37,7 @@ class BOTAN_DLL SHA_384_512_BASE : public MDx_HashFunction
class BOTAN_DLL SHA_384 : public SHA_384_512_BASE
{
public:
- void clear() throw();
+ void clear();
std::string name() const { return "SHA-384"; }
HashFunction* clone() const { return new SHA_384; }
SHA_384() : SHA_384_512_BASE(48) { clear(); }
@@ -49,7 +49,7 @@ class BOTAN_DLL SHA_384 : public SHA_384_512_BASE
class BOTAN_DLL SHA_512 : public SHA_384_512_BASE
{
public:
- void clear() throw();
+ void clear();
std::string name() const { return "SHA-512"; }
HashFunction* clone() const { return new SHA_512; }
SHA_512() : SHA_384_512_BASE(64) { clear(); }
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[]);
diff --git a/src/hash/tiger/tiger.cpp b/src/hash/tiger/tiger.cpp
index e46f2cb77..975ea9b6b 100644
--- a/src/hash/tiger/tiger.cpp
+++ b/src/hash/tiger/tiger.cpp
@@ -129,7 +129,7 @@ void Tiger::mix(u64bit X[8])
/*
* Clear memory of sensitive data
*/
-void Tiger::clear() throw()
+void Tiger::clear()
{
MDx_HashFunction::clear();
X.clear();
diff --git a/src/hash/tiger/tiger.h b/src/hash/tiger/tiger.h
index 63184a938..86ddcd270 100644
--- a/src/hash/tiger/tiger.h
+++ b/src/hash/tiger/tiger.h
@@ -18,7 +18,7 @@ namespace Botan {
class BOTAN_DLL Tiger : public MDx_HashFunction
{
public:
- void clear() throw();
+ void clear();
std::string name() const;
HashFunction* clone() const { return new Tiger(OUTPUT_LENGTH); }
Tiger(u32bit = 24, u32bit = 3);
diff --git a/src/hash/whirlpool/whrlpool.cpp b/src/hash/whirlpool/whrlpool.cpp
index 8548d6192..b7a02a9b6 100644
--- a/src/hash/whirlpool/whrlpool.cpp
+++ b/src/hash/whirlpool/whrlpool.cpp
@@ -136,7 +136,7 @@ void Whirlpool::copy_out(byte output[])
/*
* Clear memory of sensitive data
*/
-void Whirlpool::clear() throw()
+void Whirlpool::clear()
{
MDx_HashFunction::clear();
M.clear();
diff --git a/src/hash/whirlpool/whrlpool.h b/src/hash/whirlpool/whrlpool.h
index b72ff609f..34b4d2302 100644
--- a/src/hash/whirlpool/whrlpool.h
+++ b/src/hash/whirlpool/whrlpool.h
@@ -18,7 +18,7 @@ namespace Botan {
class BOTAN_DLL Whirlpool : public MDx_HashFunction
{
public:
- void clear() throw();
+ void clear();
std::string name() const { return "Whirlpool"; }
HashFunction* clone() const { return new Whirlpool; }
Whirlpool() : MDx_HashFunction(64, 64, true, true, 32) { clear(); }