16052725896

Committed 03 Jul 2025 02:09PM UTC coverage: 90.57% (-0.003%) from 90.573%

Build # 16052725896

Build Type

Pull #4931

github

Committed by

web-flow

Commit Message

Merge d969ea76a into 750c4cef7

Pull Request Pull Request #4931: Address various warnings from clang-tidy

Run Details

99049 of 109362 relevant lines covered (90.57%)

12428027.87 hits per line

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

64.94

/src/lib/compat/sodium/sodium_utils.cpp

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

#include <botan/sodium.h>

#include <botan/mem_ops.h>
#include <botan/system_rng.h>
#include <botan/internal/chacha.h>
#include <botan/internal/ct_utils.h>
#include <botan/internal/loadstor.h>
#include <cstdlib>

#if defined(BOTAN_HAS_OS_UTILS)
   #include <botan/internal/os_utils.h>
#endif

namespace Botan {

void Sodium::randombytes_buf(void* buf, size_t len) {
   system_rng().randomize(static_cast<uint8_t*>(buf), len);
}

uint32_t Sodium::randombytes_uniform(uint32_t upper_bound) {
   if(upper_bound <= 1) {
      return 0;
   }

   // Not completely uniform
   uint64_t x;
   randombytes_buf(&x, sizeof(x));
   return x % upper_bound;
}

void Sodium::randombytes_buf_deterministic(void* buf, size_t size, const uint8_t seed[randombytes_SEEDBYTES]) {
   const unsigned char nonce[12] = {'L', 'i', 'b', 's', 'o', 'd', 'i', 'u', 'm', 'D', 'R', 'G'};

   ChaCha chacha(20);
   chacha.set_key(seed, randombytes_SEEDBYTES);
   chacha.set_iv(nonce, sizeof(nonce));
   chacha.write_keystream(static_cast<uint8_t*>(buf), size);
}

int Sodium::crypto_verify_16(const uint8_t x[16], const uint8_t y[16]) {
   return static_cast<int>(CT::is_equal(x, y, 16).select(1, 0));
}

int Sodium::crypto_verify_32(const uint8_t x[32], const uint8_t y[32]) {
   return static_cast<int>(CT::is_equal(x, y, 32).select(1, 0));
}

int Sodium::crypto_verify_64(const uint8_t x[64], const uint8_t y[64]) {
   return static_cast<int>(CT::is_equal(x, y, 64).select(1, 0));
}

void Sodium::sodium_memzero(void* ptr, size_t len) {
   secure_scrub_memory(ptr, len);
}

int Sodium::sodium_memcmp(const void* x, const void* y, size_t len) {
   const auto same = CT::is_equal(static_cast<const uint8_t*>(x), static_cast<const uint8_t*>(y), len);
   // Return 0 if same or -1 if differing
   return static_cast<int>(same.select(1, 0)) - 1;
}

int Sodium::sodium_compare(const uint8_t x[], const uint8_t y[], size_t len) {
   const uint8_t LT = static_cast<uint8_t>(-1);
   const uint8_t EQ = 0;
   const uint8_t GT = 1;

   uint8_t result = EQ;  // until found otherwise

   for(size_t i = 0; i != len; ++i) {
      const auto is_eq = CT::Mask<uint8_t>::is_equal(x[i], y[i]);
      const auto is_lt = CT::Mask<uint8_t>::is_lt(x[i], y[i]);
      result = is_eq.select(result, is_lt.select(LT, GT));
   }

   return static_cast<int8_t>(result);
}

int Sodium::sodium_is_zero(const uint8_t b[], size_t len) {
   uint8_t sum = 0;
   for(size_t i = 0; i != len; ++i) {
      sum |= b[i];
   }
   return static_cast<int>(CT::Mask<uint8_t>::expand(sum).if_not_set_return(1));
}

void Sodium::sodium_increment(uint8_t b[], size_t len) {
   uint8_t carry = 1;
   for(size_t i = 0; i != len; ++i) {
      b[i] += carry;
      carry &= CT::Mask<uint8_t>::is_zero(b[i]).if_set_return(1);
   }
}

void Sodium::sodium_add(uint8_t a[], const uint8_t b[], size_t len) {
   uint8_t carry = 0;
   for(size_t i = 0; i != len; ++i) {
      a[i] += b[i] + carry;
      carry = CT::Mask<uint8_t>::is_lt(a[i], b[i]).if_set_return(1);
   }
}

void* Sodium::sodium_malloc(size_t size) {
   const uint64_t len = size;

   if(size + sizeof(len) < size) {
      return nullptr;
   }

   // NOLINTNEXTLINE(*-no-malloc)
   uint8_t* p = static_cast<uint8_t*>(std::calloc(size + sizeof(len), 1));
   store_le(len, p);
   return p + 8;
}

void Sodium::sodium_free(void* ptr) {
   if(ptr == nullptr) {
      return;
   }

   uint8_t* p = static_cast<uint8_t*>(ptr) - 8;
   const uint64_t len = load_le<uint64_t>(p, 0);
   secure_scrub_memory(ptr, static_cast<size_t>(len));
   // NOLINTNEXTLINE(*-no-malloc)
   std::free(p);
}

void* Sodium::sodium_allocarray(size_t count, size_t size) {
   const size_t bytes = count * size;
   if(bytes < count || bytes < size) {
      return nullptr;
   }
   return sodium_malloc(bytes);
}

int Sodium::sodium_mprotect_noaccess(void* ptr) {
#if defined(BOTAN_HAS_OS_UTILS)
   OS::page_prohibit_access(ptr);
   return 0;
#else
   BOTAN_UNUSED(ptr);
   return -1;
#endif
}

int Sodium::sodium_mprotect_readwrite(void* ptr) {
#if defined(BOTAN_HAS_OS_UTILS)
   OS::page_allow_access(ptr);
   return 0;
#else
   BOTAN_UNUSED(ptr);
   return -1;
#endif
}

}  // namespace Botan

1	/*
2	* (C) 2019 Jack Lloyd
3	*
4	* Botan is released under the Simplified BSD License (see license.txt)
5	*/
6
7	#include <botan/sodium.h>
8
9	#include <botan/mem_ops.h>
10	#include <botan/system_rng.h>
11	#include <botan/internal/chacha.h>
12	#include <botan/internal/ct_utils.h>
13	#include <botan/internal/loadstor.h>
14	#include <cstdlib>
15
16	#if defined(BOTAN_HAS_OS_UTILS)
17	#include <botan/internal/os_utils.h>
18	#endif
19
20	namespace Botan {
21
22	void Sodium::randombytes_buf(void* buf, size_t len) {	×
23	system_rng().randomize(static_cast<uint8_t*>(buf), len);	×
24	}	×
25
26	uint32_t Sodium::randombytes_uniform(uint32_t upper_bound) {	×
27	if(upper_bound <= 1) {	×
28	return 0;
29	}
30
31	// Not completely uniform
32	uint64_t x;	×
33	randombytes_buf(&x, sizeof(x));	×
34	return x % upper_bound;	×
35	}
36
37	void Sodium::randombytes_buf_deterministic(void* buf, size_t size, const uint8_t seed[randombytes_SEEDBYTES]) {	1✔
38	const unsigned char nonce[12] = {'L', 'i', 'b', 's', 'o', 'd', 'i', 'u', 'm', 'D', 'R', 'G'};	1✔
39
40	ChaCha chacha(20);	1✔
41	chacha.set_key(seed, randombytes_SEEDBYTES);	1✔
42	chacha.set_iv(nonce, sizeof(nonce));	1✔
43	chacha.write_keystream(static_cast<uint8_t*>(buf), size);	1✔
44	}	1✔
45
46	int Sodium::crypto_verify_16(const uint8_t x[16], const uint8_t y[16]) {	×
47	return static_cast<int>(CT::is_equal(x, y, 16).select(1, 0));	×
48	}
49
50	int Sodium::crypto_verify_32(const uint8_t x[32], const uint8_t y[32]) {	×
51	return static_cast<int>(CT::is_equal(x, y, 32).select(1, 0));	×
52	}
53
54	int Sodium::crypto_verify_64(const uint8_t x[64], const uint8_t y[64]) {	×
55	return static_cast<int>(CT::is_equal(x, y, 64).select(1, 0));	×
56	}
57
58	void Sodium::sodium_memzero(void* ptr, size_t len) {	×
59	secure_scrub_memory(ptr, len);	×
60	}	×
61
62	int Sodium::sodium_memcmp(const void* x, const void* y, size_t len) {	11✔
63	const auto same = CT::is_equal(static_cast<const uint8_t>(x), static_cast<const uint8_t>(y), len);	11✔
64	// Return 0 if same or -1 if differing
65	return static_cast<int>(same.select(1, 0)) - 1;	11✔
66	}
67
68	int Sodium::sodium_compare(const uint8_t x[], const uint8_t y[], size_t len) {	3✔
69	const uint8_t LT = static_cast<uint8_t>(-1);	3✔
70	const uint8_t EQ = 0;	3✔
71	const uint8_t GT = 1;	3✔
72
73	uint8_t result = EQ; // until found otherwise	3✔
74
75	for(size_t i = 0; i != len; ++i) {	18✔
76	const auto is_eq = CT::Mask<uint8_t>::is_equal(x[i], y[i]);	15✔
77	const auto is_lt = CT::Mask<uint8_t>::is_lt(x[i], y[i]);	15✔
78	result = is_eq.select(result, is_lt.select(LT, GT));	15✔
79	}
80
81	return static_cast<int8_t>(result);	3✔
82	}
83
84	int Sodium::sodium_is_zero(const uint8_t b[], size_t len) {	3✔
85	uint8_t sum = 0;	3✔
86	for(size_t i = 0; i != len; ++i) {	13✔
87	sum \|= b[i];	10✔
88	}
89	return static_cast<int>(CT::Mask<uint8_t>::expand(sum).if_not_set_return(1));	3✔
90	}
91
92	void Sodium::sodium_increment(uint8_t b[], size_t len) {	3✔
93	uint8_t carry = 1;	3✔
94	for(size_t i = 0; i != len; ++i) {	18✔
95	b[i] += carry;	15✔
96	carry &= CT::Mask<uint8_t>::is_zero(b[i]).if_set_return(1);	15✔
97	}
98	}	3✔
99
100	void Sodium::sodium_add(uint8_t a[], const uint8_t b[], size_t len) {	4✔
101	uint8_t carry = 0;	4✔
102	for(size_t i = 0; i != len; ++i) {	24✔
103	a[i] += b[i] + carry;	20✔
104	carry = CT::Mask<uint8_t>::is_lt(a[i], b[i]).if_set_return(1);	20✔
105	}
106	}	4✔
107
108	void* Sodium::sodium_malloc(size_t size) {	1✔
109	const uint64_t len = size;	1✔
110
111	if(size + sizeof(len) < size) {	1✔
112	return nullptr;
113	}
114
115	// NOLINTNEXTLINE(*-no-malloc)
116	uint8_t* p = static_cast<uint8_t*>(std::calloc(size + sizeof(len), 1));	1✔
117	store_le(len, p);	1✔
118	return p + 8;	1✔
119	}
120
121	void Sodium::sodium_free(void* ptr) {	2✔
122	if(ptr == nullptr) {	2✔
123	return;	2✔
124	}
125
126	uint8_t* p = static_cast<uint8_t*>(ptr) - 8;	1✔
127	const uint64_t len = load_le<uint64_t>(p, 0);	1✔
128	secure_scrub_memory(ptr, static_cast<size_t>(len));	1✔
129	// NOLINTNEXTLINE(*-no-malloc)
130	std::free(p);	1✔
131	}
132
133	void* Sodium::sodium_allocarray(size_t count, size_t size) {	×
134	const size_t bytes = count * size;	×
135	if(bytes < count \|\| bytes < size) {	×
136	return nullptr;
137	}
138	return sodium_malloc(bytes);	×
139	}
140
141	int Sodium::sodium_mprotect_noaccess(void* ptr) {	×
142	#if defined(BOTAN_HAS_OS_UTILS)
143	OS::page_prohibit_access(ptr);	×
144	return 0;	×
145	#else
146	BOTAN_UNUSED(ptr);
147	return -1;
148	#endif
149	}
150
151	int Sodium::sodium_mprotect_readwrite(void* ptr) {	×
152	#if defined(BOTAN_HAS_OS_UTILS)
153	OS::page_allow_access(ptr);	×
154	return 0;	×
155	#else
156	BOTAN_UNUSED(ptr);
157	return -1;
158	#endif
159	}
160
161	} // namespace Botan

randombit / botan / 16052725896

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