diff options
| author | lloyd <[email protected]> | 2009-11-13 22:51:01 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-11-13 22:51:01 +0000 |
| commit | 0972ba645555b0bf283eba71e4b9edacdf424eba (patch) | |
| tree | ec5c59370b7ded3e0cc4e057601bad9df0d5d815 /src/pubkey | |
| parent | 1860807e4ed230f3aeea0831ec180e55d2f0eaa4 (diff) | |
| parent | be9b28137b0de48d3f86c96655fa1bbc5c70973c (diff) | |
propagate from branch 'net.randombit.botan' (head ac888e57b614c623590d79ab615353ad7c76ef68)
to branch 'net.randombit.botan.c++0x' (head 9bf78ed7e2521a328f6db7acbc1cd81b07718230)
Diffstat (limited to 'src/pubkey')
| -rw-r--r-- | src/pubkey/ecdsa/ecdsa.h | 5 | ||||
| -rw-r--r-- | src/pubkey/eckaeg/eckaeg.h | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/pubkey/ecdsa/ecdsa.h b/src/pubkey/ecdsa/ecdsa.h index 379445777..a6a77f3e6 100644 --- a/src/pubkey/ecdsa/ecdsa.h +++ b/src/pubkey/ecdsa/ecdsa.h @@ -85,7 +85,7 @@ class BOTAN_DLL ECDSA_PublicKey : public virtual EC_PublicKey, protected: void X509_load_hook(); - virtual void set_all_values(const ECDSA_PublicKey& other); + void set_all_values(const ECDSA_PublicKey& other); ECDSA_Core m_ecdsa_core; }; @@ -134,9 +134,8 @@ class BOTAN_DLL ECDSA_PrivateKey : public ECDSA_PublicKey, */ virtual void affirm_init() const; - protected: - virtual void set_all_values(const ECDSA_PrivateKey& other); private: + void set_all_values(const ECDSA_PrivateKey& other); void PKCS8_load_hook(bool = false); }; diff --git a/src/pubkey/eckaeg/eckaeg.h b/src/pubkey/eckaeg/eckaeg.h index 053a40e4f..b8c164967 100644 --- a/src/pubkey/eckaeg/eckaeg.h +++ b/src/pubkey/eckaeg/eckaeg.h @@ -68,9 +68,10 @@ class BOTAN_DLL ECKAEG_PublicKey : public virtual EC_PublicKey protected: void X509_load_hook(); - virtual void set_all_values(const ECKAEG_PublicKey& other); ECKAEG_Core m_eckaeg_core; + private: + void set_all_values(const ECKAEG_PublicKey& other); }; /** @@ -128,8 +129,8 @@ class BOTAN_DLL ECKAEG_PrivateKey : public ECKAEG_PublicKey, */ virtual void affirm_init() const; - protected: - virtual void set_all_values(const ECKAEG_PrivateKey& other); + private: + void set_all_values(const ECKAEG_PrivateKey& other); }; } |