Ticket #62132: 0001-cipher-proto-remove-forward-typedef-of-cipher_bulk_MP.patch

cipher/arcfour.c

@@ -30 +30 @@
 #include "types.h"
 #include "g10lib.h"
 #include "cipher.h"
+#include "cipher-internal.h"
 
 /* USE_AMD64_ASM indicates whether to use AMD64 assembly code. */
 #undef USE_AMD64_ASM

cipher/gost28147.c

@@ -35 +35 @@
 #include "cipher.h"
 #include "mac-internal.h"
 #include "bufhelp.h"
+#include "cipher-internal.h"
 
 #include "gost.h"
 #include "gost-sb.h"

cipher/idea.c

@@ -48 +48 @@
 #include "types.h"  /* for byte and u32 typedefs */
 #include "g10lib.h"
 #include "cipher.h"
+#include "cipher-internal.h"
 
 
 #define IDEA_KEYSIZE 16

cipher/mac-cmac.c

@@ -69 +69 @@
 {
   gcry_err_code_t err;
   gcry_cipher_hd_t hd;
-  int secure = (h->magic == CTX_MAGIC_SECURE);
+  int secure = (h->magic == CTX_MAC_MAGIC_SECURE);
   int cipher_algo;
   unsigned int flags;
 

cipher/mac-gmac.c

@@ -54 +54 @@
 {
   gcry_err_code_t err;
   gcry_cipher_hd_t hd;
-  int secure = (h->magic == CTX_MAGIC_SECURE);
+  int secure = (h->magic == CTX_MAC_MAGIC_SECURE);
   int cipher_algo;
   unsigned int flags;
 

cipher/mac-hmac.c

@@ -107 +107 @@
 {
   gcry_err_code_t err;
   gcry_md_hd_t hd;
-  int secure = (h->magic == CTX_MAGIC_SECURE);
+  int secure = (h->magic == CTX_MAC_MAGIC_SECURE);
   unsigned int flags;
   int md_algo;
 

cipher/mac-internal.h

@@ -39 +39 @@
 
 
 /* Magic values for the context structure.  */
-#define CTX_MAGIC_NORMAL 0x59d9b8af
-#define CTX_MAGIC_SECURE 0x12c27cd0
+#define CTX_MAC_MAGIC_NORMAL 0x59d9b8af
+#define CTX_MAC_MAGIC_SECURE 0x12c27cd0
 
 
 /* MAC module functions. */

cipher/mac-poly1305.c

@@ -45 +45 @@
 poly1305mac_open (gcry_mac_hd_t h)
 {
   struct poly1305mac_context_s *mac_ctx;
-  int secure = (h->magic == CTX_MAGIC_SECURE);
+  int secure = (h->magic == CTX_MAC_MAGIC_SECURE);
   unsigned int flags = (secure ? GCRY_CIPHER_SECURE : 0);
   gcry_err_code_t err;
   int cipher_algo;

cipher/mac.c

@@ -517 +517 @@
   if (!h)
     return gpg_err_code_from_syserror ();
 
-  h->magic = secure ? CTX_MAGIC_SECURE : CTX_MAGIC_NORMAL;
+  h->magic = secure ? CTX_MAC_MAGIC_SECURE : CTX_MAC_MAGIC_NORMAL;
   h->spec = spec;
   h->algo = algo;
   h->gcry_ctx = ctx;

cipher/rfc2268.c

@@ -35 +35 @@
 #include "g10lib.h"
 #include "types.h"
 #include "cipher.h"
+#include "cipher-internal.h"
 
 #define RFC2268_BLOCKSIZE 8
 

cipher/salsa20.c

@@ -39 +39 @@
 #include "g10lib.h"
 #include "cipher.h"
 #include "bufhelp.h"
+#include "cipher-internal.h"
 
 
 /* USE_AMD64 indicates whether to compile with AMD64 code. */

cipher/seed.c

@@ -30 +30 @@
 #include "g10lib.h"
 #include "cipher.h"
 #include "bufhelp.h"
+#include "cipher-internal.h"
 
 #define NUMKC   16
 

src/cipher-proto.h

@@ -129 +129 @@
  *
  */
 
-typedef struct cipher_bulk_ops cipher_bulk_ops_t;
+struct cipher_bulk_ops;
 
 /* Type for the cipher_setkey function.  */
 typedef gcry_err_code_t (*gcry_cipher_setkey_t) (void *c,
                                                  const unsigned char *key,
                                                  unsigned keylen,
-                                                 cipher_bulk_ops_t *bulk_ops);
+                                                 struct cipher_bulk_ops *bulk_ops);
 
 /* Type for the cipher_encrypt function.  */
 typedef unsigned int (*gcry_cipher_encrypt_t) (void *c,