Avoid duplicate code

Remove duplicate code in files in the `crapi` directory. Unify functions behind a single iface.
OpenSCAP · Feb 5, 2024 · 85681d7 · 85681d7
1 parent 1d53104
commit 85681d7
Show file tree

Hide file tree

Showing 10 changed files with 281 additions and 1,298 deletions.
diff --git a/src/OVAL/probes/crapi/digest.c b/src/OVAL/probes/crapi/digest.c
diff --git a/src/OVAL/probes/crapi/digest.h b/src/OVAL/probes/crapi/digest.h
@@ -40,21 +40,8 @@ typedef enum {
         CRAPI_DIGEST_SHA384 = 0x40
 } crapi_alg_t;
 
-#include "md5.h"
-#include "sha1.h"
-#include "sha2.h"
-#include "rmd160.h"
-
 int crapi_digest_fd (int fd, crapi_alg_t alg, void *dst, size_t *size);
 
-struct digest_ctbl_t {
-        void *ctx;
-        void *(*init)  (void *, void *);
-        int   (*update)(void *, void *, size_t);
-        int   (*fini)  (void *);
-        void  (*free)  (void *);
-};
-
 int crapi_mdigest_fd (int fd, int num, ... /*crapi_alg_t alg, void *dst, size_t *size, ...*/);
 
 #endif /* CRAPI_DIGEST_H */
diff --git a/src/OVAL/probes/crapi/md5.c b/src/OVAL/probes/crapi/md5.c
diff --git a/src/OVAL/probes/crapi/md5.h b/src/OVAL/probes/crapi/md5.h