Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#25354 CI #11

Closed
wants to merge 1 commit into from
Closed

#25354 CI #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/Makefile.test.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,6 @@ test_fuzz_fuzz_SOURCES = \
test/fuzz/crypto_chacha20.cpp \
test/fuzz/crypto_chacha20_poly1305_aead.cpp \
test/fuzz/crypto_common.cpp \
test/fuzz/crypto_diff_fuzz_chacha20.cpp \
test/fuzz/crypto_hkdf_hmac_sha256_l32.cpp \
test/fuzz/crypto_poly1305.cpp \
test/fuzz/cuckoocache.cpp \
Expand Down
89 changes: 89 additions & 0 deletions src/crypto/chacha20.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,28 +49,37 @@ void ChaCha20::SetKey(const unsigned char* k, size_t keylen)
input[13] = 0;
input[14] = 0;
input[15] = 0;

prev_block_start_pos = 0;
}

ChaCha20::ChaCha20()
{
memset(input, 0, sizeof(input));
memset(prev_block_bytes, 0, sizeof(prev_block_bytes));
prev_block_start_pos = 0;
}

ChaCha20::ChaCha20(const unsigned char* k, size_t keylen)
{
SetKey(k, keylen);
prev_block_start_pos = 0;
}

void ChaCha20::SetIV(uint64_t iv)
{
input[14] = iv;
input[15] = iv >> 32;

prev_block_start_pos = 0;
}

void ChaCha20::Seek(uint64_t pos)
{
input[12] = pos;
input[13] = pos >> 32;

prev_block_start_pos = 0;
}

void ChaCha20::Keystream(unsigned char* c, size_t bytes)
Expand Down Expand Up @@ -101,6 +110,22 @@ void ChaCha20::Keystream(unsigned char* c, size_t bytes)
j15 = input[15];

for (;;) {
if (prev_block_start_pos) {
size_t available = 64 - prev_block_start_pos;
size_t to_use = (available < bytes) ? available : bytes;
for (i = 0; i < to_use; i++) {
c[i] = prev_block_bytes[prev_block_start_pos + i];
}
c += to_use;
bytes -= to_use;
prev_block_start_pos += to_use;

if (prev_block_start_pos >= 64) {
prev_block_start_pos = 0;
}
if (bytes) continue;
return;
}
if (bytes < 64) {
ctarget = c;
c = tmp;
Expand Down Expand Up @@ -151,6 +176,28 @@ void ChaCha20::Keystream(unsigned char* c, size_t bytes)
x14 += j14;
x15 += j15;

if (bytes < 64) {
// TODO can be optimized, we don't need all the block, just the unused part.
WriteLE32(prev_block_bytes, x0);
WriteLE32(prev_block_bytes + 4, x1);
WriteLE32(prev_block_bytes + 8, x2);
WriteLE32(prev_block_bytes + 12, x3);
WriteLE32(prev_block_bytes + 16, x4);
WriteLE32(prev_block_bytes + 20, x5);
WriteLE32(prev_block_bytes + 24, x6);
WriteLE32(prev_block_bytes + 28, x7);
WriteLE32(prev_block_bytes + 32, x8);
WriteLE32(prev_block_bytes + 36, x9);
WriteLE32(prev_block_bytes + 40, x10);
WriteLE32(prev_block_bytes + 44, x11);
WriteLE32(prev_block_bytes + 48, x12);
WriteLE32(prev_block_bytes + 52, x13);
WriteLE32(prev_block_bytes + 56, x14);
WriteLE32(prev_block_bytes + 60, x15);

prev_block_start_pos = bytes;
}

++j12;
if (!j12) ++j13;

Expand Down Expand Up @@ -181,6 +228,7 @@ void ChaCha20::Keystream(unsigned char* c, size_t bytes)
}
bytes -= 64;
c += 64;
prev_block_start_pos = 0;
}
}

Expand Down Expand Up @@ -212,6 +260,24 @@ void ChaCha20::Crypt(const unsigned char* m, unsigned char* c, size_t bytes)
j15 = input[15];

for (;;) {
if (prev_block_start_pos) {
size_t available = 64 - prev_block_start_pos;
size_t to_use = (available < bytes) ? available : bytes;
for (i = 0; i < to_use; i++) {
c[i] = prev_block_bytes[prev_block_start_pos + i] ^ m[i];
}
m += to_use;
c += to_use;
bytes -= to_use;
prev_block_start_pos += to_use;

if (prev_block_start_pos >= 64) {
prev_block_start_pos = 0;
}
if (bytes) continue;
return;
}

if (bytes < 64) {
// if m has fewer than 64 bytes available, copy m to tmp and
// read from tmp instead
Expand Down Expand Up @@ -266,6 +332,28 @@ void ChaCha20::Crypt(const unsigned char* m, unsigned char* c, size_t bytes)
x14 += j14;
x15 += j15;

if (bytes < 64) {
// TODO can be optimized, we don't need all the block, just the unused part.
WriteLE32(prev_block_bytes, x0);
WriteLE32(prev_block_bytes + 4, x1);
WriteLE32(prev_block_bytes + 8, x2);
WriteLE32(prev_block_bytes + 12, x3);
WriteLE32(prev_block_bytes + 16, x4);
WriteLE32(prev_block_bytes + 20, x5);
WriteLE32(prev_block_bytes + 24, x6);
WriteLE32(prev_block_bytes + 28, x7);
WriteLE32(prev_block_bytes + 32, x8);
WriteLE32(prev_block_bytes + 36, x9);
WriteLE32(prev_block_bytes + 40, x10);
WriteLE32(prev_block_bytes + 44, x11);
WriteLE32(prev_block_bytes + 48, x12);
WriteLE32(prev_block_bytes + 52, x13);
WriteLE32(prev_block_bytes + 56, x14);
WriteLE32(prev_block_bytes + 60, x15);

prev_block_start_pos = bytes;
}

x0 ^= ReadLE32(m + 0);
x1 ^= ReadLE32(m + 4);
x2 ^= ReadLE32(m + 8);
Expand Down Expand Up @@ -314,5 +402,6 @@ void ChaCha20::Crypt(const unsigned char* m, unsigned char* c, size_t bytes)
bytes -= 64;
c += 64;
m += 64;
prev_block_start_pos = 0;
}
}
2 changes: 2 additions & 0 deletions src/crypto/chacha20.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ class ChaCha20
{
private:
uint32_t input[16];
uint8_t prev_block_bytes[64];
uint8_t prev_block_start_pos{0};

public:
ChaCha20();
Expand Down
18 changes: 18 additions & 0 deletions src/test/crypto_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,24 @@ BOOST_AUTO_TEST_CASE(chacha20_testvector)
"fab78c9");
}

BOOST_AUTO_TEST_CASE(chacha20_midblock)
{
auto key = ParseHex("0000000000000000000000000000000000000000000000000000000000000000");
ChaCha20 c20{key.data(), 32};
// get one block of keystream
unsigned char block[64];
c20.Keystream(block, CHACHA20_ROUND_OUTPUT);
unsigned char b1[5], b2[7], b3[52];
c20 = ChaCha20{key.data(), 32};
c20.Keystream(b1, 5);
c20.Keystream(b2, 7);
c20.Keystream(b3, 52);

BOOST_CHECK_EQUAL(0, memcmp(b1, block, 5));
BOOST_CHECK_EQUAL(0, memcmp(b2, block + 5, 7));
BOOST_CHECK_EQUAL(0, memcmp(b3, block + 12, 52));
}

BOOST_AUTO_TEST_CASE(poly1305_testvector)
{
// RFC 7539, section 2.5.2.
Expand Down
Loading