Merge pull request #4956 from randombit/jack/fix-clang-tidy-cppcoreguidelines-slicing

Enable and fix clang-tidy warning cppcoreguidelines-slicing

Author: randombit

src/.clang-tidy

@@ -25,7 +25,6 @@ Checks: >
     -cppcoreguidelines-init-variables,
     -cppcoreguidelines-owning-memory,
     -cppcoreguidelines-prefer-member-initializer,
-    -cppcoreguidelines-slicing,
     -hicpp-explicit-conversions,
     -misc-const-correctness,
     -misc-include-cleaner,

src/cli/timing_tests.cpp

@@ -141,8 +141,8 @@ class Bleichenbacker_Timing_Test final : public Timing_Test {
    public:
       explicit Bleichenbacker_Timing_Test(size_t keysize) :
             m_privkey(timing_test_rng(), keysize),
-            m_pubkey(m_privkey),
-            m_enc(m_pubkey, timing_test_rng(), "Raw"),
+            m_pubkey(m_privkey.public_key()),
+            m_enc(*m_pubkey, timing_test_rng(), "Raw"),
             m_dec(m_privkey, timing_test_rng(), "PKCS1v15") {}
 
       std::vector<uint8_t> prepare_input(const std::string& input) override {
@@ -160,7 +160,7 @@ class Bleichenbacker_Timing_Test final : public Timing_Test {
       const size_t m_expected_content_size = 48;
       const size_t m_ctext_length = 256;
       Botan::RSA_PrivateKey m_privkey;
-      Botan::RSA_PublicKey m_pubkey;
+      std::unique_ptr<Botan::Public_Key> m_pubkey;
       Botan::PK_Encryptor_EME m_enc;
       Botan::PK_Decryptor_EME m_dec;
 };
@@ -180,8 +180,8 @@ class Manger_Timing_Test final : public Timing_Test {
    public:
       explicit Manger_Timing_Test(size_t keysize) :
             m_privkey(timing_test_rng(), keysize),
-            m_pubkey(m_privkey),
-            m_enc(m_pubkey, timing_test_rng(), m_encrypt_padding),
+            m_pubkey(m_privkey.public_key()),
+            m_enc(*m_pubkey, timing_test_rng(), m_encrypt_padding),
             m_dec(m_privkey, timing_test_rng(), m_decrypt_padding) {}
 
       std::vector<uint8_t> prepare_input(const std::string& input) override {
@@ -202,7 +202,7 @@ class Manger_Timing_Test final : public Timing_Test {
       const std::string m_decrypt_padding = "EME1(SHA-256)";
       const size_t m_ctext_length = 256;
       Botan::RSA_PrivateKey m_privkey;
-      Botan::RSA_PublicKey m_pubkey;
+      std::unique_ptr<Botan::Public_Key> m_pubkey;
       Botan::PK_Encryptor_EME m_enc;
       Botan::PK_Decryptor_EME m_dec;
 };

src/lib/pubkey/ecies/ecies.cpp

@@ -23,6 +23,8 @@ namespace {
 
 /**
 * Private key type for ECIES_ECDH_KA_Operation
+*
+* TODO(Botan4) this can be removed once cofactor support is removed from ECDH
 */
 
 BOTAN_DIAGNOSTIC_PUSH
@@ -32,6 +34,7 @@ class ECIES_PrivateKey final : public EC_PrivateKey,
                                public PK_Key_Agreement_Key {
    public:
       explicit ECIES_PrivateKey(const ECDH_PrivateKey& private_key) :
+            // NOLINTNEXTLINE(*-slicing)
             EC_PublicKey(private_key), EC_PrivateKey(private_key), PK_Key_Agreement_Key(), m_key(private_key) {}
 
       std::vector<uint8_t> public_value() const override { return m_key.public_value(); }

src/lib/pubkey/hss_lms/lm_ots.cpp

@@ -307,7 +307,7 @@ void LMOTS_Private_Key::derive_random_C(std::span<uint8_t> out, HashFunction& ha
    gen.gen(out, hash, m_seed);
 }
 
-LMOTS_Public_Key::LMOTS_Public_Key(const LMOTS_Private_Key& lmots_sk) : OTS_Instance(lmots_sk) {
+LMOTS_Public_Key::LMOTS_Public_Key(const LMOTS_Private_Key& lmots_sk) : /* NOLINT(*-slicing) */ OTS_Instance(lmots_sk) {
    const auto pk_hash = lmots_sk.params().hash();
    pk_hash->update(lmots_sk.identifier());
    pk_hash->update(store_be(lmots_sk.q()));

src/lib/pubkey/hss_lms/lms.cpp

@@ -345,7 +345,8 @@ LMS_Signature LMS_Signature::from_bytes_or_throw(BufferSlicer& slicer) {
    return LMS_Signature(q, std::move(lmots_sig), lms_type, std::move(auth_path));
 }
 
-LMS_PublicKey::LMS_PublicKey(const LMS_PrivateKey& sk) : LMS_Instance(sk), m_lms_root(sk.lms_params().m()) {
+LMS_PublicKey::LMS_PublicKey(const LMS_PrivateKey& sk) :
+      /* NOLINT(*-slicing) */ LMS_Instance(sk), m_lms_root(sk.lms_params().m()) {
    lms_treehash(StrongSpan<LMS_Tree_Node>(m_lms_root), std::nullopt, std::nullopt, sk);
 }
 

src/scripts/dev_tools/run_clang_tidy.py

@@ -55,7 +55,6 @@
     'cppcoreguidelines-init-variables',
     'cppcoreguidelines-owning-memory',
     'cppcoreguidelines-prefer-member-initializer',
-    'cppcoreguidelines-slicing', # private->public key slicing
     'hicpp-explicit-conversions',
     'misc-const-correctness', # pretty noisy
     'misc-include-cleaner',

src/tests/test_xmss.cpp

@@ -275,7 +275,7 @@ std::vector<Test::Result> xmss_legacy_private_key() {
       "A5E22C249FA9D1E7DA08DB351709C4");
 
    Botan::XMSS_PrivateKey legacy_secret_key = Botan::XMSS_PrivateKey(legacy_xmss_private_key);
-   Botan::XMSS_PublicKey public_key_from_secret_key(legacy_secret_key);
+   auto public_key_from_secret_key = legacy_secret_key.public_key();
    Botan::XMSS_PublicKey legacy_public_key = Botan::XMSS_PublicKey(legacy_xmss_public_key);
 
    const auto message = Botan::hex_decode("deadcafe");
@@ -289,14 +289,14 @@ std::vector<Test::Result> xmss_legacy_private_key() {
                Botan::PK_Signer signer(legacy_secret_key, *rng, algo_name);
                auto signature = signer.sign_message(message, *rng);
 
-               Botan::PK_Verifier verifier(public_key_from_secret_key, algo_name);
+               Botan::PK_Verifier verifier(*public_key_from_secret_key, algo_name);
                result.confirm("legacy private key generates signatures that are still verifiable",
                               verifier.verify_message(message, signature));
             }),
 
       CHECK("Verify a legacy signature",
             [&](auto& result) {
-               Botan::PK_Verifier verifier(public_key_from_secret_key, algo_name);
+               Botan::PK_Verifier verifier(*public_key_from_secret_key, algo_name);
                result.confirm("legacy private key generates signatures that are still verifiable",
                               verifier.verify_message(message, legacy_signature));
             }),