Skip to content

Commit 4cf165b

Browse files
author
Louise P
committed
[Function]: Create the function SHA1
1 parent 6eaa9c3 commit 4cf165b

18 files changed

Lines changed: 282 additions & 4028 deletions

File tree

‎Makefile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# By: cpieri <cpieri@student.42.fr> +#+ +:+ +#+ #
77
# +#+#+#+#+#+ +#+ #
88
# Created: 2018/03/15 11:20:25 by cpieri #+# #+# #
9-
# Updated: 2019/12/11 12:37:26 by cpieri ### ########.fr #
9+
# Updated: 2019/12/30 08:54:04 by cpieri ### ########.fr #
1010
# #
1111
# **************************************************************************** #
1212

@@ -35,6 +35,7 @@ DEPS = Makefile \
3535
includes/hash/sha256.h \
3636
includes/hash/hash.h \
3737
includes/hash/md5.h \
38+
includes/hash/sha1.h \
3839
includes/base64/base64.h \
3940
includes/symmetric/symmetric.h \
4041
includes/symmetric/des/des.h \
@@ -57,6 +58,8 @@ SRC_NAME= main.c \
5758
hash/sha256/sha256_utils.c \
5859
hash/md5/md5_utils.c \
5960
hash/md5/md5.c \
61+
hash/sha1/sha1.c \
62+
hash/sha1/sha1_utils.c \
6063
base64/base64.c \
6164
base64/base64_encode.c \
6265
base64/base64_decode.c \

‎hash.1‎

Lines changed: 0 additions & 1001 deletions
This file was deleted.

‎hash.2‎

Lines changed: 0 additions & 1001 deletions
This file was deleted.

‎hash.3‎

Lines changed: 0 additions & 1001 deletions
This file was deleted.

‎hash.4‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎hash.5‎

Lines changed: 0 additions & 1001 deletions
This file was deleted.

‎includes/ft_ssl.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* By: cpieri <cpieri@student.42.fr> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2019/03/06 12:40:02 by cpieri #+# #+# */
9-
/* Updated: 2019/05/08 12:45:25 by cpieri ### ########.fr */
9+
/* Updated: 2019/12/30 09:01:15 by cpieri ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -15,6 +15,7 @@
1515

1616
# include "../libft/include/libft.h"
1717
# include "./hash/md5.h"
18+
# include "./hash/sha1.h"
1819
# include "./hash/sha256.h"
1920
# include "./base64/base64.h"
2021
# include "./symmetric/symmetric.h"

‎includes/hash/md5.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* By: cpieri <cpieri@student.42.fr> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2019/03/06 12:16:22 by cpieri #+# #+# */
9-
/* Updated: 2019/05/22 10:56:42 by cpieri ### ########.fr */
9+
/* Updated: 2019/12/30 08:36:13 by cpieri ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -40,10 +40,10 @@ typedef struct s_md5
4040
uint32_t *w;
4141
} t_md5;
4242

43-
t_md5_utils func_f(uint32_t b, uint32_t c, uint32_t d, int i);
44-
t_md5_utils func_g(uint32_t b, uint32_t c, uint32_t d, int i);
45-
t_md5_utils func_h(uint32_t b, uint32_t c, uint32_t d, int i);
46-
t_md5_utils func_i(uint32_t b, uint32_t c, uint32_t d, int i);
43+
t_md5_utils func_md5_f(uint32_t b, uint32_t c, uint32_t d, int i);
44+
t_md5_utils func_md5_g(uint32_t b, uint32_t c, uint32_t d, int i);
45+
t_md5_utils func_md5_h(uint32_t b, uint32_t c, uint32_t d, int i);
46+
t_md5_utils func_md5_i(uint32_t b, uint32_t c, uint32_t d, int i);
4747
t_hash *set_hash2md5(t_md5 *e);
4848
void *md5(void *data, size_t len_data);
4949

‎includes/hash/sha1.h‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
/* ************************************************************************** */
2+
/* */
3+
/* ::: :::::::: */
4+
/* sha1.h :+: :+: :+: */
5+
/* +:+ +:+ +:+ */
6+
/* By: cpieri <cpieri@student.42.fr> +#+ +:+ +#+ */
7+
/* +#+#+#+#+#+ +#+ */
8+
/* Created: 2019/12/30 08:05:02 by cpieri #+# #+# */
9+
/* Updated: 2019/12/30 08:59:37 by cpieri ### ########.fr */
10+
/* */
11+
/* ************************************************************************** */
12+
13+
#ifndef SHA1_H
14+
# define SHA1_H
15+
16+
# include "hash.h"
17+
18+
# define SHA1_H0 0x67452301
19+
# define SHA1_H1 0xEFCDAB89
20+
# define SHA1_H2 0x98BADCFE
21+
# define SHA1_H3 0x10325476
22+
# define SHA1_H4 0xC3D2E1F0
23+
24+
typedef struct s_sha1_utils
25+
{
26+
uint32_t f;
27+
uint32_t k;
28+
} t_sha1_utils;
29+
30+
typedef struct s_sha1
31+
{
32+
t_padding p;
33+
uint32_t a;
34+
uint32_t b;
35+
uint32_t c;
36+
uint32_t d;
37+
uint32_t e;
38+
uint32_t h0;
39+
uint32_t h1;
40+
uint32_t h2;
41+
uint32_t h3;
42+
uint32_t h4;
43+
uint32_t *w;
44+
} t_sha1;
45+
46+
t_sha1_utils func_sha1_f(uint32_t b, uint32_t c, uint32_t d);
47+
t_sha1_utils func_sha1_g(uint32_t b, uint32_t c, uint32_t d);
48+
t_sha1_utils func_sha1_h(uint32_t b, uint32_t c, uint32_t d);
49+
t_sha1_utils func_sha1_i(uint32_t b, uint32_t c, uint32_t d);
50+
void *sha1(void *data, size_t len_data);
51+
t_hash *set_hash2sha1(t_sha1 *e);
52+
53+
#endif

‎libft/Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# By: cpieri <cpieri@student.42.fr> +#+ +:+ +#+ #
77
# +#+#+#+#+#+ +#+ #
88
# Created: 2017/11/07 18:38:31 by tmilon #+# #+# #
9-
# Updated: 2019/05/20 21:33:21 by cpieri ### ########.fr #
9+
# Updated: 2019/12/30 09:39:19 by cpieri ### ########.fr #
1010
# #
1111
# **************************************************************************** #
1212

@@ -122,6 +122,7 @@ SRCS = ft_atoi.c \
122122
ft_atol.c \
123123
ft_strbits.c \
124124
ft_membits.c \
125+
ft_left_shift.c \
125126
ft_left_rotate.c \
126127
ft_right_rotate.c \
127128
ft_swap_uint32t.c \

0 commit comments

Comments
 (0)