[Debug + Norme]: The function PBKDF2 is perfect with the salt

Author: Louise Pieri

srcs/pbkdf2/pbkdf2.c

@@ -6,7 +6,7 @@
 /*   By: cpieri <[email protected]>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/12/31 13:29:35 by cpieri            #+#    #+#             */
-/*   Updated: 2020/01/06 11:40:27 by cpieri           ###   ########.fr       */
+/*   Updated: 2020/01/07 15:21:37 by cpieri           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -97,21 +97,20 @@ void			*pbkdf2(t_pbkdf *k, uint32_t c, size_t dk_len, enum e_prf func)
 {
 	size_t		i;
 	size_t		l;
-	size_t		r;
 	void		*tmp;
 	char		*ret;
 	t_prf		prf;
 
 	i = 1;
 	prf = pbkdf2_get_prf(func);
 	l = ceil((double)(dk_len / prf.nb_word)) + 1;
-	r = dk_len % prf.nb_word;
 	if (!(ret = (char*)ft_memalloc(sizeof(char) * (dk_len + 1))))
 		return (NULL);
 	while (i <= l)
 	{
 		tmp = pbkdf2_f(k, c, prf, i);
-		ft_memcpy(ret + ((i - 1) * prf.nb_word), tmp, (i == l) ? r : prf.nb_word);
+		ft_memcpy(ret + ((i - 1) * prf.nb_word), tmp,
+				(i == l) ? dk_len % prf.nb_word : prf.nb_word);
 		ft_memdel(&tmp);
 		i++;
 	}

srcs/symmetric/sym_key.c

@@ -6,7 +6,7 @@
 /*   By: cpieri <[email protected]>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/05/06 13:53:56 by cpieri            #+#    #+#             */
-/*   Updated: 2020/01/06 11:38:59 by cpieri           ###   ########.fr       */
+/*   Updated: 2020/01/07 15:31:19 by cpieri           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -45,7 +45,8 @@ void		print_pbkdf(t_pbkdf *k)
 	ft_putstr("pass:	");
 	ft_putendl((char*)k->pass);
 	ft_putstr("salt:	");
-	ft_putendl((char*)k->salt);
+	ft_put64hexa(swap_uint64t(((uint64_t*)k->salt)[0]));
+	ft_putchar('\n');
 	ft_putstr("key:	");
 	key = hex2sum(k->key, k->dk_len / 4);
 	ft_putendl(key);

srcs/symmetric/symmetric_parsing.c

@@ -6,7 +6,7 @@
 /*   By: cpieri <[email protected]>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/05/06 12:04:37 by cpieri            #+#    #+#             */
-/*   Updated: 2020/01/06 14:36:39 by cpieri           ###   ########.fr       */
+/*   Updated: 2020/01/07 15:15:31 by cpieri           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -51,7 +51,7 @@ static void		check_pbkdf2(t_pbkdf **k)
 	}
 	else
 		*k = new_key(get_pass("enter your password: "), 0, 0, 0);
-	pbkdf2(*k, 1, 32, HMAC_SHA1);
+	pbkdf2(*k, 10000, 32, HMAC_SHA256);
 }
 
 static void		get_sym_opt(char **av, int *now, t_opt *opt, t_pbkdf **k)

srcs/symmetric/symmetric_parsing_pt_f_2.c

@@ -6,7 +6,7 @@
 /*   By: cpieri <[email protected]>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/05/08 10:21:15 by cpieri            #+#    #+#             */
-/*   Updated: 2020/01/06 14:44:21 by cpieri           ###   ########.fr       */
+/*   Updated: 2020/01/07 15:14:04 by cpieri           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -51,28 +51,23 @@ void	get_sym_opt_p(char **av, int *now, t_opt *opt, t_pbkdf **k)
 
 void	get_sym_opt_s(char **av, int *now, t_opt *opt, t_pbkdf **k)
 {
-	void		*salt;
-	size_t		len;
-	uint32_t	nb;
+	unsigned char	*salt;
+	size_t			len;
+	uint64_t		nb;
 
 	len = 0;
 	nb = 0;
-	if ((salt = av[*now + 1]) == NULL || av[*now + 1][0] == '-')
+	if ((salt = (unsigned char*)av[*now + 1]) == NULL || av[*now + 1][0] == '-')
 		sym_usage(av[*now]);
 	if ((opt->flags.sym_flags & e_sym_opt_k) != e_sym_opt_k)
 	{
-		len = ft_strlen(salt);
-		if (ft_ishexa(salt) == 1)
+		if (ft_ishexa((char*)salt) == 1)
 		{
-			nb = hex2int(salt);
-			// nb = swap_uint64t(nb);
-			// ft_put64hexa(nb), ft_putchar('\n');
-			// ft_membits(&nb, sizeof(uint64_t), sizeof(uint8_t));
+			nb = swap_uint64t(hex2uint64t((char*)salt));
 			salt = ft_memdup(&nb, sizeof(uint64_t));
-			// ft_put64hexa((uint64_t)salt), ft_putchar('\n');
-			// ft_membits(salt, sizeof(uint64_t), sizeof(uint8_t));
-			len = sizeof(salt);
+			len = sizeof(uint64_t);
 		}
+		len = ft_strlen((char*)salt);
 		opt->flags.sym_flags |= e_sym_opt_s;
 		if (*k == NULL)
 			*k = new_key(NULL, salt, 0, 0);

srcs/tools/get_data.c

@@ -6,7 +6,7 @@
 /*   By: cpieri <[email protected]>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/02/08 12:03:54 by cpieri            #+#    #+#             */
-/*   Updated: 2020/01/06 09:02:47 by cpieri           ###   ########.fr       */
+/*   Updated: 2020/01/07 15:31:42 by cpieri           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -92,15 +92,16 @@ t_data		*get_data(const int fd, const char *fd_name)
 
 void		*get_random(void)
 {
-	void		*ret;
-	uint64_t	random_value;
-	int			dev_random_fd;
-	int			nb_read;
+	unsigned char	*ret;
+	uint64_t		random_value;
+	int				dev_random_fd;
+	int				nb_read;
 
 	random_value = FAILURE;
 	dev_random_fd = open_fd("/dev/random");
 	nb_read = read(dev_random_fd, &random_value, sizeof(uint64_t));
-	ret = ft_hex64_to_char(swap_uint64t(random_value));
+	random_value = swap_uint64t(random_value);
+	ret = ft_memdup(&random_value, sizeof(uint64_t));
 	if (nb_read == FAILURE)
 		print_error("get_random");
 	return (ret);