From 181777189eceab70ec6ff19104902ab3ac8255c5 Mon Sep 17 00:00:00 2001 From: Jack Lloyd Date: Tue, 8 Nov 2016 10:31:31 -0500 Subject: Remove Spec typedef from pk_ops Was used by Algo_Registry lookups, no longer needed after #668 --- src/lib/pubkey/pk_ops.h | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/src/lib/pubkey/pk_ops.h b/src/lib/pubkey/pk_ops.h index 712b8c457..26659d4a6 100644 --- a/src/lib/pubkey/pk_ops.h +++ b/src/lib/pubkey/pk_ops.h @@ -20,35 +20,12 @@ class EMSA; namespace PK_Ops { -template -class PK_Spec - { - public: - PK_Spec(const Key& key, const std::string& pad) : - m_key(key), m_pad(pad) {} - - std::string algo_name() const { return m_key.algo_name(); } - - std::string as_string() const { return algo_name() + "/" + padding(); } - - const Key& key() const { return m_key; } - const std::string& padding() const { return m_pad; } - private: - const Key& m_key; - const std::string m_pad; - }; - -typedef PK_Spec PK_Spec_Public_Key; -typedef PK_Spec PK_Spec_Private_Key; - /** * Public key encryption interface */ class BOTAN_DLL Encryption { public: - typedef PK_Spec_Public_Key Spec; - virtual size_t max_input_bits() const = 0; virtual secure_vector encrypt(const byte msg[], @@ -64,8 +41,6 @@ class BOTAN_DLL Encryption class BOTAN_DLL Decryption { public: - typedef PK_Spec_Private_Key Spec; - virtual size_t max_input_bits() const = 0; virtual secure_vector decrypt(byte& valid_mask, @@ -81,8 +56,6 @@ class BOTAN_DLL Decryption class BOTAN_DLL Verification { public: - typedef PK_Spec_Public_Key Spec; - /* * Add more data to the message currently being signed * @param msg the message @@ -123,8 +96,6 @@ class BOTAN_DLL Verification class BOTAN_DLL Signature { public: - typedef PK_Spec_Private_Key Spec; - /** * Find out the number of message parts supported by this scheme. * @return number of message parts @@ -159,8 +130,6 @@ class BOTAN_DLL Signature class BOTAN_DLL Key_Agreement { public: - typedef PK_Spec_Private_Key Spec; - virtual secure_vector agree(size_t key_len, const byte other_key[], size_t other_key_len, const byte salt[], size_t salt_len) = 0; @@ -174,8 +143,6 @@ class BOTAN_DLL Key_Agreement class BOTAN_DLL KEM_Encryption { public: - typedef PK_Spec_Public_Key Spec; - virtual void kem_encrypt(secure_vector& out_encapsulated_key, secure_vector& out_shared_key, size_t desired_shared_key_len, @@ -189,8 +156,6 @@ class BOTAN_DLL KEM_Encryption class BOTAN_DLL KEM_Decryption { public: - typedef PK_Spec_Private_Key Spec; - virtual secure_vector kem_decrypt(const byte encap_key[], size_t len, size_t desired_shared_key_len, -- cgit v1.2.3