minor code cleanup

randombit · Sep 11, 2024 · e89338c · e89338c
1 parent 0550f75
commit e89338c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/lib/pubkey/gost_3410/gost_3410.cpp b/src/lib/pubkey/gost_3410/gost_3410.cpp
@@ -198,14 +198,16 @@ PK_Signature_Options gost_hash_from_algid(const AlgorithmIdentifier& alg_id) {
 * GOST-34.10 verification operation
 */
 class GOST_3410_Verification_Operation final : public PK_Ops::Verification_with_Hash {
+   private:
+      GOST_3410_Verification_Operation(const GOST_3410_PublicKey& gost, PK_Signature_Options&& options) :
+            PK_Ops::Verification_with_Hash(options), m_group(gost.domain()), m_gy_mul(gost._public_key()) {}
+
    public:
       GOST_3410_Verification_Operation(const GOST_3410_PublicKey& gost, PK_Signature_Options& options) :
             PK_Ops::Verification_with_Hash(options), m_group(gost.domain()), m_gy_mul(gost._public_key()) {}
 
       GOST_3410_Verification_Operation(const GOST_3410_PublicKey& gost, const AlgorithmIdentifier& alg_id) :
-            PK_Ops::Verification_with_Hash(gost_hash_from_algid(alg_id)),
-            m_group(gost.domain()),
-            m_gy_mul(gost._public_key()) {}
+            GOST_3410_Verification_Operation(gost, gost_hash_from_algid(alg_id)) {}
 
       bool verify(std::span<const uint8_t> msg, std::span<const uint8_t> sig) override;
 

diff --git a/src/lib/pubkey/pk_ops_impl.h b/src/lib/pubkey/pk_ops_impl.h
@@ -60,8 +60,6 @@ class Verification_with_Hash : public Verification {
    protected:
       explicit Verification_with_Hash(PK_Signature_Options& options);
 
-      explicit Verification_with_Hash(PK_Signature_Options&& options) : Verification_with_Hash(options) {}
-
       explicit Verification_with_Hash(const AlgorithmIdentifier& alg_id,
                                       std::string_view pk_algo,
                                       bool allow_null_parameters = false);
@@ -89,8 +87,6 @@ class Signature_with_Hash : public Signature {
    protected:
       explicit Signature_with_Hash(PK_Signature_Options& options);
 
-      explicit Signature_with_Hash(PK_Signature_Options&& options) : Signature_with_Hash(options) {}
-
       std::string hash_function() const final { return m_hash->name(); }
 
 #if defined(BOTAN_HAS_RFC6979_GENERATOR)