diff options
| -rw-r--r-- | include/dh.h | 4 | ||||
| -rw-r--r-- | include/dsa.h | 6 | ||||
| -rw-r--r-- | include/elgamal.h | 9 | ||||
| -rw-r--r-- | include/nr.h | 6 | ||||
| -rw-r--r-- | include/rsa.h | 10 | ||||
| -rw-r--r-- | include/rw.h | 6 |
6 files changed, 20 insertions, 21 deletions
diff --git a/include/dh.h b/include/dh.h index 3c55ef8d4..7aac233ab 100644 --- a/include/dh.h +++ b/include/dh.h @@ -34,8 +34,8 @@ class BOTAN_DLL DH_PublicKey : public virtual DL_Scheme_PublicKey * Diffie-Hellman Private Key * *************************************************/ class BOTAN_DLL DH_PrivateKey : public DH_PublicKey, - public PK_Key_Agreement_Key, - public virtual DL_Scheme_PrivateKey + public PK_Key_Agreement_Key, + public virtual DL_Scheme_PrivateKey { public: SecureVector<byte> derive_key(const byte[], u32bit) const; diff --git a/include/dsa.h b/include/dsa.h index 83c92572e..a858374e6 100644 --- a/include/dsa.h +++ b/include/dsa.h @@ -15,7 +15,7 @@ namespace Botan { * DSA Public Key * *************************************************/ class BOTAN_DLL DSA_PublicKey : public PK_Verifying_wo_MR_Key, - public virtual DL_Scheme_PublicKey + public virtual DL_Scheme_PublicKey { public: std::string algo_name() const { return "DSA"; } @@ -39,8 +39,8 @@ class BOTAN_DLL DSA_PublicKey : public PK_Verifying_wo_MR_Key, * DSA Private Key * *************************************************/ class BOTAN_DLL DSA_PrivateKey : public DSA_PublicKey, - public PK_Signing_Key, - public virtual DL_Scheme_PrivateKey + public PK_Signing_Key, + public virtual DL_Scheme_PrivateKey { public: SecureVector<byte> sign(const byte[], u32bit) const; diff --git a/include/elgamal.h b/include/elgamal.h index bf9199fac..90fd8c77a 100644 --- a/include/elgamal.h +++ b/include/elgamal.h @@ -15,16 +15,15 @@ namespace Botan { * ElGamal Public Key * *************************************************/ class BOTAN_DLL ElGamal_PublicKey : public PK_Encrypting_Key, - public virtual DL_Scheme_PublicKey + public virtual DL_Scheme_PublicKey { public: std::string algo_name() const { return "ElGamal"; } + DL_Group::Format group_format() const { return DL_Group::ANSI_X9_42; } SecureVector<byte> encrypt(const byte[], u32bit) const; u32bit max_input_bits() const; - DL_Group::Format group_format() const { return DL_Group::ANSI_X9_42; } - ElGamal_PublicKey() {} ElGamal_PublicKey(const DL_Group&, const BigInt&); protected: @@ -37,8 +36,8 @@ class BOTAN_DLL ElGamal_PublicKey : public PK_Encrypting_Key, * ElGamal Private Key * *************************************************/ class BOTAN_DLL ElGamal_PrivateKey : public ElGamal_PublicKey, - public PK_Decrypting_Key, - public virtual DL_Scheme_PrivateKey + public PK_Decrypting_Key, + public virtual DL_Scheme_PrivateKey { public: SecureVector<byte> decrypt(const byte[], u32bit) const; diff --git a/include/nr.h b/include/nr.h index 47c91dc6e..0f5e1d677 100644 --- a/include/nr.h +++ b/include/nr.h @@ -15,7 +15,7 @@ namespace Botan { * Nyberg-Rueppel Public Key * *************************************************/ class BOTAN_DLL NR_PublicKey : public PK_Verifying_with_MR_Key, - public virtual DL_Scheme_PublicKey + public virtual DL_Scheme_PublicKey { public: std::string algo_name() const { return "NR"; } @@ -39,8 +39,8 @@ class BOTAN_DLL NR_PublicKey : public PK_Verifying_with_MR_Key, * Nyberg-Rueppel Private Key * *************************************************/ class BOTAN_DLL NR_PrivateKey : public NR_PublicKey, - public PK_Signing_Key, - public virtual DL_Scheme_PrivateKey + public PK_Signing_Key, + public virtual DL_Scheme_PrivateKey { public: SecureVector<byte> sign(const byte[], u32bit) const; diff --git a/include/rsa.h b/include/rsa.h index 16408c471..e9f92db51 100644 --- a/include/rsa.h +++ b/include/rsa.h @@ -14,8 +14,8 @@ namespace Botan { * RSA Public Key * *************************************************/ class BOTAN_DLL RSA_PublicKey : public PK_Encrypting_Key, - public PK_Verifying_with_MR_Key, - public virtual IF_Scheme_PublicKey + public PK_Verifying_with_MR_Key, + public virtual IF_Scheme_PublicKey { public: std::string algo_name() const { return "RSA"; } @@ -33,9 +33,9 @@ class BOTAN_DLL RSA_PublicKey : public PK_Encrypting_Key, * RSA Private Key * *************************************************/ class BOTAN_DLL RSA_PrivateKey : public RSA_PublicKey, - public PK_Decrypting_Key, - public PK_Signing_Key, - public IF_Scheme_PrivateKey + public PK_Decrypting_Key, + public PK_Signing_Key, + public IF_Scheme_PrivateKey { public: SecureVector<byte> decrypt(const byte[], u32bit) const; diff --git a/include/rw.h b/include/rw.h index 0d22711df..a809041d1 100644 --- a/include/rw.h +++ b/include/rw.h @@ -14,7 +14,7 @@ namespace Botan { * Rabin-Williams Public Key * *************************************************/ class BOTAN_DLL RW_PublicKey : public PK_Verifying_with_MR_Key, - public virtual IF_Scheme_PublicKey + public virtual IF_Scheme_PublicKey { public: std::string algo_name() const { return "RW"; } @@ -31,8 +31,8 @@ class BOTAN_DLL RW_PublicKey : public PK_Verifying_with_MR_Key, * Rabin-Williams Private Key * *************************************************/ class BOTAN_DLL RW_PrivateKey : public RW_PublicKey, - public PK_Signing_Key, - public IF_Scheme_PrivateKey + public PK_Signing_Key, + public IF_Scheme_PrivateKey { public: SecureVector<byte> sign(const byte[], u32bit) const; |