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

55.56

/src/lib/pbkdf/pbkdf.cpp

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

#include <botan/pbkdf.h>

#include <botan/exceptn.h>
#include <botan/internal/scan_name.h>

#if defined(BOTAN_HAS_PBKDF2)
   #include <botan/pbkdf2.h>
#endif

#if defined(BOTAN_HAS_PGP_S2K)
   #include <botan/pgp_s2k.h>
#endif

namespace Botan {

std::unique_ptr<PBKDF> PBKDF::create(std::string_view algo_spec, std::string_view provider) {
   const SCAN_Name req(algo_spec);

#if defined(BOTAN_HAS_PBKDF2)
   if(req.algo_name() == "PBKDF2") {
      // TODO OpenSSL

      if(provider.empty() || provider == "base") {
         if(auto mac = MessageAuthenticationCode::create("HMAC(" + req.arg(0) + ")")) {
            return std::make_unique<PKCS5_PBKDF2>(std::move(mac));
         }

         if(auto mac = MessageAuthenticationCode::create(req.arg(0))) {
            return std::make_unique<PKCS5_PBKDF2>(std::move(mac));
         }
      }

      return nullptr;
   }
#endif

#if defined(BOTAN_HAS_PGP_S2K)
   if(req.algo_name() == "OpenPGP-S2K" && req.arg_count() == 1) {
      if(auto hash = HashFunction::create(req.arg(0))) {
         return std::make_unique<OpenPGP_S2K>(std::move(hash));
      }
   }
#endif

   BOTAN_UNUSED(req);
   BOTAN_UNUSED(provider);

   return nullptr;
}

//static
std::unique_ptr<PBKDF> PBKDF::create_or_throw(std::string_view algo, std::string_view provider) {
   if(auto pbkdf = PBKDF::create(algo, provider)) {
      return pbkdf;
   }
   throw Lookup_Error("PBKDF", algo, provider);
}

std::vector<std::string> PBKDF::providers(std::string_view algo_spec) { return probe_providers_of<PBKDF>(algo_spec); }

void PBKDF::pbkdf_timed(uint8_t out[],
                        size_t out_len,
                        std::string_view passphrase,
                        const uint8_t salt[],
                        size_t salt_len,
                        std::chrono::milliseconds msec,
                        size_t& iterations) const {
   iterations = pbkdf(out, out_len, passphrase, salt, salt_len, 0, msec);
}

void PBKDF::pbkdf_iterations(uint8_t out[],
                             size_t out_len,
                             std::string_view passphrase,
                             const uint8_t salt[],
                             size_t salt_len,
                             size_t iterations) const {
   if(iterations == 0) {
      throw Invalid_Argument(name() + ": Invalid iteration count");
   }

   const size_t iterations_run =
      pbkdf(out, out_len, passphrase, salt, salt_len, iterations, std::chrono::milliseconds(0));
   BOTAN_ASSERT_EQUAL(iterations, iterations_run, "Expected PBKDF iterations");
}

secure_vector<uint8_t> PBKDF::pbkdf_iterations(
   size_t out_len, std::string_view passphrase, const uint8_t salt[], size_t salt_len, size_t iterations) const {
   secure_vector<uint8_t> out(out_len);
   pbkdf_iterations(out.data(), out_len, passphrase, salt, salt_len, iterations);
   return out;
}

secure_vector<uint8_t> PBKDF::pbkdf_timed(size_t out_len,
                                          std::string_view passphrase,
                                          const uint8_t salt[],
                                          size_t salt_len,
                                          std::chrono::milliseconds msec,
                                          size_t& iterations) const {
   secure_vector<uint8_t> out(out_len);
   pbkdf_timed(out.data(), out_len, passphrase, salt, salt_len, msec, iterations);
   return out;
}

}  // namespace Botan

1	/*
2	* PBKDF
3	* (C) 2012 Jack Lloyd
4	*
5	* Botan is released under the Simplified BSD License (see license.txt)
6	*/
7
8	#include <botan/pbkdf.h>
9
10	#include <botan/exceptn.h>
11	#include <botan/internal/scan_name.h>
12
13	#if defined(BOTAN_HAS_PBKDF2)
14	#include <botan/pbkdf2.h>
15	#endif
16
17	#if defined(BOTAN_HAS_PGP_S2K)
18	#include <botan/pgp_s2k.h>
19	#endif
20
21	namespace Botan {
22
23	std::unique_ptr<PBKDF> PBKDF::create(std::string_view algo_spec, std::string_view provider) {	30✔
24	const SCAN_Name req(algo_spec);	30✔
25
26	#if defined(BOTAN_HAS_PBKDF2)
27	if(req.algo_name() == "PBKDF2") {	60✔
28	// TODO OpenSSL
29
30	if(provider.empty() \|\| provider == "base") {	17✔
31	if(auto mac = MessageAuthenticationCode::create("HMAC(" + req.arg(0) + ")")) {	34✔
32	return std::make_unique<PKCS5_PBKDF2>(std::move(mac));	2✔
33	}	2✔
34
35	if(auto mac = MessageAuthenticationCode::create(req.arg(0))) {	30✔
36	return std::make_unique<PKCS5_PBKDF2>(std::move(mac));	15✔
37	}	15✔
38	}
39
40	return nullptr;	×
41	}
42	#endif
43
44	#if defined(BOTAN_HAS_PGP_S2K)
45	if(req.algo_name() == "OpenPGP-S2K" && req.arg_count() == 1) {	39✔
46	if(auto hash = HashFunction::create(req.arg(0))) {	26✔
47	return std::make_unique<OpenPGP_S2K>(std::move(hash));	13✔
48	}	13✔
49	}
50	#endif
51
52	BOTAN_UNUSED(req);	×
53	BOTAN_UNUSED(provider);	×
54
55	return nullptr;	×
56	}	30✔
57
58	//static
59	std::unique_ptr<PBKDF> PBKDF::create_or_throw(std::string_view algo, std::string_view provider) {	×
60	if(auto pbkdf = PBKDF::create(algo, provider)) {	×
61	return pbkdf;	×
62	}	×
63	throw Lookup_Error("PBKDF", algo, provider);	×
64	}
65
66	std::vector<std::string> PBKDF::providers(std::string_view algo_spec) { return probe_providers_of<PBKDF>(algo_spec); }	×
67
68	void PBKDF::pbkdf_timed(uint8_t out[],	×
69	size_t out_len,
70	std::string_view passphrase,
71	const uint8_t salt[],
72	size_t salt_len,
73	std::chrono::milliseconds msec,
74	size_t& iterations) const {
75	iterations = pbkdf(out, out_len, passphrase, salt, salt_len, 0, msec);	×
76	}	×
77
78	void PBKDF::pbkdf_iterations(uint8_t out[],	79✔
79	size_t out_len,
80	std::string_view passphrase,
81	const uint8_t salt[],
82	size_t salt_len,
83	size_t iterations) const {
84	if(iterations == 0) {	79✔
85	throw Invalid_Argument(name() + ": Invalid iteration count");	×
86	}
87
88	const size_t iterations_run =	79✔
89	pbkdf(out, out_len, passphrase, salt, salt_len, iterations, std::chrono::milliseconds(0));	79✔
90	BOTAN_ASSERT_EQUAL(iterations, iterations_run, "Expected PBKDF iterations");	79✔
91	}	79✔
92
93	secure_vector<uint8_t> PBKDF::pbkdf_iterations(	79✔
94	size_t out_len, std::string_view passphrase, const uint8_t salt[], size_t salt_len, size_t iterations) const {
95	secure_vector<uint8_t> out(out_len);	79✔
96	pbkdf_iterations(out.data(), out_len, passphrase, salt, salt_len, iterations);	79✔
97	return out;	79✔
98	}	×
99
100	secure_vector<uint8_t> PBKDF::pbkdf_timed(size_t out_len,	×
101	std::string_view passphrase,
102	const uint8_t salt[],
103	size_t salt_len,
104	std::chrono::milliseconds msec,
105	size_t& iterations) const {
106	secure_vector<uint8_t> out(out_len);	×
107	pbkdf_timed(out.data(), out_len, passphrase, salt, salt_len, msec, iterations);	×
108	return out;	×
109	}	×
110
111	} // namespace Botan

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