From 66b0a2cb662d963154a8c170b2e0da2ddd71de4e Mon Sep 17 00:00:00 2001 From: lohhiiccc <96543753+lohhiiccc@users.noreply.github.com> Date: Sat, 27 Jun 2026 17:05:37 +0200 Subject: [PATCH] refactor: rename ssl_config to digest_config --- includes/ft_ssl.h | 10 ++++------ includes/internal/ssl/ssl.h | 10 +++++----- src/cli/handlers/handle_p.c | 2 +- src/cli/handlers/handle_q.c | 2 +- src/cli/handlers/handle_r.c | 2 +- src/cli/handlers/handle_s.c | 4 ++-- src/ssl/digest.c | 6 +++--- src/ssl/output.c | 6 +++--- src/ssl/run_file.c | 2 +- src/ssl/run_stdin.c | 10 +++++----- src/ssl/run_string.c | 2 +- 11 files changed, 27 insertions(+), 29 deletions(-) diff --git a/includes/ft_ssl.h b/includes/ft_ssl.h index 2c8b61a..66db794 100644 --- a/includes/ft_ssl.h +++ b/includes/ft_ssl.h @@ -5,19 +5,17 @@ #include #include -#define SSL_MAX_STRINGS 64 +#define DIGEST_MAX_STRINGS 64 -struct ssl_config +struct digest_config { const struct digest_algo *algo; + const char *cmd_name; uint8_t flags; - const char *strings[SSL_MAX_STRINGS]; + const char *strings[DIGEST_MAX_STRINGS]; int nb_strings; char **files; int nb_files; }; -enum cli_code cli_parse_arguments(int argc, char **argv, struct ssl_config *config); -int ssl_run(const struct ssl_config *config); - #endif diff --git a/includes/internal/ssl/ssl.h b/includes/internal/ssl/ssl.h index c168d5b..a96b1d2 100644 --- a/includes/internal/ssl/ssl.h +++ b/includes/internal/ssl/ssl.h @@ -8,12 +8,12 @@ #define MAX_DIGEST_SIZE 64 #define READ_BUFSIZE 4096 -int run_string(const struct ssl_config *config, const char *s); -int run_file(const struct ssl_config *config, const char *path); -int run_stdin(const struct ssl_config *config); -int digest_stream(const struct ssl_config *config, int fd, +int run_string(const struct digest_config *config, const char *s); +int run_file(const struct digest_config *config, const char *path); +int run_stdin(const struct digest_config *config); +int digest_stream(const struct digest_config *config, int fd, const char *label, int show_algo, int echo); -void print_digest(const struct ssl_config *config, const uint8_t *digest, +void print_digest(const struct digest_config *config, const uint8_t *digest, const char *label, int show_algo); #endif diff --git a/src/cli/handlers/handle_p.c b/src/cli/handlers/handle_p.c index be5ecd7..a79c3a2 100644 --- a/src/cli/handlers/handle_p.c +++ b/src/cli/handlers/handle_p.c @@ -6,7 +6,7 @@ int cli_handle_p(__unused const char *arg, void *config_void) { - struct ssl_config *config = (struct ssl_config *)config_void; + struct digest_config *config = (struct digest_config *)config_void; SET_FLAG(config->flags, FLAG_P); return CLI_SUCCESS; diff --git a/src/cli/handlers/handle_q.c b/src/cli/handlers/handle_q.c index e971031..a22af3e 100644 --- a/src/cli/handlers/handle_q.c +++ b/src/cli/handlers/handle_q.c @@ -6,7 +6,7 @@ int cli_handle_q(__unused const char *arg, void *config_void) { - struct ssl_config *config = (struct ssl_config *)config_void; + struct digest_config *config = (struct digest_config *)config_void; SET_FLAG(config->flags, FLAG_Q); return CLI_SUCCESS; diff --git a/src/cli/handlers/handle_r.c b/src/cli/handlers/handle_r.c index f663d64..a529712 100644 --- a/src/cli/handlers/handle_r.c +++ b/src/cli/handlers/handle_r.c @@ -6,7 +6,7 @@ int cli_handle_r(__unused const char *arg, void *config_void) { - struct ssl_config *config = (struct ssl_config *)config_void; + struct digest_config *config = (struct digest_config *)config_void; SET_FLAG(config->flags, FLAG_R); return CLI_SUCCESS; diff --git a/src/cli/handlers/handle_s.c b/src/cli/handlers/handle_s.c index c98d683..bc2302e 100644 --- a/src/cli/handlers/handle_s.c +++ b/src/cli/handlers/handle_s.c @@ -4,9 +4,9 @@ int cli_handle_s(const char *arg, void *config_void) { - struct ssl_config *config = (struct ssl_config *)config_void; + struct digest_config *config = (struct digest_config *)config_void; - if (config->nb_strings >= SSL_MAX_STRINGS) + if (config->nb_strings >= DIGEST_MAX_STRINGS) return CLI_ERROR; config->strings[config->nb_strings++] = arg; return CLI_SUCCESS; diff --git a/src/ssl/digest.c b/src/ssl/digest.c index 0065bce..ff68a61 100644 --- a/src/ssl/digest.c +++ b/src/ssl/digest.c @@ -7,12 +7,12 @@ #include "internal/ssl/ssl.h" /* Forward declarations */ -static void process_chunk(const struct ssl_config *config, union digest_ctx *ctx, +static void process_chunk(const struct digest_config *config, union digest_ctx *ctx, const uint8_t *buf, size_t n, int echo); /* ------------------- */ int -digest_stream(const struct ssl_config *config, int fd, +digest_stream(const struct digest_config *config, int fd, const char *label, int show_algo, int echo) { union digest_ctx ctx; @@ -31,7 +31,7 @@ digest_stream(const struct ssl_config *config, int fd, } static void -process_chunk(const struct ssl_config *config, union digest_ctx *ctx, +process_chunk(const struct digest_config *config, union digest_ctx *ctx, const uint8_t *buf, size_t n, int echo) { if (echo) diff --git a/src/ssl/output.c b/src/ssl/output.c index bf04b8f..3720dd3 100644 --- a/src/ssl/output.c +++ b/src/ssl/output.c @@ -20,7 +20,7 @@ typedef void (*t_formatter)(const char *hex, const char *name_upper, const char *label); /* Forward declarations */ -static enum fmt_mode resolve_fmt(const struct ssl_config *config, +static enum fmt_mode resolve_fmt(const struct digest_config *config, int show_algo); static void build_hex(char *buf, const uint8_t *digest, size_t size); static void build_upper(char *buf, const char *src, size_t size); @@ -42,7 +42,7 @@ static const t_formatter s_formatters[] = { }; void -print_digest(const struct ssl_config *config, const uint8_t *digest, +print_digest(const struct digest_config *config, const uint8_t *digest, const char *label, int show_algo) { char hex[MAX_DIGEST_SIZE * 2 + 1]; @@ -54,7 +54,7 @@ print_digest(const struct ssl_config *config, const uint8_t *digest, } static enum fmt_mode -resolve_fmt(const struct ssl_config *config, int show_algo) +resolve_fmt(const struct digest_config *config, int show_algo) { if (HAS_FLAG(config->flags, FLAG_Q)) return FMT_QUIET; diff --git a/src/ssl/run_file.c b/src/ssl/run_file.c index 6227d75..a7c60a3 100644 --- a/src/ssl/run_file.c +++ b/src/ssl/run_file.c @@ -11,7 +11,7 @@ #include "version_gen.h" int -run_file(const struct ssl_config *config, const char *path) +run_file(const struct digest_config *config, const char *path) { int fd; int ret; diff --git a/src/ssl/run_stdin.c b/src/ssl/run_stdin.c index 08703f2..9cd774c 100644 --- a/src/ssl/run_stdin.c +++ b/src/ssl/run_stdin.c @@ -11,13 +11,13 @@ #include "internal/ssl/ssl.h" /* Forward declarations */ -static int run_stdin_p(const struct ssl_config *config); -static ssize_t read_and_hash(const struct ssl_config *config, union digest_ctx +static int run_stdin_p(const struct digest_config *config); +static ssize_t read_and_hash(const struct digest_config *config, union digest_ctx *ctx, char *label, size_t cap); /* ------------------- */ int -run_stdin(const struct ssl_config *config) +run_stdin(const struct digest_config *config) { if (HAS_FLAG(config->flags, FLAG_P) && !HAS_FLAG(config->flags, FLAG_Q)) return run_stdin_p(config); @@ -26,7 +26,7 @@ run_stdin(const struct ssl_config *config) } static ssize_t -read_and_hash(const struct ssl_config *config, union digest_ctx *ctx, +read_and_hash(const struct digest_config *config, union digest_ctx *ctx, char *label, size_t cap) { uint8_t buf[READ_BUFSIZE]; @@ -47,7 +47,7 @@ read_and_hash(const struct ssl_config *config, union digest_ctx *ctx, } static int -run_stdin_p(const struct ssl_config *config) +run_stdin_p(const struct digest_config *config) { union digest_ctx ctx; uint8_t digest[MAX_DIGEST_SIZE]; diff --git a/src/ssl/run_string.c b/src/ssl/run_string.c index 7c7886d..bc81892 100644 --- a/src/ssl/run_string.c +++ b/src/ssl/run_string.c @@ -8,7 +8,7 @@ #include "internal/ssl/ssl.h" int -run_string(const struct ssl_config *config, const char *s) +run_string(const struct digest_config *config, const char *s) { union digest_ctx ctx; uint8_t digest[MAX_DIGEST_SIZE];