/cpw/tomkiewicz/masterpassword: 67ab49ebe93e: Merge from main

[Tomasz Wasilczyk]

Changeset: 67ab49ebe93edf9a85f53ee7076b8cd0fa605e1c
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2013-05-06 12:18 +0200
Branch:	 soc.2008.masterpassword
URL: https://hg.pidgin.im/cpw/tomkiewicz/masterpassword/rev/67ab49ebe93e

Description:

Merge from main

diffstat:

 libpurple/ciphers/Makefile.am |  6 ++++--
 libpurple/ciphers/des.c       |  4 +++-
 libpurple/ciphers/gchecksum.c |  1 +
 libpurple/ciphers/hmac.c      |  1 +
 libpurple/ciphers/md4.c       |  1 +
 libpurple/ciphers/rc4.c       |  1 +
 6 files changed, 11 insertions(+), 3 deletions(-)

diffs (86 lines):

diff --git a/libpurple/ciphers/Makefile.am b/libpurple/ciphers/Makefile.am
--- a/libpurple/ciphers/Makefile.am
+++ b/libpurple/ciphers/Makefile.am
@@ -13,5 +13,7 @@ noinst_HEADERS =\
 INCLUDES = -I$(top_srcdir)/libpurple
 
 AM_CPPFLAGS = \
-	$(GLIB_CFLAGS)
-
+	$(INTGG_CFLAGS) \
+	$(AM_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(DEBUG_CFLAGS)
diff --git a/libpurple/ciphers/des.c b/libpurple/ciphers/des.c
--- a/libpurple/ciphers/des.c
+++ b/libpurple/ciphers/des.c
@@ -499,6 +499,7 @@ static PurpleCipherOps DESOps = {
 	NULL,              /* set batch mode */
 	NULL,              /* get batch mode */
 	NULL,              /* get block size */
+	NULL, NULL, NULL, NULL /* reserved */
 };
 
 /******************************************************************************
@@ -612,8 +613,8 @@ des3_cbc_encrypt(struct _des3_ctx *ctx, 
 	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 @@ static PurpleCipherOps DES3Ops = {
 	des3_set_batch,    /* set batch mode */
 	des3_get_batch,    /* get batch mode */
 	NULL,              /* get block size */
+	NULL, NULL, NULL, NULL /* reserved */
 };
 
 /******************************************************************************
diff --git a/libpurple/ciphers/gchecksum.c b/libpurple/ciphers/gchecksum.c
--- a/libpurple/ciphers/gchecksum.c
+++ b/libpurple/ciphers/gchecksum.c
@@ -127,6 +127,7 @@ purple_g_checksum_digest(PurpleCipherCon
 		NULL,                     /* set batch mode */   \
 		NULL,                     /* get batch mode */   \
 		lower##_get_block_size,   /* get block size */   \
+		NULL, NULL, NULL, NULL    /* reserved */         \
 	}; \
 	\
 	PurpleCipherOps * \
diff --git a/libpurple/ciphers/hmac.c b/libpurple/ciphers/hmac.c
--- a/libpurple/ciphers/hmac.c
+++ b/libpurple/ciphers/hmac.c
@@ -234,6 +234,7 @@ static PurpleCipherOps HMACOps = {
 	NULL,                   /* set batch mode */
 	NULL,                   /* get batch mode */
 	hmac_get_block_size,    /* get block size */
+	NULL, NULL, NULL, NULL  /* reserved */
 };
 
 PurpleCipherOps *
diff --git a/libpurple/ciphers/md4.c b/libpurple/ciphers/md4.c
--- a/libpurple/ciphers/md4.c
+++ b/libpurple/ciphers/md4.c
@@ -296,6 +296,7 @@ static PurpleCipherOps MD4Ops = {
 	NULL,                   /* set batch mode */
 	NULL,                   /* get batch mode */
 	md4_get_block_size,     /* get block size */
+	NULL, NULL, NULL, NULL  /* reserved */
 };
 
 PurpleCipherOps *
diff --git a/libpurple/ciphers/rc4.c b/libpurple/ciphers/rc4.c
--- a/libpurple/ciphers/rc4.c
+++ b/libpurple/ciphers/rc4.c
@@ -149,6 +149,7 @@ static PurpleCipherOps RC4Ops = {
 	NULL,          /* set batch mode */
 	NULL,          /* get batch mode */
 	NULL,          /* get block size */
+	NULL, NULL, NULL, NULL /* reserved */
 };
 
 PurpleCipherOps *