diff options
Diffstat (limited to 'src/lib/pubkey/xmss')
| -rw-r--r-- | src/lib/pubkey/xmss/xmss_privatekey.h | 2 | ||||
| -rw-r--r-- | src/lib/pubkey/xmss/xmss_publickey.h | 9 | ||||
| -rw-r--r-- | src/lib/pubkey/xmss/xmss_wots_addressed_privatekey.h | 4 | ||||
| -rw-r--r-- | src/lib/pubkey/xmss/xmss_wots_addressed_publickey.h | 4 | ||||
| -rw-r--r-- | src/lib/pubkey/xmss/xmss_wots_privatekey.h | 2 | ||||
| -rw-r--r-- | src/lib/pubkey/xmss/xmss_wots_publickey.h | 4 |
6 files changed, 12 insertions, 13 deletions
diff --git a/src/lib/pubkey/xmss/xmss_privatekey.h b/src/lib/pubkey/xmss/xmss_privatekey.h index 2fa9bd655..79959c247 100644 --- a/src/lib/pubkey/xmss/xmss_privatekey.h +++ b/src/lib/pubkey/xmss/xmss_privatekey.h @@ -203,7 +203,7 @@ class BOTAN_DLL XMSS_PrivateKey : public virtual XMSS_PublicKey, const std::string&, const std::string& provider) const override; - virtual secure_vector<byte> pkcs8_private_key() const override + virtual secure_vector<byte> private_key_bits() const override { return raw_private_key(); } diff --git a/src/lib/pubkey/xmss/xmss_publickey.h b/src/lib/pubkey/xmss/xmss_publickey.h index b8aa8d920..23c8032c2 100644 --- a/src/lib/pubkey/xmss/xmss_publickey.h +++ b/src/lib/pubkey/xmss/xmss_publickey.h @@ -216,13 +216,12 @@ class BOTAN_DLL XMSS_PublicKey : public virtual Public_Key } /** - * Currently x509 is not suppoerted for XMSS. x509_subject_public_key() - * returns a raw byte sequence as defined in [1]. This method acts as - * alias for raw_public_key(). + * Returns a raw byte sequence as defined in [1]. + * This method acts as an alias for raw_public_key(). * - * @return raw non x509 compliant public key. + * @return raw public key bits. **/ - virtual std::vector<byte> x509_subject_public_key() const override + virtual std::vector<byte> public_key_bits() const override { return raw_public_key(); } diff --git a/src/lib/pubkey/xmss/xmss_wots_addressed_privatekey.h b/src/lib/pubkey/xmss/xmss_wots_addressed_privatekey.h index e82cd1638..deb5d7f87 100644 --- a/src/lib/pubkey/xmss/xmss_wots_addressed_privatekey.h +++ b/src/lib/pubkey/xmss/xmss_wots_addressed_privatekey.h @@ -54,9 +54,9 @@ class XMSS_WOTS_Addressed_PrivateKey return m_priv_key.pkcs8_algorithm_identifier(); } - virtual secure_vector<byte> pkcs8_private_key() const override + virtual secure_vector<byte> private_key_bits() const override { - return m_priv_key.pkcs8_private_key(); + return m_priv_key.private_key_bits(); } private: diff --git a/src/lib/pubkey/xmss/xmss_wots_addressed_publickey.h b/src/lib/pubkey/xmss/xmss_wots_addressed_publickey.h index a07b0b803..74e686f9f 100644 --- a/src/lib/pubkey/xmss/xmss_wots_addressed_publickey.h +++ b/src/lib/pubkey/xmss/xmss_wots_addressed_publickey.h @@ -82,9 +82,9 @@ class XMSS_WOTS_Addressed_PublicKey : public virtual Public_Key return m_pub_key.estimated_strength(); } - virtual std::vector<byte> x509_subject_public_key() const override + virtual std::vector<byte> public_key_bits() const override { - return m_pub_key.x509_subject_public_key(); + return m_pub_key.public_key_bits(); } protected: diff --git a/src/lib/pubkey/xmss/xmss_wots_privatekey.h b/src/lib/pubkey/xmss/xmss_wots_privatekey.h index 158bad1bb..cf84fd076 100644 --- a/src/lib/pubkey/xmss/xmss_wots_privatekey.h +++ b/src/lib/pubkey/xmss/xmss_wots_privatekey.h @@ -226,7 +226,7 @@ class BOTAN_DLL XMSS_WOTS_PrivateKey : public virtual XMSS_WOTS_PublicKey, const std::string&, const std::string& provider) const override; - virtual secure_vector<byte> pkcs8_private_key() const override + virtual secure_vector<byte> private_key_bits() const override { throw Not_Implemented("No PKCS8 key format defined for XMSS-WOTS."); } diff --git a/src/lib/pubkey/xmss/xmss_wots_publickey.h b/src/lib/pubkey/xmss/xmss_wots_publickey.h index afb0ac847..4f414de27 100644 --- a/src/lib/pubkey/xmss/xmss_wots_publickey.h +++ b/src/lib/pubkey/xmss/xmss_wots_publickey.h @@ -261,9 +261,9 @@ class BOTAN_DLL XMSS_WOTS_PublicKey : virtual public Public_Key return m_wots_params.estimated_strength(); } - virtual std::vector<byte> x509_subject_public_key() const override + virtual std::vector<byte> public_key_bits() const override { - throw Not_Implemented("No x509 key format defined for XMSS-WOTS."); + throw Not_Implemented("No key format defined for XMSS-WOTS"); } bool operator==(const XMSS_WOTS_PublicKey& key) |