6253464532

Committed 19 Sep 2023 12:06AM UTC coverage: 91.748% (+0.02%) from 91.726%

Build # 6253464532

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #3693 from Rohde-Schwarz/refactor/alignment_buffer

Refactor: AlignmentBuffer<> helper for block-oriented Hashes

Run Details

79472 of 86620 relevant lines covered (91.75%)

8492168.28 hits per line

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

99.07

/src/lib/hash/blake2/blake2b.cpp

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

#include <botan/internal/blake2b.h>

#include <botan/exceptn.h>
#include <botan/mem_ops.h>
#include <botan/internal/fmt.h>
#include <botan/internal/loadstor.h>
#include <botan/internal/rotate.h>
#include <botan/internal/stl_util.h>

#include <algorithm>
#include <array>

namespace Botan {

namespace {

constexpr std::array<uint64_t, 8> blake2b_IV{0x6a09e667f3bcc908,
                                             0xbb67ae8584caa73b,
                                             0x3c6ef372fe94f82b,
                                             0xa54ff53a5f1d36f1,
                                             0x510e527fade682d1,
                                             0x9b05688c2b3e6c1f,
                                             0x1f83d9abfb41bd6b,
                                             0x5be0cd19137e2179};

}  // namespace

BLAKE2b::BLAKE2b(size_t output_bits) : m_output_bits(output_bits), m_H(blake2b_IV.size()), m_T(), m_F(), m_key_size(0) {
   if(output_bits == 0 || output_bits > 512 || output_bits % 8 != 0) {
      throw Invalid_Argument("Bad output bits size for BLAKE2b");
   }

   state_init();
}

void BLAKE2b::state_init() {
   copy_mem(m_H.data(), blake2b_IV.data(), blake2b_IV.size());
   m_H[0] ^= (0x01010000 | (static_cast<uint8_t>(m_key_size) << 8) | static_cast<uint8_t>(output_length()));
   m_T[0] = m_T[1] = 0;
   m_F = 0;

   m_buffer.clear();
   if(m_key_size > 0) {
      m_buffer.append(m_padded_key_buffer);
   }
}

namespace {

BOTAN_FORCE_INLINE void G(uint64_t& a, uint64_t& b, uint64_t& c, uint64_t& d, uint64_t M0, uint64_t M1) {
   a = a + b + M0;
   d = rotr<32>(d ^ a);
   c = c + d;
   b = rotr<24>(b ^ c);
   a = a + b + M1;
   d = rotr<16>(d ^ a);
   c = c + d;
   b = rotr<63>(b ^ c);
}

template <size_t i0,
          size_t i1,
          size_t i2,
          size_t i3,
          size_t i4,
          size_t i5,
          size_t i6,
          size_t i7,
          size_t i8,
          size_t i9,
          size_t iA,
          size_t iB,
          size_t iC,
          size_t iD,
          size_t iE,
          size_t iF>
BOTAN_FORCE_INLINE void ROUND(uint64_t* v, const uint64_t* M) {
   G(v[0], v[4], v[8], v[12], M[i0], M[i1]);
   G(v[1], v[5], v[9], v[13], M[i2], M[i3]);
   G(v[2], v[6], v[10], v[14], M[i4], M[i5]);
   G(v[3], v[7], v[11], v[15], M[i6], M[i7]);
   G(v[0], v[5], v[10], v[15], M[i8], M[i9]);
   G(v[1], v[6], v[11], v[12], M[iA], M[iB]);
   G(v[2], v[7], v[8], v[13], M[iC], M[iD]);
   G(v[3], v[4], v[9], v[14], M[iE], M[iF]);
}

}  // namespace

void BLAKE2b::compress(const uint8_t* input, size_t blocks, uint64_t increment) {
   for(size_t b = 0; b != blocks; ++b) {
      m_T[0] += increment;
      if(m_T[0] < increment) {
         m_T[1]++;
      }

      uint64_t M[16];
      uint64_t v[16];
      load_le(M, input, 16);

      input += BLAKE2B_BLOCKBYTES;

      for(size_t i = 0; i < 8; i++) {
         v[i] = m_H[i];
      }
      for(size_t i = 0; i != 8; ++i) {
         v[i + 8] = blake2b_IV[i];
      }

      v[12] ^= m_T[0];
      v[13] ^= m_T[1];
      v[14] ^= m_F;

      ROUND<0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15>(v, M);
      ROUND<14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3>(v, M);
      ROUND<11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4>(v, M);
      ROUND<7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8>(v, M);
      ROUND<9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13>(v, M);
      ROUND<2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9>(v, M);
      ROUND<12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11>(v, M);
      ROUND<13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10>(v, M);
      ROUND<6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5>(v, M);
      ROUND<10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0>(v, M);
      ROUND<0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15>(v, M);
      ROUND<14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3>(v, M);

      for(size_t i = 0; i < 8; i++) {
         m_H[i] ^= v[i] ^ v[i + 8];
      }
   }
}

void BLAKE2b::add_data(std::span<const uint8_t> input) {
   BufferSlicer in(input);

   while(!in.empty()) {
      if(const auto one_block = m_buffer.handle_unaligned_data(in)) {
         compress(one_block->data(), 1, BLAKE2B_BLOCKBYTES);
      }

      if(m_buffer.in_alignment()) {
         const auto [aligned_data, full_blocks] = m_buffer.aligned_data_to_process(in);
         if(full_blocks > 0) {
            compress(aligned_data.data(), full_blocks, BLAKE2B_BLOCKBYTES);
         }
      }
   }
}

void BLAKE2b::final_result(std::span<uint8_t> output) {
   const auto pos = m_buffer.elements_in_buffer();
   m_buffer.fill_up_with_zeros();

   m_F = 0xFFFFFFFFFFFFFFFF;
   compress(m_buffer.consume().data(), 1, pos);
   copy_out_vec_le(output.data(), output_length(), m_H);
   state_init();
}

Key_Length_Specification BLAKE2b::key_spec() const {
   return Key_Length_Specification(1, 64);
}

std::string BLAKE2b::name() const {
   return fmt("BLAKE2b({})", m_output_bits);
}

std::unique_ptr<HashFunction> BLAKE2b::new_object() const {
   return std::make_unique<BLAKE2b>(m_output_bits);
}

std::unique_ptr<HashFunction> BLAKE2b::copy_state() const {
   return std::make_unique<BLAKE2b>(*this);
}

bool BLAKE2b::has_keying_material() const {
   return m_key_size > 0;
}

void BLAKE2b::key_schedule(std::span<const uint8_t> key) {
   BOTAN_ASSERT_NOMSG(key.size() <= m_buffer.size());

   m_key_size = key.size();
   m_padded_key_buffer.resize(m_buffer.size());

   if(m_padded_key_buffer.size() > m_key_size) {
      size_t padding = m_padded_key_buffer.size() - m_key_size;
      clear_mem(m_padded_key_buffer.data() + m_key_size, padding);
   }

   copy_mem(m_padded_key_buffer.data(), key.data(), key.size());
   state_init();
}

void BLAKE2b::clear() {
   zeroise(m_H);
   m_buffer.clear();
   zeroise(m_padded_key_buffer);
   m_key_size = 0;
   state_init();
}

}  // namespace Botan

1	/*
2	* BLAKE2b
3	* (C) 2016 cynecx
4	* (C) 2017 Jack Lloyd
5	*
6	* Botan is released under the Simplified BSD License (see license.txt)
7	*/
8
9	#include <botan/internal/blake2b.h>
10
11	#include <botan/exceptn.h>
12	#include <botan/mem_ops.h>
13	#include <botan/internal/fmt.h>
14	#include <botan/internal/loadstor.h>
15	#include <botan/internal/rotate.h>
16	#include <botan/internal/stl_util.h>
17
18	#include <algorithm>
19	#include <array>
20
21	namespace Botan {
22
23	namespace {
24
25	constexpr std::array<uint64_t, 8> blake2b_IV{0x6a09e667f3bcc908,
26	0xbb67ae8584caa73b,
27	0x3c6ef372fe94f82b,
28	0xa54ff53a5f1d36f1,
29	0x510e527fade682d1,
30	0x9b05688c2b3e6c1f,
31	0x1f83d9abfb41bd6b,
32	0x5be0cd19137e2179};
33
34	} // namespace
35
36	BLAKE2b::BLAKE2b(size_t output_bits) : m_output_bits(output_bits), m_H(blake2b_IV.size()), m_T(), m_F(), m_key_size(0) {	21,126✔
37	if(output_bits == 0 \|\| output_bits > 512 \|\| output_bits % 8 != 0) {	7,042✔
38	throw Invalid_Argument("Bad output bits size for BLAKE2b");	1✔
39	}
40
41	state_init();	7,041✔
42	}	7,043✔
43
44	void BLAKE2b::state_init() {	232,835✔
45	copy_mem(m_H.data(), blake2b_IV.data(), blake2b_IV.size());	232,835✔
46	m_H[0] ^= (0x01010000 \| (static_cast<uint8_t>(m_key_size) << 8) \| static_cast<uint8_t>(output_length()));	232,835✔
47	m_T[0] = m_T[1] = 0;	232,835✔
48	m_F = 0;	232,835✔
49
50	m_buffer.clear();	232,835✔
51	if(m_key_size > 0) {	232,835✔
52	m_buffer.append(m_padded_key_buffer);	4,597✔
53	}
54	}	232,835✔
55
56	namespace {
57
58	BOTAN_FORCE_INLINE void G(uint64_t& a, uint64_t& b, uint64_t& c, uint64_t& d, uint64_t M0, uint64_t M1) {	23,109,888✔
59	a = a + b + M0;	23,109,888✔
60	d = rotr<32>(d ^ a);	23,109,888✔
61	c = c + d;	23,109,888✔
62	b = rotr<24>(b ^ c);	23,109,888✔
63	a = a + b + M1;	23,109,888✔
64	d = rotr<16>(d ^ a);	23,109,888✔
65	c = c + d;	23,109,888✔
66	b = rotr<63>(b ^ c);	23,109,888✔
67	}
68
69	template <size_t i0,
70	size_t i1,
71	size_t i2,
72	size_t i3,
73	size_t i4,
74	size_t i5,
75	size_t i6,
76	size_t i7,
77	size_t i8,
78	size_t i9,
79	size_t iA,
80	size_t iB,
81	size_t iC,
82	size_t iD,
83	size_t iE,
84	size_t iF>
85	BOTAN_FORCE_INLINE void ROUND(uint64_t* v, const uint64_t* M) {	2,888,736✔
86	G(v[0], v[4], v[8], v[12], M[i0], M[i1]);	5,777,472✔
87	G(v[1], v[5], v[9], v[13], M[i2], M[i3]);	2,888,736✔
88	G(v[2], v[6], v[10], v[14], M[i4], M[i5]);	2,888,736✔
89	G(v[3], v[7], v[11], v[15], M[i6], M[i7]);	2,888,736✔
90	G(v[0], v[5], v[10], v[15], M[i8], M[i9]);	2,888,736✔
91	G(v[1], v[6], v[11], v[12], M[iA], M[iB]);	2,888,736✔
92	G(v[2], v[7], v[8], v[13], M[iC], M[iD]);	2,888,736✔
93	G(v[3], v[4], v[9], v[14], M[iE], M[iF]);	2,888,736✔
94	}
95
96	} // namespace
97
98	void BLAKE2b::compress(const uint8_t* input, size_t blocks, uint64_t increment) {	239,640✔
99	for(size_t b = 0; b != blocks; ++b) {	480,368✔
100	m_T[0] += increment;	240,728✔
101	if(m_T[0] < increment) {	240,728✔
102	m_T[1]++;	×
103	}
104
105	uint64_t M[16];	240,728✔
106	uint64_t v[16];	240,728✔
107	load_le(M, input, 16);	240,728✔
108
109	input += BLAKE2B_BLOCKBYTES;	240,728✔
110
111	for(size_t i = 0; i < 8; i++) {	2,166,552✔
112	v[i] = m_H[i];	1,925,824✔
113	}
114	for(size_t i = 0; i != 8; ++i) {	2,166,552✔
115	v[i + 8] = blake2b_IV[i];	1,925,824✔
116	}
117
118	v[12] ^= m_T[0];	240,728✔
119	v[13] ^= m_T[1];	240,728✔
120	v[14] ^= m_F;	240,728✔
121
122	ROUND<0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15>(v, M);	240,728✔
123	ROUND<14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3>(v, M);	240,728✔
124	ROUND<11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4>(v, M);	240,728✔
125	ROUND<7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8>(v, M);	240,728✔
126	ROUND<9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13>(v, M);	240,728✔
127	ROUND<2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9>(v, M);	240,728✔
128	ROUND<12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11>(v, M);	240,728✔
129	ROUND<13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10>(v, M);	240,728✔
130	ROUND<6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5>(v, M);	240,728✔
131	ROUND<10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0>(v, M);	240,728✔
132	ROUND<0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15>(v, M);	240,728✔
133	ROUND<14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3>(v, M);	240,728✔
134
135	for(size_t i = 0; i < 8; i++) {	2,166,552✔
136	m_H[i] ^= v[i] ^ v[i + 8];	1,925,824✔
137	}
138	}
139	}	239,640✔
140
141	void BLAKE2b::add_data(std::span<const uint8_t> input) {	412,244✔
142	BufferSlicer in(input);	412,244✔
143
144	while(!in.empty()) {	1,249,170✔
145	if(const auto one_block = m_buffer.handle_unaligned_data(in)) {	424,682✔
146	compress(one_block->data(), 1, BLAKE2B_BLOCKBYTES);	13,389✔
147	}
148
149	if(m_buffer.in_alignment()) {	424,682✔
150	const auto [aligned_data, full_blocks] = m_buffer.aligned_data_to_process(in);	16,589✔
151	if(full_blocks > 0) {	16,589✔
152	compress(aligned_data.data(), full_blocks, BLAKE2B_BLOCKBYTES);	4,202✔
153	}
154	}
155	}
156	}	412,244✔
157
158	void BLAKE2b::final_result(std::span<uint8_t> output) {	222,049✔
159	const auto pos = m_buffer.elements_in_buffer();	222,049✔
160	m_buffer.fill_up_with_zeros();	222,049✔
161
162	m_F = 0xFFFFFFFFFFFFFFFF;	222,049✔
163	compress(m_buffer.consume().data(), 1, pos);	222,049✔
164	copy_out_vec_le(output.data(), output_length(), m_H);	222,049✔
165	state_init();	222,049✔
166	}	222,049✔
167
168	Key_Length_Specification BLAKE2b::key_spec() const {	4,324✔
169	return Key_Length_Specification(1, 64);	4,324✔
170	}
171
172	std::string BLAKE2b::name() const {	4,749✔
173	return fmt("BLAKE2b({})", m_output_bits);	4,749✔
174	}
175
176	std::unique_ptr<HashFunction> BLAKE2b::new_object() const {	1,037✔
177	return std::make_unique<BLAKE2b>(m_output_bits);	1,037✔
178	}
179
180	std::unique_ptr<HashFunction> BLAKE2b::copy_state() const {	1,012✔
181	return std::make_unique<BLAKE2b>(*this);	1,012✔
182	}
183
184	bool BLAKE2b::has_keying_material() const {	8,102✔
185	return m_key_size > 0;	8,102✔
186	}
187
188	void BLAKE2b::key_schedule(std::span<const uint8_t> key) {	2,162✔
189	BOTAN_ASSERT_NOMSG(key.size() <= m_buffer.size());	2,162✔
190
191	m_key_size = key.size();	2,162✔
192	m_padded_key_buffer.resize(m_buffer.size());	2,162✔
193
194	if(m_padded_key_buffer.size() > m_key_size) {	2,162✔
195	size_t padding = m_padded_key_buffer.size() - m_key_size;	2,162✔
196	clear_mem(m_padded_key_buffer.data() + m_key_size, padding);	2,162✔
197	}
198
199	copy_mem(m_padded_key_buffer.data(), key.data(), key.size());	2,162✔
200	state_init();	2,162✔
201	}	2,162✔
202
203	void BLAKE2b::clear() {	1,583✔
204	zeroise(m_H);	1,583✔
205	m_buffer.clear();	1,583✔
206	zeroise(m_padded_key_buffer);	1,583✔
207	m_key_size = 0;	1,583✔
208	state_init();	1,583✔
209	}	1,583✔
210
211	} // namespace Botan

randombit / botan / 6253464532

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