gcrypt-util: drop several unused definitions

diff --git a/src/test/gcrypt-util.c b/src/test/gcrypt-util.c
index 824fc6c4150c9f65bfbed33475ac4fb18c5ede40..6197ddb9c27e4c91288ca68ee10eb953286c9d46 100644 (file)
--- a/src/test/gcrypt-util.c
+++ b/src/test/gcrypt-util.c
@@ -40,7 +40,6 @@ DLSYM_PROTOTYPE(gcry_mpi_subm) = NULL;
 DLSYM_PROTOTYPE(gcry_mpi_sub_ui) = NULL;
 DLSYM_PROTOTYPE(gcry_prime_check) = NULL;
 DLSYM_PROTOTYPE(gcry_randomize) = NULL;
-DLSYM_PROTOTYPE(gcry_strerror) = NULL;
 #endif
 
 int dlopen_gcrypt(int log_level) {
@@ -82,8 +81,7 @@ int dlopen_gcrypt(int log_level) {
                         DLSYM_ARG(gcry_mpi_subm),
                         DLSYM_ARG(gcry_mpi_sub_ui),
                         DLSYM_ARG(gcry_prime_check),
-                        DLSYM_ARG(gcry_randomize),
-                        DLSYM_ARG(gcry_strerror));
+                        DLSYM_ARG(gcry_randomize));
 #else
         return log_full_errno(log_level, SYNTHETIC_ERRNO(EOPNOTSUPP),
                               "gcrypt support is not compiled in.");

diff --git a/src/test/gcrypt-util.h b/src/test/gcrypt-util.h
index 2a85fa7e1daa650786577d2c286cded30e84ee50..03404886974ce3aef9da21730b94ef79ea9e70b0 100644 (file)
--- a/src/test/gcrypt-util.h
+++ b/src/test/gcrypt-util.h
@@ -56,7 +56,6 @@ extern DLSYM_PROTOTYPE(gcry_mpi_subm);
 extern DLSYM_PROTOTYPE(gcry_mpi_sub_ui);
 extern DLSYM_PROTOTYPE(gcry_prime_check);
 extern DLSYM_PROTOTYPE(gcry_randomize);
-extern DLSYM_PROTOTYPE(gcry_strerror);
 
 /* Copied from gcry_md_putc from gcrypt.h due to the need to call the sym_ variant */
 #define sym_gcry_md_putc(h,c)                              \
@@ -66,14 +65,8 @@ extern DLSYM_PROTOTYPE(gcry_strerror);
                         sym_gcry_md_write((h__), NULL, 0); \
                 (h__)->buf[(h__)->bufpos++] = (c) & 0xff;  \
         } while(false)
+
+DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(gcry_md_hd_t, sym_gcry_md_close, NULL);
 #else
 #define DLOPEN_GCRYPT(log_level, priority) dlopen_gcrypt(log_level)
-
-typedef struct gcry_md_handle *gcry_md_hd_t;
-
-static inline void sym_gcry_md_close(gcry_md_hd_t h) {
-        assert(h == NULL);
-}
 #endif
-
-DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(gcry_md_hd_t, sym_gcry_md_close, NULL);