Reorganize the EMSA classes, and remove the last references to prng_reference

in the library ccode.

2 files changed, 12 insertions, 2 deletions

diff --git a/include/emsa.h b/include/emsa.h
index 21992ed94..44f9210d1 100644
--- a/include/emsa.h
+++ b/include/emsa.h
@@ -46,6 +46,9 @@ class BOTAN_DLL EMSA2 : public EMSA
       SecureVector<byte> encoding_of(const MemoryRegion<byte>&, u32bit,
                                      RandomNumberGenerator& rng);
 
+      bool verify(const MemoryRegion<byte>&, const MemoryRegion<byte>&,
+                  u32bit) throw();
+
       SecureVector<byte> empty_hash;
       HashFunction* hash;
       byte hash_id;
@@ -67,6 +70,9 @@ class BOTAN_DLL EMSA3 : public EMSA
       SecureVector<byte> encoding_of(const MemoryRegion<byte>&, u32bit,
                                      RandomNumberGenerator& rng);
 
+      bool verify(const MemoryRegion<byte>&, const MemoryRegion<byte>&,
+                  u32bit) throw();
+
       HashFunction* hash;
       SecureVector<byte> hash_id;
    };
@@ -101,9 +107,13 @@ class BOTAN_DLL EMSA_Raw : public EMSA
    {
    private:
       void update(const byte[], u32bit);
+      SecureVector<byte> raw_data();
+
       SecureVector<byte> encoding_of(const MemoryRegion<byte>&, u32bit,
                                      RandomNumberGenerator&);
-      SecureVector<byte> raw_data();
+      bool verify(const MemoryRegion<byte>&, const MemoryRegion<byte>&,
+                  u32bit) throw();
+
       SecureVector<byte> message;
    };
 
diff --git a/include/pk_util.h b/include/pk_util.h
index af5a052b1..aa7a71234 100644
--- a/include/pk_util.h
+++ b/include/pk_util.h
@@ -49,7 +49,7 @@ class BOTAN_DLL EMSA
                                              RandomNumberGenerator& rng) = 0;
 
       virtual bool verify(const MemoryRegion<byte>&, const MemoryRegion<byte>&,
-                          u32bit) throw();
+                          u32bit) throw() = 0;
       virtual ~EMSA() {}
    };