diff options
Diffstat (limited to 'grub-core/lib/libgcrypt_wrap/cipher_wrap.h')
-rw-r--r-- | grub-core/lib/libgcrypt_wrap/cipher_wrap.h | 58 |
1 files changed, 10 insertions, 48 deletions
diff --git a/grub-core/lib/libgcrypt_wrap/cipher_wrap.h b/grub-core/lib/libgcrypt_wrap/cipher_wrap.h index 70c0fb4..f537d50 100644 --- a/grub-core/lib/libgcrypt_wrap/cipher_wrap.h +++ b/grub-core/lib/libgcrypt_wrap/cipher_wrap.h @@ -25,56 +25,19 @@ #include <grub/dl.h> #include <grub/crypto.h> -#undef WORDS_BIGENDIAN - -#ifdef GRUB_CPU_WORDS_BIGENDIAN -#define WORDS_BIGENDIAN 1 -#endif +#include <sys/types.h> #undef __GNU_LIBRARY__ #define __GNU_LIBRARY__ 1 -#define DIM ARRAY_SIZE - -typedef grub_uint64_t u64; -typedef grub_uint32_t u32; -typedef grub_uint16_t u16; -typedef grub_uint8_t byte; -typedef grub_size_t size_t; - #define U64_C(c) (c ## ULL) -#define _gcry_burn_stack grub_burn_stack -#define log_error(fmt, args...) grub_dprintf ("crypto", fmt, ## args) - - #define PUBKEY_FLAG_NO_BLINDING (1 << 0) #define CIPHER_INFO_NO_WEAK_KEY 1 #define HAVE_U64_TYPEDEF 1 -typedef union { - int a; - short b; - char c[1]; - long d; -#ifdef HAVE_U64_TYPEDEF - u64 e; -#endif - float f; - double g; -} PROPERLY_ALIGNED_TYPE; - -#define gcry_assert(x) grub_assert_real(GRUB_FILE, __LINE__, x) - -static inline void -grub_assert_real (const char *file, int line, int cond) -{ - if (!cond) - grub_fatal ("Assertion failed at %s:%d\n", file, line); -} - /* Selftests are in separate modules. */ static inline char * selftest (void) @@ -90,11 +53,6 @@ fips_mode (void) #ifdef GRUB_UTIL #pragma GCC diagnostic ignored "-Wshadow" -static inline void * -memcpy (void *dest, const void *src, grub_size_t n) -{ - return grub_memcpy (dest, src, n); -} static inline void * memset (void *s, int c, grub_size_t n) @@ -102,13 +60,17 @@ memset (void *s, int c, grub_size_t n) return grub_memset (s, c, n); } -static inline int -memcmp (const void *s1, const void *s2, grub_size_t n) -{ - return grub_memcmp (s1, s2, n); -} #pragma GCC diagnostic error "-Wshadow" #endif +#define DBG_CIPHER 0 + +#include <string.h> +#pragma GCC diagnostic ignored "-Wredundant-decls" +#include <grub/gcrypt/g10lib.h> +#include <grub/gcrypt/gcrypt.h> + +#define gcry_mpi_mod _gcry_mpi_mod + #endif |