aboutsummaryrefslogtreecommitdiffstats
path: root/src/pk_pad
diff options
context:
space:
mode:
Diffstat (limited to 'src/pk_pad')
-rw-r--r--src/pk_pad/eme1/info.txt2
-rw-r--r--src/pk_pad/eme_pkcs/info.txt2
-rw-r--r--src/pk_pad/emsa.h2
-rw-r--r--src/pk_pad/emsa1/emsa1.cpp2
-rw-r--r--src/pk_pad/emsa1/emsa1.h2
-rw-r--r--src/pk_pad/emsa1/info.txt2
-rw-r--r--src/pk_pad/emsa1_bsi/info.txt2
-rw-r--r--src/pk_pad/emsa2/emsa2.cpp2
-rw-r--r--src/pk_pad/emsa2/emsa2.h2
-rw-r--r--src/pk_pad/emsa2/info.txt2
-rw-r--r--src/pk_pad/emsa3/emsa3.cpp4
-rw-r--r--src/pk_pad/emsa3/emsa3.h4
-rw-r--r--src/pk_pad/emsa3/info.txt2
-rw-r--r--src/pk_pad/emsa4/emsa4.cpp2
-rw-r--r--src/pk_pad/emsa4/emsa4.h2
-rw-r--r--src/pk_pad/emsa4/info.txt2
-rw-r--r--src/pk_pad/emsa_raw/emsa_raw.cpp2
-rw-r--r--src/pk_pad/emsa_raw/emsa_raw.h2
-rw-r--r--src/pk_pad/emsa_raw/info.txt2
-rw-r--r--src/pk_pad/hash_id/info.txt2
-rw-r--r--src/pk_pad/info.txt2
21 files changed, 13 insertions, 33 deletions
diff --git a/src/pk_pad/eme1/info.txt b/src/pk_pad/eme1/info.txt
index 2f61265e2..794254e8e 100644
--- a/src/pk_pad/eme1/info.txt
+++ b/src/pk_pad/eme1/info.txt
@@ -1,5 +1,3 @@
-realname "EME1"
-
define EME1
load_on auto
diff --git a/src/pk_pad/eme_pkcs/info.txt b/src/pk_pad/eme_pkcs/info.txt
index 88d9caf17..95c568452 100644
--- a/src/pk_pad/eme_pkcs/info.txt
+++ b/src/pk_pad/eme_pkcs/info.txt
@@ -1,5 +1,3 @@
-realname "PKCSv1 v1.5 EME"
-
define EME_PKCS1v15
load_on auto
diff --git a/src/pk_pad/emsa.h b/src/pk_pad/emsa.h
index e2491e40f..8b19d3cb2 100644
--- a/src/pk_pad/emsa.h
+++ b/src/pk_pad/emsa.h
@@ -27,7 +27,7 @@ class BOTAN_DLL EMSA
RandomNumberGenerator& rng) = 0;
virtual bool verify(const MemoryRegion<byte>&, const MemoryRegion<byte>&,
- u32bit) throw() = 0;
+ u32bit) = 0;
virtual ~EMSA() {}
};
diff --git a/src/pk_pad/emsa1/emsa1.cpp b/src/pk_pad/emsa1/emsa1.cpp
index 26d709c28..0ae7e8d2d 100644
--- a/src/pk_pad/emsa1/emsa1.cpp
+++ b/src/pk_pad/emsa1/emsa1.cpp
@@ -72,7 +72,7 @@ SecureVector<byte> EMSA1::encoding_of(const MemoryRegion<byte>& msg,
* EMSA1 Decode/Verify Operation
*/
bool EMSA1::verify(const MemoryRegion<byte>& coded,
- const MemoryRegion<byte>& raw, u32bit key_bits) throw()
+ const MemoryRegion<byte>& raw, u32bit key_bits)
{
try {
if(raw.size() != hash->OUTPUT_LENGTH)
diff --git a/src/pk_pad/emsa1/emsa1.h b/src/pk_pad/emsa1/emsa1.h
index a5dac07e2..d86020966 100644
--- a/src/pk_pad/emsa1/emsa1.h
+++ b/src/pk_pad/emsa1/emsa1.h
@@ -31,7 +31,7 @@ class BOTAN_DLL EMSA1 : public EMSA
RandomNumberGenerator& rng);
bool verify(const MemoryRegion<byte>&, const MemoryRegion<byte>&,
- u32bit) throw();
+ u32bit);
HashFunction* hash;
};
diff --git a/src/pk_pad/emsa1/info.txt b/src/pk_pad/emsa1/info.txt
index 086270b96..55832307b 100644
--- a/src/pk_pad/emsa1/info.txt
+++ b/src/pk_pad/emsa1/info.txt
@@ -1,5 +1,3 @@
-realname "EMSA1"
-
define EMSA1
load_on auto
diff --git a/src/pk_pad/emsa1_bsi/info.txt b/src/pk_pad/emsa1_bsi/info.txt
index 14a9fd396..5e8fe09ca 100644
--- a/src/pk_pad/emsa1_bsi/info.txt
+++ b/src/pk_pad/emsa1_bsi/info.txt
@@ -1,5 +1,3 @@
-realname "EMSA1 (BSI variant)"
-
define EMSA1_BSI
load_on auto
diff --git a/src/pk_pad/emsa2/emsa2.cpp b/src/pk_pad/emsa2/emsa2.cpp
index 168f9209e..74a045931 100644
--- a/src/pk_pad/emsa2/emsa2.cpp
+++ b/src/pk_pad/emsa2/emsa2.cpp
@@ -79,7 +79,7 @@ SecureVector<byte> EMSA2::encoding_of(const MemoryRegion<byte>& msg,
*/
bool EMSA2::verify(const MemoryRegion<byte>& coded,
const MemoryRegion<byte>& raw,
- u32bit key_bits) throw()
+ u32bit key_bits)
{
try
{
diff --git a/src/pk_pad/emsa2/emsa2.h b/src/pk_pad/emsa2/emsa2.h
index 76888d1f6..7efc80873 100644
--- a/src/pk_pad/emsa2/emsa2.h
+++ b/src/pk_pad/emsa2/emsa2.h
@@ -29,7 +29,7 @@ class BOTAN_DLL EMSA2 : public EMSA
RandomNumberGenerator& rng);
bool verify(const MemoryRegion<byte>&, const MemoryRegion<byte>&,
- u32bit) throw();
+ u32bit);
SecureVector<byte> empty_hash;
HashFunction* hash;
diff --git a/src/pk_pad/emsa2/info.txt b/src/pk_pad/emsa2/info.txt
index 1c8161c5e..a6fff2a02 100644
--- a/src/pk_pad/emsa2/info.txt
+++ b/src/pk_pad/emsa2/info.txt
@@ -1,5 +1,3 @@
-realname "EMSA2"
-
define EMSA2
load_on auto
diff --git a/src/pk_pad/emsa3/emsa3.cpp b/src/pk_pad/emsa3/emsa3.cpp
index 4d50abd84..dc905a464 100644
--- a/src/pk_pad/emsa3/emsa3.cpp
+++ b/src/pk_pad/emsa3/emsa3.cpp
@@ -72,7 +72,7 @@ SecureVector<byte> EMSA3::encoding_of(const MemoryRegion<byte>& msg,
*/
bool EMSA3::verify(const MemoryRegion<byte>& coded,
const MemoryRegion<byte>& raw,
- u32bit key_bits) throw()
+ u32bit key_bits)
{
if(raw.size() != hash->OUTPUT_LENGTH)
return false;
@@ -137,7 +137,7 @@ SecureVector<byte> EMSA3_Raw::encoding_of(const MemoryRegion<byte>& msg,
*/
bool EMSA3_Raw::verify(const MemoryRegion<byte>& coded,
const MemoryRegion<byte>& raw,
- u32bit key_bits) throw()
+ u32bit key_bits)
{
try
{
diff --git a/src/pk_pad/emsa3/emsa3.h b/src/pk_pad/emsa3/emsa3.h
index 301f2142a..c4a3d658b 100644
--- a/src/pk_pad/emsa3/emsa3.h
+++ b/src/pk_pad/emsa3/emsa3.h
@@ -32,7 +32,7 @@ class BOTAN_DLL EMSA3 : public EMSA
RandomNumberGenerator& rng);
bool verify(const MemoryRegion<byte>&, const MemoryRegion<byte>&,
- u32bit) throw();
+ u32bit);
private:
HashFunction* hash;
SecureVector<byte> hash_id;
@@ -54,7 +54,7 @@ class BOTAN_DLL EMSA3_Raw : public EMSA
RandomNumberGenerator& rng);
bool verify(const MemoryRegion<byte>&, const MemoryRegion<byte>&,
- u32bit) throw();
+ u32bit);
private:
SecureVector<byte> message;
diff --git a/src/pk_pad/emsa3/info.txt b/src/pk_pad/emsa3/info.txt
index 90e4b9bfc..babd98711 100644
--- a/src/pk_pad/emsa3/info.txt
+++ b/src/pk_pad/emsa3/info.txt
@@ -1,5 +1,3 @@
-realname "EMSA3"
-
define EMSA3
load_on auto
diff --git a/src/pk_pad/emsa4/emsa4.cpp b/src/pk_pad/emsa4/emsa4.cpp
index cff9a1537..dba248662 100644
--- a/src/pk_pad/emsa4/emsa4.cpp
+++ b/src/pk_pad/emsa4/emsa4.cpp
@@ -68,7 +68,7 @@ SecureVector<byte> EMSA4::encoding_of(const MemoryRegion<byte>& msg,
* EMSA4 Decode/Verify Operation
*/
bool EMSA4::verify(const MemoryRegion<byte>& const_coded,
- const MemoryRegion<byte>& raw, u32bit key_bits) throw()
+ const MemoryRegion<byte>& raw, u32bit key_bits)
{
const u32bit HASH_SIZE = hash->OUTPUT_LENGTH;
const u32bit KEY_BYTES = (key_bits + 7) / 8;
diff --git a/src/pk_pad/emsa4/emsa4.h b/src/pk_pad/emsa4/emsa4.h
index b716178a9..9e37684f5 100644
--- a/src/pk_pad/emsa4/emsa4.h
+++ b/src/pk_pad/emsa4/emsa4.h
@@ -31,7 +31,7 @@ class BOTAN_DLL EMSA4 : public EMSA
SecureVector<byte> encoding_of(const MemoryRegion<byte>&, u32bit,
RandomNumberGenerator& rng);
bool verify(const MemoryRegion<byte>&, const MemoryRegion<byte>&,
- u32bit) throw();
+ u32bit);
u32bit SALT_SIZE;
HashFunction* hash;
diff --git a/src/pk_pad/emsa4/info.txt b/src/pk_pad/emsa4/info.txt
index 29ef4e0cf..ea1db30a1 100644
--- a/src/pk_pad/emsa4/info.txt
+++ b/src/pk_pad/emsa4/info.txt
@@ -1,5 +1,3 @@
-realname "EMSA4"
-
define EMSA4
load_on auto
diff --git a/src/pk_pad/emsa_raw/emsa_raw.cpp b/src/pk_pad/emsa_raw/emsa_raw.cpp
index d5973ee55..5dfe20a50 100644
--- a/src/pk_pad/emsa_raw/emsa_raw.cpp
+++ b/src/pk_pad/emsa_raw/emsa_raw.cpp
@@ -42,7 +42,7 @@ SecureVector<byte> EMSA_Raw::encoding_of(const MemoryRegion<byte>& msg,
*/
bool EMSA_Raw::verify(const MemoryRegion<byte>& coded,
const MemoryRegion<byte>& raw,
- u32bit) throw()
+ u32bit)
{
return (coded == raw);
}
diff --git a/src/pk_pad/emsa_raw/emsa_raw.h b/src/pk_pad/emsa_raw/emsa_raw.h
index 1b0ad516e..5f2eaa2fe 100644
--- a/src/pk_pad/emsa_raw/emsa_raw.h
+++ b/src/pk_pad/emsa_raw/emsa_raw.h
@@ -24,7 +24,7 @@ class BOTAN_DLL EMSA_Raw : public EMSA
SecureVector<byte> encoding_of(const MemoryRegion<byte>&, u32bit,
RandomNumberGenerator&);
bool verify(const MemoryRegion<byte>&, const MemoryRegion<byte>&,
- u32bit) throw();
+ u32bit);
SecureVector<byte> message;
};
diff --git a/src/pk_pad/emsa_raw/info.txt b/src/pk_pad/emsa_raw/info.txt
index 2a88d10fa..4bd850e11 100644
--- a/src/pk_pad/emsa_raw/info.txt
+++ b/src/pk_pad/emsa_raw/info.txt
@@ -1,5 +1,3 @@
-realname "EMSA-Raw"
-
define EMSA_RAW
load_on auto
diff --git a/src/pk_pad/hash_id/info.txt b/src/pk_pad/hash_id/info.txt
index 935432588..af9f5cd4f 100644
--- a/src/pk_pad/hash_id/info.txt
+++ b/src/pk_pad/hash_id/info.txt
@@ -1,5 +1,3 @@
-realname "Hash Function Identifiers"
-
define HASH_ID
load_on auto
diff --git a/src/pk_pad/info.txt b/src/pk_pad/info.txt
index c281b1563..14b05f458 100644
--- a/src/pk_pad/info.txt
+++ b/src/pk_pad/info.txt
@@ -1,5 +1,3 @@
-realname "Public Key EME/EMSA Padding Modes"
-
define PK_PADDING
load_on auto