6546858227

Committed 17 Oct 2023 12:02PM UTC coverage: 91.71% (+0.002%) from 91.708%

Build # 6546858227

Build Type

push

github

Committed by

randombit

Commit Message

Merge GH #3760 Move constant time memory comparisons to ct_utils.h

Run Details

80095 of 87335 relevant lines covered (91.71%)

8508512.25 hits per line

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

72.37

/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 <botan/internal/os_utils.h>
#include <cstdlib>

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 &= (b[i] == 0);
   }
}

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 = (a[i] < b[i]);
   }
}

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) {
   OS::page_prohibit_access(ptr);
   return 0;
}

int Sodium::sodium_mprotect_readwrite(void* ptr) {
   OS::page_allow_access(ptr);
   return 0;
}

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

randombit / botan / 6546858227

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