1 Fix gsize vs guint64 confusion in secure-logging module.
2 --- syslog-ng-syslog-ng-3.27.1/modules/secure-logging/slogkey/slogkey.c.orig 2020-04-30 16:18:56.000000000 +0200
3 +++ syslog-ng-syslog-ng-3.27.1/modules/secure-logging/slogkey/slogkey.c 2020-05-10 17:43:50.686930970 +0200
7 char *keyfile = argv[2];
10 ret = readKey(key, &counter, keyfile);
13 --- syslog-ng-syslog-ng-3.27.1/modules/secure-logging/slog.h.orig 2020-04-30 16:18:56.000000000 +0200
14 +++ syslog-ng-syslog-ng-3.27.1/modules/secure-logging/slog.h 2020-05-10 18:14:12.007892114 +0200
17 unsigned char *plaintext);
19 -void cmac(unsigned char *key, const void *input, guint64 length, unsigned char *out, guint64 *outlen);
20 +void cmac(unsigned char *key, const void *input, gsize length, unsigned char *out, gsize *outlen);
23 -gchar *convertToBase64(unsigned char *input, guint64 len);
24 -guchar *convertToBin(char *input, guint64 *outLen);
25 +gchar *convertToBase64(unsigned char *input, gsize len);
26 +guchar *convertToBin(char *input, gsize *outLen);
29 * Derive key = evolve key multiple times
30 --- syslog-ng-syslog-ng-3.27.1/modules/secure-logging/slog.c.orig 2020-04-30 16:18:56.000000000 +0200
31 +++ syslog-ng-syslog-ng-3.27.1/modules/secure-logging/slog.c 2020-05-10 18:24:58.711228981 +0200
34 memcpy(bigBuf, inputBigMac, AES_BLOCKSIZE);
38 cmac(MACKey, bigBuf, AES_BLOCKSIZE+IV_LENGTH+AES_BLOCKSIZE+ct_length, outputBigMac, &outlen );
40 else //First aggregated MAC
45 cmac(MACKey, &bigBuf[AES_BLOCKSIZE], IV_LENGTH+AES_BLOCKSIZE+ct_length, outputBigMac, &outlen);
51 -guchar *convertToBin(char *input, guint64 *outLen)
52 +guchar *convertToBin(char *input, gsize *outLen)
54 return g_base64_decode ((const gchar *) input, outLen);
57 -gchar *convertToBase64(unsigned char *input, guint64 len)
58 +gchar *convertToBase64(unsigned char *input, gsize len)
60 - return g_base64_encode ((const guchar *) input, (gsize) len);
61 + return g_base64_encode ((const guchar *) input, len);
66 * If Parameter 5 == 0, there was an error.
69 -void cmac(unsigned char *key, const void *input, guint64 length, unsigned char *out, guint64 *outlen)
70 +void cmac(unsigned char *key, const void *input, gsize length, unsigned char *out, gsize *outlen)
72 CMAC_CTX *ctx = CMAC_CTX_new();
74 CMAC_Init(ctx, key, KEY_LENGTH, EVP_aes_256_cbc(), NULL);
75 CMAC_Update(ctx, input, length);
77 - CMAC_Final(ctx, out, outlen);
79 + CMAC_Final(ctx, out, &outsize);
86 for (int i=0; i<outputLength/AES_BLOCKSIZE; i++)
90 cmac(key, input, AES_BLOCKSIZE, &buf[i*AES_BLOCKSIZE], &outlen);
91 input[inputLength-1]++;
94 if (outputLength % AES_BLOCKSIZE!=0)
96 int index = outputLength/AES_BLOCKSIZE;
99 cmac(key, input, AES_BLOCKSIZE, &buf[(index)*AES_BLOCKSIZE], &outlen);
106 - guint64 outlen = 0;
108 status = g_io_channel_write_chars(macfile, outputBuffer, CMAC_LENGTH, &outlen, &error);
109 if(status != G_IO_STATUS_NORMAL)
115 - guint64 outlen = 0;
117 unsigned char keyBuffer[KEY_LENGTH];
118 bzero(keyBuffer, KEY_LENGTH);
119 unsigned char zeroBuffer[CMAC_LENGTH];
126 unsigned char testOutput[CMAC_LENGTH];
128 cmac((guchar *)keydata, &(littleEndianCounter), sizeof(littleEndianCounter), testOutput, &outlen);
133 - guint64 outlen = 0;
136 status = g_io_channel_write_chars(keyfile, key, KEY_LENGTH, &outlen, &error);
137 if(status != G_IO_STATUS_NORMAL)
138 @@ -1029,7 +1031,7 @@
141 char key[CTR_LEN_SIMPLE+1];
142 - snprintf(key, CTR_LEN_SIMPLE+1, "%lu", logEntryOnDisk);
143 + snprintf(key, CTR_LEN_SIMPLE+1, "%"G_GUINT64_FORMAT, logEntryOnDisk);
144 if(g_hash_table_contains(tab, key) == TRUE)
146 msg_error("[SLOG] ERROR: Duplicate entry detected", evt_tag_long("entry", logEntryOnDisk));
147 @@ -1068,7 +1070,7 @@
148 GString *line = input[i];
150 char *ct = &(line->str)[COUNTER_LENGTH+1];
151 - guint64 outputLength;
152 + gsize outputLength;
154 // binBuf = IV + TAG + CT
155 guchar *binBuf = convertToBin(ct, &outputLength);
156 @@ -1088,12 +1090,12 @@
159 // Include colon, whitespace, and \0
160 - g_string_append_printf(output[i], "%0*lx: %.*s", CTR_LEN_SIMPLE, logEntryOnDisk, pt_length, pt);
161 + g_string_append_printf(output[i], "%0*"G_GINT64_MODIFIER"x: %.*s", CTR_LEN_SIMPLE, logEntryOnDisk, pt_length, pt);
165 char *key = malloc(CTR_LEN_SIMPLE+1);
166 - snprintf(key, CTR_LEN_SIMPLE+1, "%lu", logEntryOnDisk);
167 + snprintf(key, CTR_LEN_SIMPLE+1, "%"G_GUINT64_FORMAT, logEntryOnDisk);
169 if (g_hash_table_insert(tab, key, (gpointer)logEntryOnDisk) == FALSE)
171 @@ -1106,7 +1108,7 @@
173 if ((*numberOfLogEntries) == 0UL) //First aggregated MAC
175 - guint64 outlen = 0;
178 unsigned char MACKey[KEY_LENGTH];
179 deriveMACSubKey(mainKey, MACKey);
180 @@ -1116,7 +1118,7 @@
183 // numberOfEntries > 0
186 unsigned char bigBuf[AES_BLOCKSIZE+IV_LENGTH+AES_BLOCKSIZE+pt_length];
187 memcpy(bigBuf, cmac_tag, AES_BLOCKSIZE);
188 memcpy(&bigBuf[AES_BLOCKSIZE], binBuf, IV_LENGTH+AES_BLOCKSIZE+pt_length);
189 @@ -1169,7 +1171,7 @@
192 char key[CTR_LEN_SIMPLE+1];
193 - snprintf(key, CTR_LEN_SIMPLE+1, "%lu", i);
194 + snprintf(key, CTR_LEN_SIMPLE+1, "%"G_GUINT64_FORMAT, i);
196 if(g_hash_table_contains(tab, key) == FALSE)
198 --- syslog-ng-syslog-ng-3.27.1/modules/secure-logging/slogimport/slogimport.c.orig 2020-04-30 16:18:56.000000000 +0200
199 +++ syslog-ng-syslog-ng-3.27.1/modules/secure-logging/slogimport/slogimport.c 2020-05-10 18:29:54.983177242 +0200
201 char mac[CMAC_LENGTH];
203 // Read key and counter
206 int ret = readKey(key, &counter, argv[1]);
213 - sscanf(argv[7], "%zu", &counter);
214 + sscanf(argv[7], "%"G_GUINT64_FORMAT, &counter);
218 --- syslog-ng-syslog-ng-3.27.1/modules/secure-logging/tests/test_secure_logging.c.orig 2020-04-30 16:18:56.000000000 +0200
219 +++ syslog-ng-syslog-ng-3.27.1/modules/secure-logging/tests/test_secure_logging.c 2020-05-10 18:37:11.932385333 +0200
222 GHashTable *tab = NULL;
226 - size_t numberOfLogEntries = 0UL;
229 + guint64 numberOfLogEntries = 0;
231 GString **outputBuffer = (GString **) malloc(sizeof(GString *) * totalNumberOfMessages);
235 GHashTable *tab = NULL;
239 - size_t numberOfLogEntries = 0UL;
242 + guint64 numberOfLogEntries = 0;
244 GString **outputBuffer = (GString **) malloc(sizeof(GString *) * totalNumberOfMessages);