From 820d554d5fd75cf5d2ec8e2a10403972c78d55ba Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Sun, 2 Aug 2020 12:00:43 +0200 Subject: Added argument parsing (file/stdin digest) --- inc/ft_ssl.h | 45 +++++++++++++++++++-------------------------- inc/ft_ssl_sha256.h | 22 ---------------------- 2 files changed, 19 insertions(+), 48 deletions(-) delete mode 100644 inc/ft_ssl_sha256.h (limited to 'inc') diff --git a/inc/ft_ssl.h b/inc/ft_ssl.h index c88e7c3..47f149a 100644 --- a/inc/ft_ssl.h +++ b/inc/ft_ssl.h @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/03 20:27:19 by cacharle #+# #+# */ -/* Updated: 2020/08/01 19:24:12 by charles ### ########.fr */ +/* Updated: 2020/08/02 11:59:54 by charles ### ########.fr */ /* */ /* ************************************************************************** */ #include @@ -26,35 +26,29 @@ typedef struct void *compression_state; size_t compression_state_size; size_t chunk_size; - uint8_t *message; - uint64_t size; } t_message_digest_param; -void *md5_compression_func(void *v_state, uint8_t *chunk); -char *message_digest(t_message_digest_param *param); +void *md5_compression_func(void *v_state, uint8_t *chunk); + +char *message_digest(t_message_digest_param *param, uint8_t *message_origin, uint64_t size); #define MD5_A_INIT 0x67452301 #define MD5_B_INIT 0xefcdab89 #define MD5_C_INIT 0x98badcfe #define MD5_D_INIT 0x10325476 -// # include "ft_ssl_md5.h" -// # include "ft_ssl_sha256.h" - -// typedef int (*t_func_main)(int argc, char **argv); -// -// typedef struct -// { -// char *name; -// t_func_hash func; -// } t_command; -// -// typedef enum -// { -// FLAG_PIPE = 1 << 0, -// FLAG_QUIET = 1 << 1, -// FLAG_REVERSE = 1 << 2, -// } t_flags; +typedef struct +{ + char *name; + t_message_digest_param param; +} t_compression_entry; + +typedef enum +{ + FLAG_QUIET = 1 << 0, + FLAG_REVERSE = 1 << 1, + FLAG_STRING = 1 << 2, +} t_flags; typedef char *(*t_func_hash)(char *message); @@ -62,14 +56,13 @@ typedef char *(*t_func_hash)(char *message); ** error.c */ -// void error_command(char *command); +void error_command(char *command); /* ** args.c */ -// int parse_args(char *name, int argc, char **argv, t_func_hash func_hash); - +int parse_args(int argc, char **argv, char *command, t_message_digest_param *md_param); /* ** utils.c @@ -83,6 +76,6 @@ char *bytes_to_str(uint8_t *bytes, size_t size); ** md5 */ -char *message_digest_md5(uint8_t *msg, size_t size); +char *message_digest_md5(uint8_t *msg, size_t size); #endif diff --git a/inc/ft_ssl_sha256.h b/inc/ft_ssl_sha256.h deleted file mode 100644 index 9427f88..0000000 --- a/inc/ft_ssl_sha256.h +++ /dev/null @@ -1,22 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_ssl_sha256.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: cacharle +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/02/22 07:18:42 by cacharle #+# #+# */ -/* Updated: 2020/02/22 08:57:14 by cacharle ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef FT_SSL_SHA256_H -# define FT_SSL_SHA256_H - -/* -** main_sha256.c -*/ - -int fl_main_sha256(int argc, char **argv); - -#endif -- cgit