5123321399

Committed 30 May 2023 04:06PM UTC coverage: 92.213% (+0.004%) from 92.209%

Build # 5123321399

Build Type

Pull #3558

github

Committed by

web-flow

Commit Message

Merge dd72f7389 into 057bcbc35

Pull Request Pull Request #3558: Add braces around all if/else statements

Run Details

75602 of 81986 relevant lines covered (92.21%)

11859779.3 hits per line

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

88.89

/src/tests/test_pbkdf.cpp

/*
* (C) 2014,2015,2019 Jack Lloyd
* (C) 2018 Ribose Inc
*
* Botan is released under the Simplified BSD License (see license.txt)
*/

#include "tests.h"

#if defined(BOTAN_HAS_PBKDF)
   #include <botan/pbkdf.h>
   #include <botan/pwdhash.h>
#endif

#if defined(BOTAN_HAS_RFC4880)
   #include <botan/rfc4880.h>
#endif

namespace Botan_Tests {

namespace {

#if defined(BOTAN_HAS_PBKDF)
class PBKDF_KAT_Tests final : public Text_Based_Test {
   public:
      PBKDF_KAT_Tests() : Text_Based_Test("pbkdf", "Iterations,Salt,Passphrase,Output") {}

      Test::Result run_one_test(const std::string& pbkdf_name, const VarMap& vars) override {
         const size_t iterations = vars.get_req_sz("Iterations");
         const std::vector<uint8_t> salt = vars.get_req_bin("Salt");
         const std::string passphrase = vars.get_req_str("Passphrase");
         const std::vector<uint8_t> expected = vars.get_req_bin("Output");
         const size_t outlen = expected.size();

         Test::Result result(pbkdf_name);
         auto pbkdf = Botan::PBKDF::create(pbkdf_name);

         if(!pbkdf) {
            result.note_missing(pbkdf_name);
            return result;
         }

         result.test_eq("Expected name", pbkdf->name(), pbkdf_name);

         const Botan::secure_vector<uint8_t> derived =
            pbkdf->derive_key(outlen, passphrase, salt.data(), salt.size(), iterations).bits_of();
         result.test_eq("derived key", derived, expected);

         auto pwdhash_fam = Botan::PasswordHashFamily::create(pbkdf_name);

         if(!pwdhash_fam) {
            result.note_missing("No PasswordHashFamily for " + pbkdf_name);
            return result;
         }

         auto pwdhash = pwdhash_fam->from_params(iterations);

         std::vector<uint8_t> pwdhash_derived(outlen);
         pwdhash->hash(pwdhash_derived, passphrase, salt);

         result.test_eq("pwdhash derived key", pwdhash_derived, expected);

         return result;
      }
};

BOTAN_REGISTER_SMOKE_TEST("pbkdf", "pbkdf_kat", PBKDF_KAT_Tests);

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

         const std::vector<std::string> all_pwdhash = {
            "Scrypt", "PBKDF2(SHA-256)", "OpenPGP-S2K(SHA-384)", "Argon2d", "Argon2i", "Argon2id", "Bcrypt-PBKDF"};

         const auto run_time = std::chrono::milliseconds(3);
         const auto tune_time = std::chrono::milliseconds(1);
         const size_t max_mem = 32;

         for(const std::string& pwdhash : all_pwdhash) {
            Test::Result result("Pwdhash " + pwdhash);
            auto pwdhash_fam = Botan::PasswordHashFamily::create(pwdhash);

            if(pwdhash_fam) {
               result.start_timer();

               const std::vector<uint8_t> salt(8);
               const std::string password = "test";

               auto tuned_pwhash = pwdhash_fam->tune(32, run_time, max_mem, tune_time);

               std::vector<uint8_t> output1(32);
               tuned_pwhash->hash(output1, password, salt);

               std::unique_ptr<Botan::PasswordHash> pwhash;

               if(pwdhash_fam->name() == "Scrypt" || pwdhash_fam->name().find("Argon2") == 0) {
                  pwhash = pwdhash_fam->from_params(
                     tuned_pwhash->memory_param(), tuned_pwhash->iterations(), tuned_pwhash->parallelism());
               } else {
                  pwhash = pwdhash_fam->from_params(tuned_pwhash->iterations());
               }

               std::vector<uint8_t> output2(32);
               pwhash->hash(output2, password, salt);

               result.test_eq("PasswordHash produced same output when run with same params", output1, output2);

               auto default_pwhash = pwdhash_fam->default_params();
               std::vector<uint8_t> output3(32);
               default_pwhash->hash(output3, password, salt);

               result.end_timer();
            } else {
               result.test_note("No such algo " + pwdhash);
            }

            results.push_back(result);
         }

         return results;
      }
};

BOTAN_REGISTER_TEST("pbkdf", "pwdhash", Pwdhash_Tests);

#endif

#if defined(BOTAN_HAS_PBKDF_BCRYPT)

class Bcrypt_PBKDF_KAT_Tests final : public Text_Based_Test {
   public:
      Bcrypt_PBKDF_KAT_Tests() : Text_Based_Test("bcrypt_pbkdf.vec", "Passphrase,Salt,Iterations,Output") {}

      Test::Result run_one_test(const std::string& /*header*/, const VarMap& vars) override {
         const size_t rounds = vars.get_req_sz("Iterations");
         const std::vector<uint8_t> salt = vars.get_req_bin("Salt");
         const std::string passphrase = vars.get_req_str("Passphrase");
         const std::vector<uint8_t> expected = vars.get_req_bin("Output");

         Test::Result result("bcrypt PBKDF");

         auto pwdhash_fam = Botan::PasswordHashFamily::create("Bcrypt-PBKDF");

         if(!pwdhash_fam) {
            result.test_failure("Bcrypt-PBKDF is missing PasswordHashFamily");
            return result;
         }

         auto pwdhash = pwdhash_fam->from_iterations(rounds);

         std::vector<uint8_t> derived(expected.size());
         pwdhash->hash(derived, passphrase, salt);

         result.test_eq("derived key", derived, expected);

         return result;
      }
};

BOTAN_REGISTER_TEST("pbkdf", "bcrypt_pbkdf", Bcrypt_PBKDF_KAT_Tests);

#endif

#if defined(BOTAN_HAS_SCRYPT)

class Scrypt_KAT_Tests final : public Text_Based_Test {
   public:
      Scrypt_KAT_Tests() : Text_Based_Test("scrypt.vec", "Passphrase,Salt,N,R,P,Output") {}

      Test::Result run_one_test(const std::string& /*header*/, const VarMap& vars) override {
         const size_t N = vars.get_req_sz("N");
         const size_t R = vars.get_req_sz("R");
         const size_t P = vars.get_req_sz("P");
         const std::vector<uint8_t> salt = vars.get_req_bin("Salt");
         const std::string passphrase = vars.get_req_str("Passphrase");
         const std::vector<uint8_t> expected = vars.get_req_bin("Output");

         Test::Result result("scrypt");

         if(N >= 1048576 && Test::run_long_tests() == false) {
            return result;
         }

         auto pwdhash_fam = Botan::PasswordHashFamily::create("Scrypt");

         if(!pwdhash_fam) {
            result.test_failure("Scrypt is missing PasswordHashFamily");
            return result;
         }

         auto pwdhash = pwdhash_fam->from_params(N, R, P);

         std::vector<uint8_t> pwdhash_derived(expected.size());
         pwdhash->hash(pwdhash_derived, passphrase, salt);

         result.test_eq("pwdhash derived key", pwdhash_derived, expected);

         return result;
      }
};

BOTAN_REGISTER_TEST("pbkdf", "scrypt", Scrypt_KAT_Tests);

#endif

#if defined(BOTAN_HAS_ARGON2)

class Argon2_KAT_Tests final : public Text_Based_Test {
   public:
      Argon2_KAT_Tests() : Text_Based_Test("argon2.vec", "Passphrase,Salt,P,M,T,Output", "Secret,AD") {}

      Test::Result run_one_test(const std::string& mode, const VarMap& vars) override {
         const size_t P = vars.get_req_sz("P");
         const size_t M = vars.get_req_sz("M");
         const size_t T = vars.get_req_sz("T");
         const std::vector<uint8_t> key = vars.get_opt_bin("Secret");
         const std::vector<uint8_t> ad = vars.get_opt_bin("AD");
         const std::vector<uint8_t> salt = vars.get_req_bin("Salt");
         const std::vector<uint8_t> passphrase = vars.get_req_bin("Passphrase");
         const std::vector<uint8_t> expected = vars.get_req_bin("Output");

         Test::Result result(mode);

         auto pwdhash_fam = Botan::PasswordHashFamily::create(mode);

         if(!pwdhash_fam) {
            result.test_failure("Argon2 is missing PasswordHashFamily");
            return result;
         }

         auto pwdhash = pwdhash_fam->from_params(M, T, P);

         const std::string passphrase_str(passphrase.begin(), passphrase.end());

         std::vector<uint8_t> pwdhash_derived(expected.size());
         pwdhash->hash(pwdhash_derived, passphrase_str, salt, ad, key);

         result.test_eq("pwdhash derived key", pwdhash_derived, expected);

         return result;
      }
};

BOTAN_REGISTER_SERIALIZED_TEST("pbkdf", "argon2", Argon2_KAT_Tests);

#endif

#if defined(BOTAN_HAS_PGP_S2K)

class PGP_S2K_Iter_Test final : public Test {
   public:
      std::vector<Test::Result> run() override {
         Test::Result result("PGP_S2K iteration encoding");

         // The maximum representable iteration count
         const size_t max_iter = 65011712;

         result.test_eq("Encoding of large value accepted", Botan::RFC4880_encode_count(max_iter * 2), size_t(255));
         result.test_eq("Encoding of small value accepted", Botan::RFC4880_encode_count(0), size_t(0));

         for(size_t c = 0; c != 256; ++c) {
            const size_t dec = Botan::RFC4880_decode_count(static_cast<uint8_t>(c));
            const size_t comp_dec = (16 + (c & 0x0F)) << ((c >> 4) + 6);
            result.test_eq("Decoded value matches PGP formula", dec, comp_dec);

            const size_t enc = Botan::RFC4880_encode_count(comp_dec);
            result.test_eq("Encoded value matches PGP formula", enc, c);
         }

         uint8_t last_enc = 0;

         for(size_t i = 0; i <= max_iter; i += 64) {
            const uint8_t enc = Botan::RFC4880_encode_count(i);
            result.test_lte("Encoded value non-decreasing", last_enc, enc);

            /*
            The iteration count as encoded may not be exactly the
            value requested, but should never be less
            */
            const size_t dec = Botan::RFC4880_decode_count(enc);
            result.test_gte("Decoded value is >= requested", dec, i);

            last_enc = enc;
         }

         return std::vector<Test::Result>{result};
      }
};

BOTAN_REGISTER_TEST("pbkdf", "pgp_s2k_iter", PGP_S2K_Iter_Test);

#endif

}  // namespace

}  // namespace Botan_Tests

1	/*
2	* (C) 2014,2015,2019 Jack Lloyd
3	* (C) 2018 Ribose Inc
4	*
5	* Botan is released under the Simplified BSD License (see license.txt)
6	*/
7
8	#include "tests.h"
9
10	#if defined(BOTAN_HAS_PBKDF)
11	#include <botan/pbkdf.h>
12	#include <botan/pwdhash.h>
13	#endif
14
15	#if defined(BOTAN_HAS_RFC4880)
16	#include <botan/rfc4880.h>
17	#endif
18
19	namespace Botan_Tests {
20
21	namespace {
22
23	#if defined(BOTAN_HAS_PBKDF)
24	class PBKDF_KAT_Tests final : public Text_Based_Test {	×
25	public:
26	PBKDF_KAT_Tests() : Text_Based_Test("pbkdf", "Iterations,Salt,Passphrase,Output") {}	3✔
27
28	Test::Result run_one_test(const std::string& pbkdf_name, const VarMap& vars) override {	28✔
29	const size_t iterations = vars.get_req_sz("Iterations");	28✔
30	const std::vector<uint8_t> salt = vars.get_req_bin("Salt");	28✔
31	const std::string passphrase = vars.get_req_str("Passphrase");	28✔
32	const std::vector<uint8_t> expected = vars.get_req_bin("Output");	28✔
33	const size_t outlen = expected.size();	28✔
34
35	Test::Result result(pbkdf_name);	56✔
36	auto pbkdf = Botan::PBKDF::create(pbkdf_name);	28✔
37
38	if(!pbkdf) {	28✔
39	result.note_missing(pbkdf_name);	×
40	return result;
41	}
42
43	result.test_eq("Expected name", pbkdf->name(), pbkdf_name);	56✔
44
45	const Botan::secure_vector<uint8_t> derived =	28✔
46	pbkdf->derive_key(outlen, passphrase, salt.data(), salt.size(), iterations).bits_of();	28✔
47	result.test_eq("derived key", derived, expected);	28✔
48
49	auto pwdhash_fam = Botan::PasswordHashFamily::create(pbkdf_name);	28✔
50
51	if(!pwdhash_fam) {	28✔
52	result.note_missing("No PasswordHashFamily for " + pbkdf_name);	×
53	return result;	×
54	}
55
56	auto pwdhash = pwdhash_fam->from_params(iterations);	28✔
57
58	std::vector<uint8_t> pwdhash_derived(outlen);	28✔
59	pwdhash->hash(pwdhash_derived, passphrase, salt);	28✔
60
61	result.test_eq("pwdhash derived key", pwdhash_derived, expected);	28✔
62
63	return result;	28✔
64	}	206✔
65	};
66
67	BOTAN_REGISTER_SMOKE_TEST("pbkdf", "pbkdf_kat", PBKDF_KAT_Tests);
68
69	class Pwdhash_Tests : public Test {	×
70	public:
71	std::vector<Test::Result> run() override {	1✔
72	std::vector<Test::Result> results;	1✔
73
74	const std::vector<std::string> all_pwdhash = {	1✔
75	"Scrypt", "PBKDF2(SHA-256)", "OpenPGP-S2K(SHA-384)", "Argon2d", "Argon2i", "Argon2id", "Bcrypt-PBKDF"};	8✔
76
77	const auto run_time = std::chrono::milliseconds(3);	1✔
78	const auto tune_time = std::chrono::milliseconds(1);	1✔
79	const size_t max_mem = 32;	1✔
80
81	for(const std::string& pwdhash : all_pwdhash) {	8✔
82	Test::Result result("Pwdhash " + pwdhash);	7✔
83	auto pwdhash_fam = Botan::PasswordHashFamily::create(pwdhash);	7✔
84
85	if(pwdhash_fam) {	7✔
86	result.start_timer();	7✔
87
88	const std::vector<uint8_t> salt(8);	7✔
89	const std::string password = "test";	7✔
90
91	auto tuned_pwhash = pwdhash_fam->tune(32, run_time, max_mem, tune_time);	7✔
92
93	std::vector<uint8_t> output1(32);	7✔
94	tuned_pwhash->hash(output1, password, salt);	7✔
95
96	std::unique_ptr<Botan::PasswordHash> pwhash;	7✔
97
98	if(pwdhash_fam->name() == "Scrypt" \|\| pwdhash_fam->name().find("Argon2") == 0) {	15✔
99	pwhash = pwdhash_fam->from_params(	4✔
100	tuned_pwhash->memory_param(), tuned_pwhash->iterations(), tuned_pwhash->parallelism());	8✔
101	} else {
102	pwhash = pwdhash_fam->from_params(tuned_pwhash->iterations());	3✔
103	}
104
105	std::vector<uint8_t> output2(32);	7✔
106	pwhash->hash(output2, password, salt);	7✔
107
108	result.test_eq("PasswordHash produced same output when run with same params", output1, output2);	7✔
109
110	auto default_pwhash = pwdhash_fam->default_params();	7✔
111	std::vector<uint8_t> output3(32);	7✔
112	default_pwhash->hash(output3, password, salt);	7✔
113
114	result.end_timer();	7✔
115	} else {	42✔
116	result.test_note("No such algo " + pwdhash);	×
117	}
118
119	results.push_back(result);	7✔
120	}	7✔
121
122	return results;	1✔
123	}	1✔
124	};
125
126	BOTAN_REGISTER_TEST("pbkdf", "pwdhash", Pwdhash_Tests);
127
128	#endif
129
130	#if defined(BOTAN_HAS_PBKDF_BCRYPT)
131
132	class Bcrypt_PBKDF_KAT_Tests final : public Text_Based_Test {	×
133	public:
134	Bcrypt_PBKDF_KAT_Tests() : Text_Based_Test("bcrypt_pbkdf.vec", "Passphrase,Salt,Iterations,Output") {}	3✔
135
136	Test::Result run_one_test(const std::string& /header/, const VarMap& vars) override {	36✔
137	const size_t rounds = vars.get_req_sz("Iterations");	36✔
138	const std::vector<uint8_t> salt = vars.get_req_bin("Salt");	36✔
139	const std::string passphrase = vars.get_req_str("Passphrase");	36✔
140	const std::vector<uint8_t> expected = vars.get_req_bin("Output");	36✔
141
142	Test::Result result("bcrypt PBKDF");	36✔
143
144	auto pwdhash_fam = Botan::PasswordHashFamily::create("Bcrypt-PBKDF");	36✔
145
146	if(!pwdhash_fam) {	36✔
147	result.test_failure("Bcrypt-PBKDF is missing PasswordHashFamily");	×
148	return result;	×
149	}
150
151	auto pwdhash = pwdhash_fam->from_iterations(rounds);	36✔
152
153	std::vector<uint8_t> derived(expected.size());	36✔
154	pwdhash->hash(derived, passphrase, salt);	36✔
155
156	result.test_eq("derived key", derived, expected);	72✔
157
158	return result;	36✔
159	}	180✔
160	};
161
162	BOTAN_REGISTER_TEST("pbkdf", "bcrypt_pbkdf", Bcrypt_PBKDF_KAT_Tests);
163
164	#endif
165
166	#if defined(BOTAN_HAS_SCRYPT)
167
168	class Scrypt_KAT_Tests final : public Text_Based_Test {	×
169	public:
170	Scrypt_KAT_Tests() : Text_Based_Test("scrypt.vec", "Passphrase,Salt,N,R,P,Output") {}	3✔
171
172	Test::Result run_one_test(const std::string& /header/, const VarMap& vars) override {	15✔
173	const size_t N = vars.get_req_sz("N");	15✔
174	const size_t R = vars.get_req_sz("R");	15✔
175	const size_t P = vars.get_req_sz("P");	15✔
176	const std::vector<uint8_t> salt = vars.get_req_bin("Salt");	15✔
177	const std::string passphrase = vars.get_req_str("Passphrase");	15✔
178	const std::vector<uint8_t> expected = vars.get_req_bin("Output");	15✔
179
180	Test::Result result("scrypt");	15✔
181
182	if(N >= 1048576 && Test::run_long_tests() == false) {	15✔
183	return result;
184	}
185
186	auto pwdhash_fam = Botan::PasswordHashFamily::create("Scrypt");	15✔
187
188	if(!pwdhash_fam) {	15✔
189	result.test_failure("Scrypt is missing PasswordHashFamily");	×
190	return result;	×
191	}
192
193	auto pwdhash = pwdhash_fam->from_params(N, R, P);	15✔
194
195	std::vector<uint8_t> pwdhash_derived(expected.size());	15✔
196	pwdhash->hash(pwdhash_derived, passphrase, salt);	15✔
197
198	result.test_eq("pwdhash derived key", pwdhash_derived, expected);	15✔
199
200	return result;	15✔
201	}	75✔
202	};
203
204	BOTAN_REGISTER_TEST("pbkdf", "scrypt", Scrypt_KAT_Tests);
205
206	#endif
207
208	#if defined(BOTAN_HAS_ARGON2)
209
210	class Argon2_KAT_Tests final : public Text_Based_Test {	×
211	public:
212	Argon2_KAT_Tests() : Text_Based_Test("argon2.vec", "Passphrase,Salt,P,M,T,Output", "Secret,AD") {}	3✔
213
214	Test::Result run_one_test(const std::string& mode, const VarMap& vars) override {	1,071✔
215	const size_t P = vars.get_req_sz("P");	1,071✔
216	const size_t M = vars.get_req_sz("M");	1,071✔
217	const size_t T = vars.get_req_sz("T");	1,071✔
218	const std::vector<uint8_t> key = vars.get_opt_bin("Secret");	1,071✔
219	const std::vector<uint8_t> ad = vars.get_opt_bin("AD");	1,071✔
220	const std::vector<uint8_t> salt = vars.get_req_bin("Salt");	1,071✔
221	const std::vector<uint8_t> passphrase = vars.get_req_bin("Passphrase");	1,071✔
222	const std::vector<uint8_t> expected = vars.get_req_bin("Output");	1,071✔
223
224	Test::Result result(mode);	2,142✔
225
226	auto pwdhash_fam = Botan::PasswordHashFamily::create(mode);	1,071✔
227
228	if(!pwdhash_fam) {	1,071✔
229	result.test_failure("Argon2 is missing PasswordHashFamily");	×
230	return result;	×
231	}
232
233	auto pwdhash = pwdhash_fam->from_params(M, T, P);	1,071✔
234
235	const std::string passphrase_str(passphrase.begin(), passphrase.end());	1,071✔
236
237	std::vector<uint8_t> pwdhash_derived(expected.size());	1,071✔
238	pwdhash->hash(pwdhash_derived, passphrase_str, salt, ad, key);	1,071✔
239
240	result.test_eq("pwdhash derived key", pwdhash_derived, expected);	1,071✔
241
242	return result;	1,071✔
243	}	6,768✔
244	};
245
246	BOTAN_REGISTER_SERIALIZED_TEST("pbkdf", "argon2", Argon2_KAT_Tests);
247
248	#endif
249
250	#if defined(BOTAN_HAS_PGP_S2K)
251
252	class PGP_S2K_Iter_Test final : public Test {	×
253	public:
254	std::vector<Test::Result> run() override {	1✔
255	Test::Result result("PGP_S2K iteration encoding");	1✔
256
257	// The maximum representable iteration count
258	const size_t max_iter = 65011712;	1✔
259
260	result.test_eq("Encoding of large value accepted", Botan::RFC4880_encode_count(max_iter * 2), size_t(255));	1✔
261	result.test_eq("Encoding of small value accepted", Botan::RFC4880_encode_count(0), size_t(0));	1✔
262
263	for(size_t c = 0; c != 256; ++c) {	257✔
264	const size_t dec = Botan::RFC4880_decode_count(static_cast<uint8_t>(c));	256✔
265	const size_t comp_dec = (16 + (c & 0x0F)) << ((c >> 4) + 6);	256✔
266	result.test_eq("Decoded value matches PGP formula", dec, comp_dec);	256✔
267
268	const size_t enc = Botan::RFC4880_encode_count(comp_dec);	256✔
269	result.test_eq("Encoded value matches PGP formula", enc, c);	512✔
270	}
271
272	uint8_t last_enc = 0;
273
274	for(size_t i = 0; i <= max_iter; i += 64) {	1,015,810✔
275	const uint8_t enc = Botan::RFC4880_encode_count(i);	1,015,809✔
276	result.test_lte("Encoded value non-decreasing", last_enc, enc);	1,015,809✔
277
278	/*
279	The iteration count as encoded may not be exactly the
280	value requested, but should never be less
281	*/
282	const size_t dec = Botan::RFC4880_decode_count(enc);	1,015,809✔
283	result.test_gte("Decoded value is >= requested", dec, i);	1,015,809✔
284
285	last_enc = enc;	1,015,809✔
286	}
287
288	return std::vector<Test::Result>{result};	3✔
289	}	1✔
290	};
291
292	BOTAN_REGISTER_TEST("pbkdf", "pgp_s2k_iter", PGP_S2K_Iter_Test);
293
294	#endif
295
296	} // namespace
297
298	} // namespace Botan_Tests

randombit / botan / 5123321399

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