Mercurial > pidgin3 / changeset

--- a/libpurple/ciphers/Makefile.am	Mon May 06 11:13:33 2013 +0200
+++ b/libpurple/ciphers/Makefile.am	Mon May 06 12:17:16 2013 +0200
@@ -13,5 +13,7 @@
 INCLUDES = -I$(top_srcdir)/libpurple
 
 AM_CPPFLAGS = \
-	$(GLIB_CFLAGS)
-
+	$(INTGG_CFLAGS) \
+	$(AM_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(DEBUG_CFLAGS)

--- a/libpurple/ciphers/des.c	Mon May 06 11:13:33 2013 +0200
+++ b/libpurple/ciphers/des.c	Mon May 06 12:17:16 2013 +0200
@@ -499,6 +499,7 @@
 	NULL,              /* set batch mode */
 	NULL,              /* get batch mode */
 	NULL,              /* get block size */
+	NULL, NULL, NULL, NULL /* reserved */
 };
 
 /******************************************************************************
@@ -612,8 +613,8 @@
 	int i = 0;
 	int tmp;
 	guint8 buf[8];
+	ssize_t out_len;
 	memcpy(buf, ctx->iv, 8);
-	ssize_t out_len;
 
 	g_return_val_if_fail(out_size < in_len, -1);
 
@@ -879,6 +880,7 @@
 	des3_set_batch,    /* set batch mode */
 	des3_get_batch,    /* get batch mode */
 	NULL,              /* get block size */
+	NULL, NULL, NULL, NULL /* reserved */
 };
 
 /******************************************************************************

--- a/libpurple/ciphers/gchecksum.c	Mon May 06 11:13:33 2013 +0200
+++ b/libpurple/ciphers/gchecksum.c	Mon May 06 12:17:16 2013 +0200
@@ -127,6 +127,7 @@
 		NULL,                     /* set batch mode */   \
 		NULL,                     /* get batch mode */   \
 		lower##_get_block_size,   /* get block size */   \
+		NULL, NULL, NULL, NULL    /* reserved */         \
 	}; \
 	\
 	PurpleCipherOps * \

--- a/libpurple/ciphers/hmac.c	Mon May 06 11:13:33 2013 +0200
+++ b/libpurple/ciphers/hmac.c	Mon May 06 12:17:16 2013 +0200
@@ -234,6 +234,7 @@
 	NULL,                   /* set batch mode */
 	NULL,                   /* get batch mode */
 	hmac_get_block_size,    /* get block size */
+	NULL, NULL, NULL, NULL  /* reserved */
 };
 
 PurpleCipherOps *

--- a/libpurple/ciphers/md4.c	Mon May 06 11:13:33 2013 +0200
+++ b/libpurple/ciphers/md4.c	Mon May 06 12:17:16 2013 +0200
@@ -296,6 +296,7 @@
 	NULL,                   /* set batch mode */
 	NULL,                   /* get batch mode */
 	md4_get_block_size,     /* get block size */
+	NULL, NULL, NULL, NULL  /* reserved */
 };
 
 PurpleCipherOps *

--- a/libpurple/ciphers/rc4.c	Mon May 06 11:13:33 2013 +0200
+++ b/libpurple/ciphers/rc4.c	Mon May 06 12:17:16 2013 +0200
@@ -149,6 +149,7 @@
 	NULL,          /* set batch mode */
 	NULL,          /* get batch mode */
 	NULL,          /* get block size */
+	NULL, NULL, NULL, NULL /* reserved */
 };
 
 PurpleCipherOps *