First working cipher import

include/grub/cipher_wrap.h

@@ -68,4 +68,17 @@ grub_assert_real (const char *file, int line, int cond)
     grub_fatal ("Assertion failed at %s:%d\n", file, line);
 }
 
+/* Selftests are in separate modules.  */
+static inline char *
+selftest (void)
+{
+  return NULL;
+}
+
+static inline int
+fips_mode (void)
+{
+  return 0;
+}
+
 #endif

include/grub/crypto.h

@@ -64,6 +64,7 @@ typedef enum
     GPG_ERR_WRONG_PUBKEY_ALGO,
   } gcry_err_code_t;
 #define gpg_err_code_t gcry_err_code_t
+#define gpg_error_t gcry_err_code_t
 
 enum gcry_cipher_modes 
   {