Page MenuHome GnuPG
Files F2116031

0001-cipher-proto-remove-forward-typedef-of-cipher_bulk_MP.patch
ballapete (Peter Dyballa)
Actions

Authored By
ballapete
Jan 26 2021, 9:01 PM
Size
4 KB
Subscribers
None

0001-cipher-proto-remove-forward-typedef-of-cipher_bulk_MP.patch
View Options

--- cipher/arcfour.c~ 2020-10-23 13:41:44.000000000 +0200
+++ cipher/arcfour.c 2021-01-26 14:21:37.000000000 +0100
@@ -30,6 +30,7 @@
#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~ 2021-01-07 10:01:04.000000000 +0100
+++ cipher/gost28147.c 2021-01-26 14:22:18.000000000 +0100
@@ -35,6 +35,7 @@
#include "cipher.h"
#include "mac-internal.h"
#include "bufhelp.h"
+#include "cipher-internal.h"
#include "gost.h"
#include "gost-sb.h"
--- cipher/idea.c~ 2020-10-23 13:41:44.000000000 +0200
+++ cipher/idea.c 2021-01-26 14:22:45.000000000 +0100
@@ -48,6 +48,7 @@
#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~ 2021-01-18 18:34:30.000000000 +0100
+++ cipher/mac-cmac.c 2021-01-26 14:23:57.000000000 +0100
@@ -69,7 +69,7 @@
{
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~ 2021-01-07 10:01:04.000000000 +0100
+++ cipher/mac-gmac.c 2021-01-26 14:24:23.000000000 +0100
@@ -54,7 +54,7 @@
{
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~ 2021-01-07 10:01:04.000000000 +0100
+++ cipher/mac-hmac.c 2021-01-26 14:24:43.000000000 +0100
@@ -107,7 +107,7 @@
{
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~ 2021-01-07 10:01:04.000000000 +0100
+++ cipher/mac-internal.h 2021-01-26 14:25:47.000000000 +0100
@@ -39,8 +39,8 @@
/* 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~ 2021-01-07 10:01:04.000000000 +0100
+++ cipher/mac-poly1305.c 2021-01-26 15:05:54.000000000 +0100
@@ -45,7 +45,7 @@
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~ 2021-01-07 10:01:04.000000000 +0100
+++ cipher/mac.c 2021-01-26 14:26:57.000000000 +0100
@@ -517,7 +517,7 @@
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~ 2020-10-23 13:41:44.000000000 +0200
+++ cipher/rfc2268.c 2021-01-26 14:27:22.000000000 +0100
@@ -35,6 +35,7 @@
#include "g10lib.h"
#include "types.h"
#include "cipher.h"
+#include "cipher-internal.h"
#define RFC2268_BLOCKSIZE 8
--- cipher/salsa20.c~ 2020-10-23 13:41:44.000000000 +0200
+++ cipher/salsa20.c 2021-01-26 14:27:49.000000000 +0100
@@ -39,6 +39,7 @@
#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~ 2020-10-23 13:41:44.000000000 +0200
+++ cipher/seed.c 2021-01-26 14:28:06.000000000 +0100
@@ -30,6 +30,7 @@
#include "g10lib.h"
#include "cipher.h"
#include "bufhelp.h"
+#include "cipher-internal.h"
#define NUMKC 16
--- src/cipher-proto.h~ 2021-01-18 18:34:30.000000000 +0100
+++ src/cipher-proto.h 2021-01-26 14:48:26.000000000 +0100
@@ -135,7 +135,7 @@
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,

File Metadata

Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1354147

Event Timeline