diff options
author | lloyd <[email protected]> | 2015-03-14 04:31:24 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2015-03-14 04:31:24 +0000 |
commit | ccfcb3af8b8404f998aba895ddfc7f3d4405fdd5 (patch) | |
tree | 9b4d1ba62249681622051a92758a3dc3c82bfd6d /src/lib/pubkey/pubkey.h | |
parent | d8ab5899e9f8c8d9987cec78fed34365b5ad0ee9 (diff) |
In PK encrypt/decrypt move pad calls to the operation. This allows an
op to use a padding scheme outside of our knowledge or control, for
instance an OpenSSL RSA op which uses OpenSSL's padding code. Similar
change for key agreement and KDFs for the same reason.
Add an EME_Raw type; previously this operation was implicit in the
code in pubkey.cpp
Diffstat (limited to 'src/lib/pubkey/pubkey.h')
-rw-r--r-- | src/lib/pubkey/pubkey.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/pubkey/pubkey.h b/src/lib/pubkey/pubkey.h index 7341cb9c8..ffb00979d 100644 --- a/src/lib/pubkey/pubkey.h +++ b/src/lib/pubkey/pubkey.h @@ -79,7 +79,7 @@ class BOTAN_DLL PK_Encryptor private: virtual std::vector<byte> enc(const byte[], size_t, - RandomNumberGenerator&) const = 0; + RandomNumberGenerator&) const = 0; }; /** @@ -384,7 +384,6 @@ class BOTAN_DLL PK_Key_Agreement PK_Key_Agreement(const Private_Key& key, const std::string& kdf); private: std::unique_ptr<PK_Ops::Key_Agreement> m_op; - std::unique_ptr<KDF> m_kdf; }; /** @@ -407,7 +406,6 @@ class BOTAN_DLL PK_Encryptor_EME : public PK_Encryptor RandomNumberGenerator& rng) const; std::unique_ptr<PK_Ops::Encryption> m_op; - std::unique_ptr<EME> m_eme; }; /** @@ -427,7 +425,6 @@ class BOTAN_DLL PK_Decryptor_EME : public PK_Decryptor secure_vector<byte> dec(const byte[], size_t) const; std::unique_ptr<PK_Ops::Decryption> m_op; - std::unique_ptr<EME> m_eme; }; } |