diff options
| author | Sadie Powell <sadie@witchery.services> | 2022-01-04 00:39:07 +0000 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2022-01-04 00:39:34 +0000 |
| commit | c9f93eeaedcf3e2d211fea7799ea529d76ebaad5 (patch) | |
| tree | df31d369f0d28f05b6665a09f1542e09b11f9b56 /modules/encryption | |
| parent | db6b2225b186e6254443e00bc04b43664bf96d39 (diff) | |
| parent | a93a7c87b61acc3e696c7bb1f56e9ba313dd6bfd (diff) | |
Merge branch '2.0' into 2.1.
Diffstat (limited to 'modules/encryption')
| -rw-r--r-- | modules/encryption/enc_sha256.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/modules/encryption/enc_sha256.cpp b/modules/encryption/enc_sha256.cpp index f1473aa61..384da515e 100644 --- a/modules/encryption/enc_sha256.cpp +++ b/modules/encryption/enc_sha256.cpp @@ -55,7 +55,6 @@ static const unsigned SHA256_BLOCK_SIZE = 512 / 8; inline static uint32_t SHFR(uint32_t x, uint32_t n) { return x >> n; } inline static uint32_t ROTR(uint32_t x, uint32_t n) { return (x >> n) | (x << ((sizeof(x) << 3) - n)); } -inline static uint32_t ROTL(uint32_t x, uint32_t n) { return (x << n) | (x >> ((sizeof(x) << 3) - n)); } inline static uint32_t CH(uint32_t x, uint32_t y, uint32_t z) { return (x & y) ^ (~x & z); } inline static uint32_t MAJ(uint32_t x, uint32_t y, uint32_t z) { return (x & y) ^ (x & z) ^ (y & z); } |