11376677396

Committed 17 Oct 2024 12:10AM UTC coverage: 91.125% (+0.006%) from 91.119%

Build # 11376677396

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #4378 from randombit/jack/speed-cleanup

Cleanups after refactoring of speed cli

Run Details

90992 of 99854 relevant lines covered (91.13%)

9363281.76 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

98.15

/src/cli/perf_pk_ka.cpp

/*
* (C) 2024 Jack Lloyd
*
* Botan is released under the Simplified BSD License (see license.txt)
*/

#include "perf.h"

#if defined(BOTAN_HAS_PUBLIC_KEY_CRYPTO)
   #include <botan/pk_algs.h>
   #include <botan/pubkey.h>
#endif

namespace Botan_CLI {

#if defined(BOTAN_HAS_PUBLIC_KEY_CRYPTO)

class PerfTest_PKKa : public PerfTest {
   public:
      virtual std::string algo() const = 0;

      virtual std::vector<std::string> keygen_params(const PerfConfig& config) const {
         BOTAN_UNUSED(config);
         return {""};
      }

      void go(const PerfConfig& config) override {
         const std::string alg = this->algo();

         const auto params = this->keygen_params(config);

         for(const auto& param : params) {
            const std::string nm = this->format_name(alg, param);
            bench_pk_ka(config, nm, alg, param);
         }
      }

      void bench_pk_ka(const PerfConfig& config,
                       const std::string& nm,
                       const std::string& algo,
                       const std::string& params,
                       const std::string& provider = "") {
         const auto msec = config.runtime();

         const std::string kdf = "KDF2(SHA-256)";  // arbitrary choice

         auto keygen_timer = config.make_timer(nm, 1, "keygen");

         auto& rng = config.rng();

         auto key1 = keygen_timer->run([&] { return Botan::create_private_key(algo, rng, params); });
         auto key2 = keygen_timer->run([&] { return Botan::create_private_key(algo, rng, params); });

         config.record_result(*keygen_timer);

         const Botan::PK_Key_Agreement_Key& ka_key1 = dynamic_cast<const Botan::PK_Key_Agreement_Key&>(*key1);
         const Botan::PK_Key_Agreement_Key& ka_key2 = dynamic_cast<const Botan::PK_Key_Agreement_Key&>(*key2);

         Botan::PK_Key_Agreement ka1(ka_key1, rng, kdf, provider);
         Botan::PK_Key_Agreement ka2(ka_key2, rng, kdf, provider);

         const std::vector<uint8_t> ka1_pub = ka_key1.public_value();
         const std::vector<uint8_t> ka2_pub = ka_key2.public_value();

         auto ka_timer = config.make_timer(nm, 1, "key agreements");

         while(ka_timer->under(msec)) {
            auto k1 = ka_timer->run([&]() { return ka1.derive_key(32, ka2_pub); });
            auto k2 = ka_timer->run([&]() { return ka2.derive_key(32, ka1_pub); });

            if(k1 != k2) {
               config.error_output() << "Key agreement mismatch in PK bench\n";
            }
         }

         config.record_result(*ka_timer);
      }
};

#endif

#if defined(BOTAN_HAS_DIFFIE_HELLMAN)

class PerfTest_DH final : public PerfTest_PKKa {
   public:
      std::string algo() const override { return "DH"; }

      std::vector<std::string> keygen_params(const PerfConfig& config) const override {
         BOTAN_UNUSED(config);
         return {
            "ffdhe/ietf/2048",
            "ffdhe/ietf/3072",
            "ffdhe/ietf/4096",
            "ffdhe/ietf/6144",
            "ffdhe/ietf/8192",
         };
      }

      std::string format_name(const std::string& alg, const std::string& param) const override {
         return Botan::fmt("{}-{}", alg, param.substr(param.find_last_of('/') + 1));
      }
};

BOTAN_REGISTER_PERF_TEST("DH", PerfTest_DH);

#endif

#if defined(BOTAN_HAS_ECDH)

class PerfTest_ECDH final : public PerfTest_PKKa {
   public:
      std::string algo() const override { return "ECDH"; }

      std::vector<std::string> keygen_params(const PerfConfig& config) const override { return config.ecc_groups(); }
};

BOTAN_REGISTER_PERF_TEST("ECDH", PerfTest_ECDH);

#endif

#if defined(BOTAN_HAS_X25519)

class PerfTest_X25519 final : public PerfTest_PKKa {
   public:
      std::string algo() const override { return "X25519"; }
};

BOTAN_REGISTER_PERF_TEST("X25519", PerfTest_X25519);

#endif

#if defined(BOTAN_HAS_X448)

class PerfTest_X448 final : public PerfTest_PKKa {
   public:
      std::string algo() const override { return "X448"; }
};

BOTAN_REGISTER_PERF_TEST("X448", PerfTest_X448);

#endif

}  // namespace Botan_CLI

1	/*
2	* (C) 2024 Jack Lloyd
3	*
4	* Botan is released under the Simplified BSD License (see license.txt)
5	*/
6
7	#include "perf.h"
8
9	#if defined(BOTAN_HAS_PUBLIC_KEY_CRYPTO)
10	#include <botan/pk_algs.h>
11	#include <botan/pubkey.h>
12	#endif
13
14	namespace Botan_CLI {
15
16	#if defined(BOTAN_HAS_PUBLIC_KEY_CRYPTO)
17
18	class PerfTest_PKKa : public PerfTest {	4✔
19	public:
20	virtual std::string algo() const = 0;
21
22	virtual std::vector<std::string> keygen_params(const PerfConfig& config) const {	2✔
23	BOTAN_UNUSED(config);	2✔
24	return {""};	2✔
25	}
26
27	void go(const PerfConfig& config) override {	4✔
28	const std::string alg = this->algo();	4✔
29
30	const auto params = this->keygen_params(config);	4✔
31
32	for(const auto& param : params) {	17✔
33	const std::string nm = this->format_name(alg, param);	13✔
34	bench_pk_ka(config, nm, alg, param);	26✔
35	}	13✔
36	}	4✔
37
38	void bench_pk_ka(const PerfConfig& config,	13✔
39	const std::string& nm,
40	const std::string& algo,
41	const std::string& params,
42	const std::string& provider = "") {
43	const auto msec = config.runtime();	13✔
44
45	const std::string kdf = "KDF2(SHA-256)"; // arbitrary choice	13✔
46
47	auto keygen_timer = config.make_timer(nm, 1, "keygen");	26✔
48
49	auto& rng = config.rng();	13✔
50
51	auto key1 = keygen_timer->run([&] { return Botan::create_private_key(algo, rng, params); });	26✔
52	auto key2 = keygen_timer->run([&] { return Botan::create_private_key(algo, rng, params); });	26✔
53
54	config.record_result(*keygen_timer);	13✔
55
56	const Botan::PK_Key_Agreement_Key& ka_key1 = dynamic_cast<const Botan::PK_Key_Agreement_Key&>(*key1);	13✔
57	const Botan::PK_Key_Agreement_Key& ka_key2 = dynamic_cast<const Botan::PK_Key_Agreement_Key&>(*key2);	13✔
58
59	Botan::PK_Key_Agreement ka1(ka_key1, rng, kdf, provider);	13✔
60	Botan::PK_Key_Agreement ka2(ka_key2, rng, kdf, provider);	13✔
61
62	const std::vector<uint8_t> ka1_pub = ka_key1.public_value();	13✔
63	const std::vector<uint8_t> ka2_pub = ka_key2.public_value();	13✔
64
65	auto ka_timer = config.make_timer(nm, 1, "key agreements");	26✔
66
67	while(ka_timer->under(msec)) {	31✔
68	auto k1 = ka_timer->run([&]() { return ka1.derive_key(32, ka2_pub); });	36✔
69	auto k2 = ka_timer->run([&]() { return ka2.derive_key(32, ka1_pub); });	36✔
70
71	if(k1 != k2) {	18✔
72	config.error_output() << "Key agreement mismatch in PK bench\n";	×
73	}
74	}	36✔
75
76	config.record_result(*ka_timer);	13✔
77	}	65✔
78	};
79
80	#endif
81
82	#if defined(BOTAN_HAS_DIFFIE_HELLMAN)
83
84	class PerfTest_DH final : public PerfTest_PKKa {	1✔
85	public:
86	std::string algo() const override { return "DH"; }	1✔
87
88	std::vector<std::string> keygen_params(const PerfConfig& config) const override {	1✔
89	BOTAN_UNUSED(config);	1✔
90	return {	1✔
91	"ffdhe/ietf/2048",
92	"ffdhe/ietf/3072",
93	"ffdhe/ietf/4096",
94	"ffdhe/ietf/6144",
95	"ffdhe/ietf/8192",
96	};	1✔
97	}
98
99	std::string format_name(const std::string& alg, const std::string& param) const override {	5✔
100	return Botan::fmt("{}-{}", alg, param.substr(param.find_last_of('/') + 1));	10✔
101	}
102	};
103
104	BOTAN_REGISTER_PERF_TEST("DH", PerfTest_DH);	1✔
105
106	#endif
107
108	#if defined(BOTAN_HAS_ECDH)
109
110	class PerfTest_ECDH final : public PerfTest_PKKa {	1✔
111	public:
112	std::string algo() const override { return "ECDH"; }	1✔
113
114	std::vector<std::string> keygen_params(const PerfConfig& config) const override { return config.ecc_groups(); }	1✔
115	};
116
117	BOTAN_REGISTER_PERF_TEST("ECDH", PerfTest_ECDH);	1✔
118
119	#endif
120
121	#if defined(BOTAN_HAS_X25519)
122
123	class PerfTest_X25519 final : public PerfTest_PKKa {	1✔
124	public:
125	std::string algo() const override { return "X25519"; }	1✔
126	};
127
128	BOTAN_REGISTER_PERF_TEST("X25519", PerfTest_X25519);	1✔
129
130	#endif
131
132	#if defined(BOTAN_HAS_X448)
133
134	class PerfTest_X448 final : public PerfTest_PKKa {	1✔
135	public:
136	std::string algo() const override { return "X448"; }	1✔
137	};
138
139	BOTAN_REGISTER_PERF_TEST("X448", PerfTest_X448);	1✔
140
141	#endif
142
143	} // namespace Botan_CLI

randombit / botan / 11376677396

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous