13629762785

Committed 03 Mar 2025 11:24AM UTC coverage: 91.686% (-0.008%) from 91.694%

Build # 13629762785

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #4740 from randombit/jack/more-build-h-cleanup

Small build.h cleanups/removals

Run Details

95827 of 104516 relevant lines covered (91.69%)

11258003.53 hits per line

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

94.06

/src/tests/test_dl_group.cpp

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

#include "tests.h"

#if defined(BOTAN_HAS_DL_GROUP)
   #include <botan/dl_group.h>
   #include <botan/internal/workfactor.h>
#endif

namespace Botan_Tests {

#if defined(BOTAN_HAS_DL_GROUP)

namespace {

class DL_Group_Tests final : public Test {
   public:
      std::vector<Test::Result> run() override {
         std::vector<Test::Result> results;

         results.push_back(test_dl_encoding());
         results.push_back(test_dl_errors());

         return results;
      }

   private:
      static Test::Result test_dl_errors() {
         Test::Result result("DL_Group errors");
         result.test_throws("Uninitialized", "DL_Group uninitialized", []() {
            Botan::DL_Group dl;
            dl.get_p();
         });

         return result;
      }

      static Test::Result test_dl_encoding() {
         Test::Result result("DL_Group encoding");

         const auto orig = Botan::DL_Group::from_name("modp/ietf/1024");

         const std::string pem1 = orig.PEM_encode(Botan::DL_Group_Format::ANSI_X9_42);
         const std::string pem2 = orig.PEM_encode(Botan::DL_Group_Format::ANSI_X9_57);
         const std::string pem3 = orig.PEM_encode(Botan::DL_Group_Format::PKCS_3);

         const auto group1 = Botan::DL_Group::from_PEM(pem1);

         result.test_eq("Same p in X9.42 decoding", group1.get_p(), orig.get_p());
         result.test_eq("Same q in X9.42 decoding", group1.get_q(), orig.get_q());
         result.test_eq("Same g in X9.42 decoding", group1.get_g(), orig.get_g());

         const auto group2 = Botan::DL_Group::from_PEM(pem2);

         result.test_eq("Same p in X9.57 decoding", group2.get_p(), orig.get_p());
         result.test_eq("Same q in X9.57 decoding", group2.get_q(), orig.get_q());
         result.test_eq("Same g in X9.57 decoding", group2.get_g(), orig.get_g());

         const auto group3 = Botan::DL_Group::from_PEM(pem3);

         result.test_eq("Same p in X9.57 decoding", group3.get_p(), orig.get_p());
         // no q in PKCS #3 format
         result.test_eq("Same g in X9.57 decoding", group3.get_g(), orig.get_g());

         return result;
      }
};

BOTAN_REGISTER_TEST("pubkey", "dl_group", DL_Group_Tests);

class DL_Generate_Group_Tests final : public Test {
   public:
      std::vector<Test::Result> run() override {
         Test::Result result("DL_Group generate");

         result.start_timer();

         auto& rng = this->rng();

         Botan::DL_Group dh1050(rng, Botan::DL_Group::Prime_Subgroup, 1050, 175);
         result.test_eq("DH p size", dh1050.get_p().bits(), 1050);
         result.test_eq("DH q size", dh1050.get_q().bits(), 175);
         result.test_lte("DH g size", dh1050.get_g().bits(), 1050);
         result.test_eq("DH group verifies", dh1050.verify_group(rng, false), true);

         Botan::DL_Group dh_implicit_q(rng, Botan::DL_Group::Prime_Subgroup, 1040);
         result.test_eq("DH p size", dh_implicit_q.get_p().bits(), 1040);
         result.test_eq("DH q size", dh_implicit_q.get_q().bits(), Botan::dl_exponent_size(1040));
         result.test_lte("DH g size", dh_implicit_q.get_g().bits(), 1040);
         result.test_eq("DH group verifies", dh_implicit_q.verify_group(rng, false), true);

         if(Test::run_long_tests()) {
            Botan::DL_Group dh_strong(rng, Botan::DL_Group::Strong, 1025);
            result.test_eq("DH p size", dh_strong.get_p().bits(), 1025);
            result.test_eq("DH q size", dh_strong.get_q().bits(), 1024);
            result.test_eq("DH group verifies", dh_strong.verify_group(rng, false), true);
         }

   #if defined(BOTAN_HAS_SHA1)
         Botan::DL_Group dsa1024(rng, Botan::DL_Group::DSA_Kosherizer, 1024);
         result.test_eq("DSA p size", dsa1024.get_p().bits(), 1024);
         result.test_eq("DSA q size", dsa1024.get_q().bits(), 160);
         result.test_lte("DSA g size", dsa1024.get_g().bits(), 1024);
         result.test_eq("DSA group verifies", dsa1024.verify_group(rng, false), true);

         const std::vector<uint8_t> short_seed(16);
         const std::vector<uint8_t> invalid_seed(20);
         const std::vector<uint8_t> working_seed = Botan::hex_decode("0000000000000000000000000000000000000021");

         result.test_throws("DSA seed does not generate group",
                            "DL_Group: The seed given does not generate a DSA group",
                            [&rng, &invalid_seed]() { Botan::DL_Group dsa(rng, invalid_seed, 1024, 160); });

         result.test_throws(
            "DSA seed is too short",
            "Generating a DSA parameter set with a 160 bit long q requires a seed at least as many bits long",
            [&rng, &short_seed]() { Botan::DL_Group dsa(rng, short_seed, 1024, 160); });

         // From FIPS 186-3 test data
         const std::vector<uint8_t> seed = Botan::hex_decode("1F5DA0AF598EEADEE6E6665BF880E63D8B609BA2");

         result.test_throws("invalid params", [&]() { Botan::DL_Group invalid(rng, seed, 1024, 224); });
         result.test_throws("invalid params", [&]() { Botan::DL_Group invalid(rng, seed, 3072, 224); });
         result.test_throws("invalid params", [&]() { Botan::DL_Group invalid(rng, seed, 2048, 256); });

         Botan::DL_Group dsa_from_seed(rng, seed, 1024, 160);

         result.test_eq(
            "DSA q from seed", dsa_from_seed.get_q(), Botan::BigInt("0xAB1A788BCE3C557A965A5BFA6908FAA665FDEB7D"));

         // Modulo just to avoid embedding entire 1024-bit P in src file
         result.test_eq("DSA p from seed", static_cast<size_t>(dsa_from_seed.get_p() % 4294967291), size_t(2513712339));

         result.test_eq("DSA group from seed verifies", dsa_from_seed.verify_group(rng, false), true);
   #endif

         result.end_timer();

         return {result};
      }
};

BOTAN_REGISTER_TEST("pubkey", "dl_group_gen", DL_Generate_Group_Tests);

class DL_Named_Group_Tests final : public Test {
   public:
      std::vector<Test::Result> run() override {
         const std::vector<std::string> dl_named = {
            "modp/ietf/1024",  "modp/ietf/1536",  "modp/ietf/2048",  "modp/ietf/3072",  "modp/ietf/4096",
            "modp/ietf/6144",  "modp/ietf/8192",

            "modp/srp/1024",   "modp/srp/1536",   "modp/srp/2048",   "modp/srp/3072",   "modp/srp/4096",
            "modp/srp/6144",   "modp/srp/8192",

            "dsa/jce/1024",    "dsa/botan/2048",  "dsa/botan/3072",

            "ffdhe/ietf/2048", "ffdhe/ietf/3072", "ffdhe/ietf/4096", "ffdhe/ietf/6144", "ffdhe/ietf/8192",
         };

         Test::Result result("DL_Group named");
         result.start_timer();

         for(const std::string& name : dl_named) {
            // Confirm we can load every group we expect
            auto group = Botan::DL_Group::from_name(name);

            result.test_ne("DL_Group p is set", group.get_p(), 0);
            result.test_ne("DL_Group g is set", group.get_g(), 0);

            const size_t strength = group.estimated_strength();

            // 8192 bit ~~ 2**202 strength
            result.confirm("Plausible strength", strength >= 80 && strength < 210);

            result.confirm("Expected source", group.source() == Botan::DL_Group_Source::Builtin);

            if(name.find("modp/srp/") == std::string::npos) {
               result.test_ne("DL_Group q is set", group.get_q(), 0);
            } else {
               result.test_eq("DL_Group q is not set for SRP groups", group.get_q(), 0);
            }

            if(group.p_bits() <= 1536 || Test::run_long_tests()) {
               result.test_eq(name + " verifies", group.verify_group(this->rng()), true);
            }
         }
         result.end_timer();

         return {result};
      }
};

BOTAN_REGISTER_TEST("pubkey", "dl_group_named", DL_Named_Group_Tests);

}  // namespace

#endif

}  // namespace Botan_Tests

1	/*
2	* (C) 2016 Jack Lloyd
3	*
4	* Botan is released under the Simplified BSD License (see license.txt)
5	*/
6
7	#include "tests.h"
8
9	#if defined(BOTAN_HAS_DL_GROUP)
10	#include <botan/dl_group.h>
11	#include <botan/internal/workfactor.h>
12	#endif
13
14	namespace Botan_Tests {
15
16	#if defined(BOTAN_HAS_DL_GROUP)
17
18	namespace {
19
20	class DL_Group_Tests final : public Test {	×
21	public:
22	std::vector<Test::Result> run() override {	1✔
23	std::vector<Test::Result> results;	1✔
24
25	results.push_back(test_dl_encoding());	2✔
26	results.push_back(test_dl_errors());	2✔
27
28	return results;	1✔
29	}	×
30
31	private:
32	static Test::Result test_dl_errors() {	1✔
33	Test::Result result("DL_Group errors");	1✔
34	result.test_throws("Uninitialized", "DL_Group uninitialized", []() {	2✔
35	Botan::DL_Group dl;	1✔
36	dl.get_p();	1✔
37	});	×
38
39	return result;	1✔
40	}	×
41
42	static Test::Result test_dl_encoding() {	1✔
43	Test::Result result("DL_Group encoding");	1✔
44
45	const auto orig = Botan::DL_Group::from_name("modp/ietf/1024");	1✔
46
47	const std::string pem1 = orig.PEM_encode(Botan::DL_Group_Format::ANSI_X9_42);	1✔
48	const std::string pem2 = orig.PEM_encode(Botan::DL_Group_Format::ANSI_X9_57);	1✔
49	const std::string pem3 = orig.PEM_encode(Botan::DL_Group_Format::PKCS_3);	1✔
50
51	const auto group1 = Botan::DL_Group::from_PEM(pem1);	1✔
52
53	result.test_eq("Same p in X9.42 decoding", group1.get_p(), orig.get_p());	1✔
54	result.test_eq("Same q in X9.42 decoding", group1.get_q(), orig.get_q());	1✔
55	result.test_eq("Same g in X9.42 decoding", group1.get_g(), orig.get_g());	1✔
56
57	const auto group2 = Botan::DL_Group::from_PEM(pem2);	1✔
58
59	result.test_eq("Same p in X9.57 decoding", group2.get_p(), orig.get_p());	1✔
60	result.test_eq("Same q in X9.57 decoding", group2.get_q(), orig.get_q());	1✔
61	result.test_eq("Same g in X9.57 decoding", group2.get_g(), orig.get_g());	1✔
62
63	const auto group3 = Botan::DL_Group::from_PEM(pem3);	1✔
64
65	result.test_eq("Same p in X9.57 decoding", group3.get_p(), orig.get_p());	1✔
66	// no q in PKCS #3 format
67	result.test_eq("Same g in X9.57 decoding", group3.get_g(), orig.get_g());	1✔
68
69	return result;	1✔
70	}	4✔
71	};
72
73	BOTAN_REGISTER_TEST("pubkey", "dl_group", DL_Group_Tests);
74
75	class DL_Generate_Group_Tests final : public Test {	×
76	public:
77	std::vector<Test::Result> run() override {	1✔
78	Test::Result result("DL_Group generate");	1✔
79
80	result.start_timer();	1✔
81
82	auto& rng = this->rng();	1✔
83
84	Botan::DL_Group dh1050(rng, Botan::DL_Group::Prime_Subgroup, 1050, 175);	1✔
85	result.test_eq("DH p size", dh1050.get_p().bits(), 1050);	1✔
86	result.test_eq("DH q size", dh1050.get_q().bits(), 175);	1✔
87	result.test_lte("DH g size", dh1050.get_g().bits(), 1050);	1✔
88	result.test_eq("DH group verifies", dh1050.verify_group(rng, false), true);	1✔
89
90	Botan::DL_Group dh_implicit_q(rng, Botan::DL_Group::Prime_Subgroup, 1040);	1✔
91	result.test_eq("DH p size", dh_implicit_q.get_p().bits(), 1040);	1✔
92	result.test_eq("DH q size", dh_implicit_q.get_q().bits(), Botan::dl_exponent_size(1040));	1✔
93	result.test_lte("DH g size", dh_implicit_q.get_g().bits(), 1040);	1✔
94	result.test_eq("DH group verifies", dh_implicit_q.verify_group(rng, false), true);	1✔
95
96	if(Test::run_long_tests()) {	1✔
97	Botan::DL_Group dh_strong(rng, Botan::DL_Group::Strong, 1025);	1✔
98	result.test_eq("DH p size", dh_strong.get_p().bits(), 1025);	1✔
99	result.test_eq("DH q size", dh_strong.get_q().bits(), 1024);	1✔
100	result.test_eq("DH group verifies", dh_strong.verify_group(rng, false), true);	2✔
101	}	1✔
102
103	#if defined(BOTAN_HAS_SHA1)
104	Botan::DL_Group dsa1024(rng, Botan::DL_Group::DSA_Kosherizer, 1024);	1✔
105	result.test_eq("DSA p size", dsa1024.get_p().bits(), 1024);	1✔
106	result.test_eq("DSA q size", dsa1024.get_q().bits(), 160);	1✔
107	result.test_lte("DSA g size", dsa1024.get_g().bits(), 1024);	1✔
108	result.test_eq("DSA group verifies", dsa1024.verify_group(rng, false), true);	1✔
109
110	const std::vector<uint8_t> short_seed(16);	1✔
111	const std::vector<uint8_t> invalid_seed(20);	1✔
112	const std::vector<uint8_t> working_seed = Botan::hex_decode("0000000000000000000000000000000000000021");	1✔
113
114	result.test_throws("DSA seed does not generate group",	2✔
115	"DL_Group: The seed given does not generate a DSA group",
116	[&rng, &invalid_seed]() { Botan::DL_Group dsa(rng, invalid_seed, 1024, 160); });	2✔
117
118	result.test_throws(	2✔
119	"DSA seed is too short",
120	"Generating a DSA parameter set with a 160 bit long q requires a seed at least as many bits long",
121	[&rng, &short_seed]() { Botan::DL_Group dsa(rng, short_seed, 1024, 160); });	2✔
122
123	// From FIPS 186-3 test data
124	const std::vector<uint8_t> seed = Botan::hex_decode("1F5DA0AF598EEADEE6E6665BF880E63D8B609BA2");	1✔
125
126	result.test_throws("invalid params", [&]() { Botan::DL_Group invalid(rng, seed, 1024, 224); });	3✔
127	result.test_throws("invalid params", [&]() { Botan::DL_Group invalid(rng, seed, 3072, 224); });	3✔
128	result.test_throws("invalid params", [&]() { Botan::DL_Group invalid(rng, seed, 2048, 256); });	3✔
129
130	Botan::DL_Group dsa_from_seed(rng, seed, 1024, 160);	1✔
131
132	result.test_eq(	1✔
133	"DSA q from seed", dsa_from_seed.get_q(), Botan::BigInt("0xAB1A788BCE3C557A965A5BFA6908FAA665FDEB7D"));	2✔
134
135	// Modulo just to avoid embedding entire 1024-bit P in src file
136	result.test_eq("DSA p from seed", static_cast<size_t>(dsa_from_seed.get_p() % 4294967291), size_t(2513712339));	1✔
137
138	result.test_eq("DSA group from seed verifies", dsa_from_seed.verify_group(rng, false), true);	1✔
139	#endif
140
141	result.end_timer();	1✔
142
143	return {result};	3✔
144	}	9✔
145	};
146
147	BOTAN_REGISTER_TEST("pubkey", "dl_group_gen", DL_Generate_Group_Tests);
148
149	class DL_Named_Group_Tests final : public Test {	×
150	public:
151	std::vector<Test::Result> run() override {	1✔
152	const std::vector<std::string> dl_named = {	1✔
153	"modp/ietf/1024", "modp/ietf/1536", "modp/ietf/2048", "modp/ietf/3072", "modp/ietf/4096",
154	"modp/ietf/6144", "modp/ietf/8192",
155
156	"modp/srp/1024", "modp/srp/1536", "modp/srp/2048", "modp/srp/3072", "modp/srp/4096",
157	"modp/srp/6144", "modp/srp/8192",
158
159	"dsa/jce/1024", "dsa/botan/2048", "dsa/botan/3072",
160
161	"ffdhe/ietf/2048", "ffdhe/ietf/3072", "ffdhe/ietf/4096", "ffdhe/ietf/6144", "ffdhe/ietf/8192",
162	};	1✔
163
164	Test::Result result("DL_Group named");	1✔
165	result.start_timer();	1✔
166
167	for(const std::string& name : dl_named) {	23✔
168	// Confirm we can load every group we expect
169	auto group = Botan::DL_Group::from_name(name);	22✔
170
171	result.test_ne("DL_Group p is set", group.get_p(), 0);	44✔
172	result.test_ne("DL_Group g is set", group.get_g(), 0);	44✔
173
174	const size_t strength = group.estimated_strength();	22✔
175
176	// 8192 bit ~~ 2**202 strength
177	result.confirm("Plausible strength", strength >= 80 && strength < 210);	44✔
178
179	result.confirm("Expected source", group.source() == Botan::DL_Group_Source::Builtin);	44✔
180
181	if(name.find("modp/srp/") == std::string::npos) {	22✔
182	result.test_ne("DL_Group q is set", group.get_q(), 0);	30✔
183	} else {
184	result.test_eq("DL_Group q is not set for SRP groups", group.get_q(), 0);	14✔
185	}
186
187	if(group.p_bits() <= 1536 \|\| Test::run_long_tests()) {	22✔
188	result.test_eq(name + " verifies", group.verify_group(this->rng()), true);	44✔
189	}
190	}	22✔
191	result.end_timer();	1✔
192
193	return {result};	3✔
194	}	2✔
195	};
196
197	BOTAN_REGISTER_TEST("pubkey", "dl_group_named", DL_Named_Group_Tests);
198
199	} // namespace
200
201	#endif
202
203	} // namespace Botan_Tests

randombit / botan / 13629762785

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