Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-25 23:25:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SHA1Digest: Span-ify

Browse source
This commit is contained in:
Stenzek 2024-08-26 21:27:51 +10:00
parent d262e04454
commit 19e94649f1
No known key found for this signature in database
2 changed files with 150 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

174
src/common/sha1_digest.cpp
View file

@ -1,4 +1,9 @@
// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com>
// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0)
#include "sha1_digest.h" #include "sha1_digest.h"
#include "assert.h"
#include <cstring> #include <cstring>
// mostly based on this implementation (public domain): https://gist.github.com/jrabbit/1042021 // mostly based on this implementation (public domain): https://gist.github.com/jrabbit/1042021
@ -6,25 +11,35 @@
/* blk0() and blk() perform the initial expand. */ /* blk0() and blk() perform the initial expand. */
/* I got the idea of expanding during the round function from SSLeay */ /* I got the idea of expanding during the round function from SSLeay */
#define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \ #define blk0(i) (block->l[i] = (rol(block->l[i], 24) & 0xFF00FF00) | (rol(block->l[i], 8) & 0x00FF00FF))
|(rol(block->l[i],8)&0x00FF00FF)) #define blk(i) \
#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \ (block->l[i & 15] = \
^block->l[(i+2)&15]^block->l[i&15],1)) rol(block->l[(i + 13) & 15] ^ block->l[(i + 8) & 15] ^ block->l[(i + 2) & 15] ^ block->l[i & 15], 1))
/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */ /* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30); #define R0(v, w, x, y, z, i) \
#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30); z += ((w & (x ^ y)) ^ y) + blk0(i) + 0x5A827999 + rol(v, 5); \
#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30); w = rol(w, 30);
#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30); #define R1(v, w, x, y, z, i) \
#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30); z += ((w & (x ^ y)) ^ y) + blk(i) + 0x5A827999 + rol(v, 5); \
w = rol(w, 30);
#define R2(v, w, x, y, z, i) \
z += (w ^ x ^ y) + blk(i) + 0x6ED9EBA1 + rol(v, 5); \
w = rol(w, 30);
#define R3(v, w, x, y, z, i) \
z += (((w | x) & y) | (w & x)) + blk(i) + 0x8F1BBCDC + rol(v, 5); \
w = rol(w, 30);
#define R4(v, w, x, y, z, i) \
z += (w ^ x ^ y) + blk(i) + 0xCA62C1D6 + rol(v, 5); \
w = rol(w, 30);
/* Hash a single 512-bit block. This is the core of the algorithm. */ /* Hash a single 512-bit block. This is the core of the algorithm. */
static void SHA1Transform(u32 state[5], const unsigned char buffer[64]) static void SHA1Transform(u32 state[5], const unsigned char buffer[64])
{ {
u32 a, b, c, d, e; u32 a, b, c, d, e;
typedef union { typedef union
{
unsigned char c[64]; unsigned char c[64];
u32 l[16]; u32 l[16];
} CHAR64LONG16; } CHAR64LONG16;
@ -39,26 +54,86 @@ static void SHA1Transform(u32 state[5], const unsigned char buffer[64])
d = state[3]; d = state[3];
e = state[4]; e = state[4];
/* 4 rounds of 20 operations each. Loop unrolled. */ /* 4 rounds of 20 operations each. Loop unrolled. */
R0(a, b, c, d, e, 0); R0(e, a, b, c, d, 1); R0(d, e, a, b, c, 2); R0(c, d, e, a, b, 3); R0(a, b, c, d, e, 0);
R0(b, c, d, e, a, 4); R0(a, b, c, d, e, 5); R0(e, a, b, c, d, 6); R0(d, e, a, b, c, 7); R0(e, a, b, c, d, 1);
R0(c, d, e, a, b, 8); R0(b, c, d, e, a, 9); R0(a, b, c, d, e, 10); R0(e, a, b, c, d, 11); R0(d, e, a, b, c, 2);
R0(d, e, a, b, c, 12); R0(c, d, e, a, b, 13); R0(b, c, d, e, a, 14); R0(a, b, c, d, e, 15); R0(c, d, e, a, b, 3);
R1(e, a, b, c, d, 16); R1(d, e, a, b, c, 17); R1(c, d, e, a, b, 18); R1(b, c, d, e, a, 19); R0(b, c, d, e, a, 4);
R2(a, b, c, d, e, 20); R2(e, a, b, c, d, 21); R2(d, e, a, b, c, 22); R2(c, d, e, a, b, 23); R0(a, b, c, d, e, 5);
R2(b, c, d, e, a, 24); R2(a, b, c, d, e, 25); R2(e, a, b, c, d, 26); R2(d, e, a, b, c, 27); R0(e, a, b, c, d, 6);
R2(c, d, e, a, b, 28); R2(b, c, d, e, a, 29); R2(a, b, c, d, e, 30); R2(e, a, b, c, d, 31); R0(d, e, a, b, c, 7);
R2(d, e, a, b, c, 32); R2(c, d, e, a, b, 33); R2(b, c, d, e, a, 34); R2(a, b, c, d, e, 35); R0(c, d, e, a, b, 8);
R2(e, a, b, c, d, 36); R2(d, e, a, b, c, 37); R2(c, d, e, a, b, 38); R2(b, c, d, e, a, 39); R0(b, c, d, e, a, 9);
R3(a, b, c, d, e, 40); R3(e, a, b, c, d, 41); R3(d, e, a, b, c, 42); R3(c, d, e, a, b, 43); R0(a, b, c, d, e, 10);
R3(b, c, d, e, a, 44); R3(a, b, c, d, e, 45); R3(e, a, b, c, d, 46); R3(d, e, a, b, c, 47); R0(e, a, b, c, d, 11);
R3(c, d, e, a, b, 48); R3(b, c, d, e, a, 49); R3(a, b, c, d, e, 50); R3(e, a, b, c, d, 51); R0(d, e, a, b, c, 12);
R3(d, e, a, b, c, 52); R3(c, d, e, a, b, 53); R3(b, c, d, e, a, 54); R3(a, b, c, d, e, 55); R0(c, d, e, a, b, 13);
R3(e, a, b, c, d, 56); R3(d, e, a, b, c, 57); R3(c, d, e, a, b, 58); R3(b, c, d, e, a, 59); R0(b, c, d, e, a, 14);
R4(a, b, c, d, e, 60); R4(e, a, b, c, d, 61); R4(d, e, a, b, c, 62); R4(c, d, e, a, b, 63); R0(a, b, c, d, e, 15);
R4(b, c, d, e, a, 64); R4(a, b, c, d, e, 65); R4(e, a, b, c, d, 66); R4(d, e, a, b, c, 67); R1(e, a, b, c, d, 16);
R4(c, d, e, a, b, 68); R4(b, c, d, e, a, 69); R4(a, b, c, d, e, 70); R4(e, a, b, c, d, 71); R1(d, e, a, b, c, 17);
R4(d, e, a, b, c, 72); R4(c, d, e, a, b, 73); R4(b, c, d, e, a, 74); R4(a, b, c, d, e, 75); R1(c, d, e, a, b, 18);
R4(e, a, b, c, d, 76); R4(d, e, a, b, c, 77); R4(c, d, e, a, b, 78); R4(b, c, d, e, a, 79); R1(b, c, d, e, a, 19);
R2(a, b, c, d, e, 20);
R2(e, a, b, c, d, 21);
R2(d, e, a, b, c, 22);
R2(c, d, e, a, b, 23);
R2(b, c, d, e, a, 24);
R2(a, b, c, d, e, 25);
R2(e, a, b, c, d, 26);
R2(d, e, a, b, c, 27);
R2(c, d, e, a, b, 28);
R2(b, c, d, e, a, 29);
R2(a, b, c, d, e, 30);
R2(e, a, b, c, d, 31);
R2(d, e, a, b, c, 32);
R2(c, d, e, a, b, 33);
R2(b, c, d, e, a, 34);
R2(a, b, c, d, e, 35);
R2(e, a, b, c, d, 36);
R2(d, e, a, b, c, 37);
R2(c, d, e, a, b, 38);
R2(b, c, d, e, a, 39);
R3(a, b, c, d, e, 40);
R3(e, a, b, c, d, 41);
R3(d, e, a, b, c, 42);
R3(c, d, e, a, b, 43);
R3(b, c, d, e, a, 44);
R3(a, b, c, d, e, 45);
R3(e, a, b, c, d, 46);
R3(d, e, a, b, c, 47);
R3(c, d, e, a, b, 48);
R3(b, c, d, e, a, 49);
R3(a, b, c, d, e, 50);
R3(e, a, b, c, d, 51);
R3(d, e, a, b, c, 52);
R3(c, d, e, a, b, 53);
R3(b, c, d, e, a, 54);
R3(a, b, c, d, e, 55);
R3(e, a, b, c, d, 56);
R3(d, e, a, b, c, 57);
R3(c, d, e, a, b, 58);
R3(b, c, d, e, a, 59);
R4(a, b, c, d, e, 60);
R4(e, a, b, c, d, 61);
R4(d, e, a, b, c, 62);
R4(c, d, e, a, b, 63);
R4(b, c, d, e, a, 64);
R4(a, b, c, d, e, 65);
R4(e, a, b, c, d, 66);
R4(d, e, a, b, c, 67);
R4(c, d, e, a, b, 68);
R4(b, c, d, e, a, 69);
R4(a, b, c, d, e, 70);
R4(e, a, b, c, d, 71);
R4(d, e, a, b, c, 72);
R4(c, d, e, a, b, 73);
R4(b, c, d, e, a, 74);
R4(a, b, c, d, e, 75);
R4(e, a, b, c, d, 76);
R4(d, e, a, b, c, 77);
R4(c, d, e, a, b, 78);
R4(b, c, d, e, a, 79);
/* Add the working vars back into context.state[] */ /* Add the working vars back into context.state[] */
state[0] += a; state[0] += a;
state[1] += b; state[1] += b;
@ -85,7 +160,7 @@ void SHA1Digest::Reset()
count[0] = count[1] = 0; count[0] = count[1] = 0;
} }
std::string SHA1Digest::DigestToString(const u8 digest[20]) std::string SHA1Digest::DigestToString(const std::span<u8, DIGEST_SIZE> digest)
{ {
std::string ret; std::string ret;
ret.reserve(DIGEST_SIZE * 2); ret.reserve(DIGEST_SIZE * 2);
@ -105,23 +180,43 @@ std::string SHA1Digest::DigestToString(const u8 digest[20])
return ret; return ret;
} }
std::array<u8, SHA1Digest::DIGEST_SIZE> SHA1Digest::GetDigest(const void* data, size_t len)
{
std::array<u8, SHA1Digest::DIGEST_SIZE> ret;
SHA1Digest digest;
digest.Update(data, len);
digest.Final(ret.data());
return ret;
}
std::array<u8, SHA1Digest::DIGEST_SIZE> SHA1Digest::GetDigest(std::span<const u8> data)
{
std::array<u8, SHA1Digest::DIGEST_SIZE> ret;
SHA1Digest digest;
digest.Update(data);
digest.Final(ret.data());
return ret;
}
/* Run your data through this. */ /* Run your data through this. */
void SHA1Digest::Update(const void* data, u32 len) void SHA1Digest::Update(const void* data, size_t len)
{ {
const u8* bdata = static_cast<const u8*>(data); const u8* bdata = static_cast<const u8*>(data);
Assert(len <= std::numeric_limits<u32>::max());
const u32 ulen = static_cast<u32>(len);
u32 i; u32 i;
u32 j = count[0]; u32 j = count[0];
if ((count[0] += len << 3) < j) if ((count[0] += ulen << 3) < j)
count[1]++; count[1]++;
count[1] += (len >> 29); count[1] += (ulen >> 29);
j = (j >> 3) & 63; j = (j >> 3) & 63;
if ((j + len) > 63) if ((j + ulen) > 63)
{ {
std::memcpy(&buffer[j], bdata, (i = 64 - j)); std::memcpy(&buffer[j], bdata, (i = 64 - j));
SHA1Transform(state, buffer); SHA1Transform(state, buffer);
for (; i + 63 < len; i += 64) for (; i + 63 < ulen; i += 64)
{ {
SHA1Transform(state, &bdata[i]); SHA1Transform(state, &bdata[i]);
} }
@ -134,6 +229,11 @@ void SHA1Digest::Update(const void* data, u32 len)
memcpy(&buffer[j], &bdata[i], len - i); memcpy(&buffer[j], &bdata[i], len - i);
} }
void SHA1Digest::Update(std::span<const u8> data)
{
Update(data.data(), data.size());
}
/* Add padding and return the message digest. */ /* Add padding and return the message digest. */
void SHA1Digest::Final(u8 digest[DIGEST_SIZE]) void SHA1Digest::Final(u8 digest[DIGEST_SIZE])

16
src/common/sha1_digest.h
View file

@ -1,9 +1,13 @@
// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <stenzek@gmail.com> // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com>
// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) // SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0)
#pragma once #pragma once
#include "types.h" #include "types.h"
#include <array>
#include <string> #include <string>
#include <span>
class SHA1Digest class SHA1Digest
{ {
@ -15,11 +19,15 @@ public:
SHA1Digest(); SHA1Digest();
void Update(const void* data, u32 len); void Update(const void* data, size_t len);
void Update(std::span<const u8> data);
void Final(u8 digest[DIGEST_SIZE]); void Final(u8 digest[DIGEST_SIZE]);
void Reset(); void Reset();
static std::string DigestToString(const u8 digest[DIGEST_SIZE]); static std::string DigestToString(const std::span<u8, DIGEST_SIZE> digest);
static std::array<u8, DIGEST_SIZE> GetDigest(const void* data, size_t len);
static std::array<u8, DIGEST_SIZE> GetDigest(std::span<const u8> data);
private: private:
u32 state[5]; u32 state[5];