Fixing sha256 byte order and typoHEADmaster

2 files changed, 6 insertions, 13 deletions

diff --git a/src/main.c b/src/main.c
index 25b9947..225448e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,17 +6,12 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/03 20:29:33 by cacharle          #+#    #+#             */
-/*   Updated: 2020/08/03 12:39:25 by charles          ###   ########.fr       */
+/*   Updated: 2020/08/03 13:46:52 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "ft_ssl.h"
 
-
-/* #if __BYTE_ORDER == __BIG_ENDIAN */
-/* #warn "bonjour" */
-/* #endif */
-
 static const uint32_t	g_md5_state[4] = {
 	0x67452301,
 	0xefcdab89,
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;
 	}