aboutsummaryrefslogtreecommitdiff
path: root/src/sha256.c
diff options
context:
space:
mode:
authorCharles Cabergs <me@cacharle.xyz>2020-08-03 13:47:59 +0200
committerCharles Cabergs <me@cacharle.xyz>2020-08-03 13:47:59 +0200
commite2569d315e2156c8c2f2271270cf25bed983583a (patch)
tree29af04390ca2b4910cb87f3ea66622c6af15e4d5 /src/sha256.c
parent93af56873184ab9ed9b17590da142eb4a90722d8 (diff)
downloadft_ssl-e2569d315e2156c8c2f2271270cf25bed983583a.tar.gz
ft_ssl-e2569d315e2156c8c2f2271270cf25bed983583a.tar.bz2
ft_ssl-e2569d315e2156c8c2f2271270cf25bed983583a.zip
Fixing sha256 byte order and typoHEADmaster
Diffstat (limited to 'src/sha256.c')
-rw-r--r--src/sha256.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/sha256.c b/src/sha256.c
index 85336fa..2f20c28 100644
--- a/src/sha256.c
+++ b/src/sha256.c
@@ -6,7 +6,7 @@
/* By: charles <me@cacharle.xyz> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/08/02 16:36:43 by charles #+# #+# */
-/* Updated: 2020/08/03 13:00:09 by charles ### ########.fr */
+/* Updated: 2020/08/03 13:46:07 by charles ### ########.fr */
/* */
/* ************************************************************************** */
@@ -30,14 +30,12 @@ void *sha256_compression_func(void *v_state, uint8_t *chunk)
uint32_t a, b, c, d, e, f, g, h, s0, s1, ch, temp1, temp2, maj;
size_t i;
- ft_memcpy(buf, chunk, 64);
-
- /* for (i = 0; i < 16; i++) */
- /* buf[i] = reverse_bytes32(((uint32_t*)chunk)[i]); */
+ for (i = 0; i < 16; i++)
+ buf[i] = reverse_bytes32(((uint32_t*)chunk)[i]);
for (i = 16; i < 64; i++)
{
- s0 = rotate_right(buf[i - 15], 7) ^ rotate_right(buf[i - 15], 18) ^ rotate_right(buf[i - 15], 3);
- s1 = rotate_right(buf[i - 2], 17) ^ rotate_right(buf[i - 2], 19) ^ rotate_right(buf[i - 2], 10);
+ s0 = rotate_right(buf[i - 15], 7) ^ rotate_right(buf[i - 15], 18) ^ (buf[i - 15] >> 3);
+ s1 = rotate_right(buf[i - 2], 17) ^ rotate_right(buf[i - 2], 19) ^ (buf[i - 2] >> 10);
buf[i] = buf[i - 16] + s0 + buf[i - 7] + s1;
}