10 files changed, 13 insertions, 14 deletions
diff --git a/src/lib/pubkey/xmss/atomic.h b/src/lib/pubkey/xmss/atomic.h
index cf3f5528c..e2fdaa78d 100644
--- a/src/lib/pubkey/xmss/atomic.h
+++ b/src/lib/pubkey/xmss/atomic.h
@@ -23,9 +23,10 @@ template <typename T>
 class Atomic
    {
    public:
-      Atomic() : m_data() {};
+      Atomic() = default;
       Atomic(const Atomic& data) : m_data(data.m_data.load()) {}
       Atomic(const std::atomic<T>& data) : m_data(data.load()) {}
+      ~Atomic() = default;
 
       Atomic& operator=(const Atomic& a)
          {
diff --git a/src/lib/pubkey/xmss/xmss_common_ops.h b/src/lib/pubkey/xmss/xmss_common_ops.h
index 26cb27d26..2aff9b5f8 100644
--- a/src/lib/pubkey/xmss/xmss_common_ops.h
+++ b/src/lib/pubkey/xmss/xmss_common_ops.h
@@ -26,7 +26,7 @@ class XMSS_Common_Ops
    {
    public:
       XMSS_Common_Ops(XMSS_Parameters::xmss_algorithm_t oid)
-         : m_xmss_params(oid), m_hash(m_xmss_params.hash_function_name()) {};
+         : m_xmss_params(oid), m_hash(m_xmss_params.hash_function_name()) {}
 
    protected:
       /**
diff --git a/src/lib/pubkey/xmss/xmss_hash.h b/src/lib/pubkey/xmss/xmss_hash.h
index 29a6ff90e..55b5fe930 100644
--- a/src/lib/pubkey/xmss/xmss_hash.h
+++ b/src/lib/pubkey/xmss/xmss_hash.h
@@ -144,7 +144,7 @@ class XMSS_Hash
        **/
       secure_vector<uint8_t> h_msg_final();
 
-      size_t output_length() const { return m_output_length; };
+      size_t output_length() const { return m_output_length; }
 
    private:
       static const uint8_t m_id_f = 0x00;
diff --git a/src/lib/pubkey/xmss/xmss_index_registry.h b/src/lib/pubkey/xmss/xmss_index_registry.h
index decd50a8a..28701353d 100644
--- a/src/lib/pubkey/xmss/xmss_index_registry.h
+++ b/src/lib/pubkey/xmss/xmss_index_registry.h
@@ -58,8 +58,7 @@ class XMSS_Index_Registry
                                        const secure_vector<uint8_t>& prf);
 
    private:
-      XMSS_Index_Registry()
-         : m_key_ids(), m_leaf_indices(), m_mutex() {}
+      XMSS_Index_Registry() = default;
 
       static const std::string m_index_hash_function;
 
diff --git a/src/lib/pubkey/xmss/xmss_signature.h b/src/lib/pubkey/xmss/xmss_signature.h
index 001465e64..0e6dccc9e 100644
--- a/src/lib/pubkey/xmss/xmss_signature.h
+++ b/src/lib/pubkey/xmss/xmss_signature.h
@@ -44,7 +44,7 @@ class XMSS_Signature
                      const secure_vector<uint8_t>& randomness,
                      const XMSS_WOTS_PublicKey::TreeSignature& tree_sig)
          : m_leaf_idx(leaf_idx), m_randomness(randomness),
-           m_tree_sig(tree_sig) {};
+           m_tree_sig(tree_sig) {}
 
       /**
        * Creates an XMSS Signature from a leaf index used for signature
@@ -58,7 +58,7 @@ class XMSS_Signature
                      secure_vector<uint8_t>&& randomness,
                      XMSS_WOTS_PublicKey::TreeSignature&& tree_sig)
          : m_leaf_idx(leaf_idx), m_randomness(std::move(randomness)),
-           m_tree_sig(std::move(tree_sig)) {};
+           m_tree_sig(std::move(tree_sig)) {}
 
       size_t unused_leaf_index() const { return m_leaf_idx; }
       void set_unused_leaf_idx(size_t idx) { m_leaf_idx = idx; }
diff --git a/src/lib/pubkey/xmss/xmss_signature_operation.h b/src/lib/pubkey/xmss/xmss_signature_operation.h
index 67c2f5e71..e2393750a 100644
--- a/src/lib/pubkey/xmss/xmss_signature_operation.h
+++ b/src/lib/pubkey/xmss/xmss_signature_operation.h
@@ -38,7 +38,7 @@ class XMSS_Signature_Operation : public virtual PK_Ops::Signature,
    {
    public:
       XMSS_Signature_Operation(const XMSS_PrivateKey& private_key);
-      virtual ~XMSS_Signature_Operation() {}
+      virtual ~XMSS_Signature_Operation() = default;
 
       /**
        * Creates an XMSS signature for the message provided through call to
diff --git a/src/lib/pubkey/xmss/xmss_verification_operation.h b/src/lib/pubkey/xmss/xmss_verification_operation.h
index c3682c0ad..a967fd0ea 100644
--- a/src/lib/pubkey/xmss/xmss_verification_operation.h
+++ b/src/lib/pubkey/xmss/xmss_verification_operation.h
@@ -33,7 +33,7 @@ namespace Botan {
       XMSS_Verification_Operation(
          const XMSS_PublicKey& public_key);
 
-      virtual ~XMSS_Verification_Operation() {}
+      virtual ~XMSS_Verification_Operation() = default;
 
       virtual bool is_valid_signature(const uint8_t sig[],
                                       size_t sig_len) override;
diff --git a/src/lib/pubkey/xmss/xmss_wots_publickey.h b/src/lib/pubkey/xmss/xmss_wots_publickey.h
index 5d973fd6a..eb2f9695b 100644
--- a/src/lib/pubkey/xmss/xmss_wots_publickey.h
+++ b/src/lib/pubkey/xmss/xmss_wots_publickey.h
@@ -35,8 +35,7 @@ class BOTAN_DLL XMSS_WOTS_PublicKey : virtual public Public_Key
       class TreeSignature
          {
          public:
-            TreeSignature()
-               : m_ots_sig(), m_auth_path() {}
+            TreeSignature() = default;
 
             TreeSignature(const wots_keysig_t& ots_sig,
                           const wots_keysig_t& auth_path)
@@ -191,7 +190,7 @@ class BOTAN_DLL XMSS_WOTS_PublicKey : virtual public Public_Key
        * Convert the key into the raw key data. The key becomes a length
        * len vector of n-byte elements.
        **/
-      operator const wots_keysig_t& () const { return m_key; };
+      operator const wots_keysig_t& () const { return m_key; }
 
       /**
        * Convert the key into the raw key data. The key becomes a length
diff --git a/src/lib/pubkey/xmss/xmss_wots_signature_operation.h b/src/lib/pubkey/xmss/xmss_wots_signature_operation.h
index f319ac138..4656c3dd1 100644
--- a/src/lib/pubkey/xmss/xmss_wots_signature_operation.h
+++ b/src/lib/pubkey/xmss/xmss_wots_signature_operation.h
@@ -32,7 +32,7 @@ class XMSS_WOTS_Signature_Operation : public virtual PK_Ops::Signature,
       XMSS_WOTS_Signature_Operation(
          const XMSS_WOTS_Addressed_PrivateKey& private_key);
 
-      virtual ~XMSS_WOTS_Signature_Operation() {}
+      virtual ~XMSS_WOTS_Signature_Operation() = default;
 
       /**
        * Creates a XMSS WOTS signature for the message provided through call
diff --git a/src/lib/pubkey/xmss/xmss_wots_verification_operation.h b/src/lib/pubkey/xmss/xmss_wots_verification_operation.h
index 0bc5f0db9..5899e4f46 100644
--- a/src/lib/pubkey/xmss/xmss_wots_verification_operation.h
+++ b/src/lib/pubkey/xmss/xmss_wots_verification_operation.h
@@ -32,7 +32,7 @@ class XMSS_WOTS_Verification_Operation
       XMSS_WOTS_Verification_Operation(
          const XMSS_WOTS_Addressed_PublicKey& public_key);
 
-      virtual ~XMSS_WOTS_Verification_Operation() {}
+      virtual ~XMSS_WOTS_Verification_Operation() = default;
 
       virtual bool is_valid_signature(const uint8_t sig[],
                                       size_t sig_len) override;