diff options
| author | Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im> | 2013-05-06 12:18:59 +0200 |
|---|---|---|
| committer | Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im> | 2013-05-06 12:18:59 +0200 |
| commit | 888aafb15c057645a6b3bce5773ec53101ff42ce (patch) | |
| tree | b19406c083ee9460951a8f66abff844569c9e52a | |
| parent | 521a5aae2c52b560670fc9082fbb3b83534e262f (diff) | |
| parent | a8cb7da74db299956b4883580e89abb04776253f (diff) | |
| download | pidgin-888aafb15c057645a6b3bce5773ec53101ff42ce.tar.gz | |
Merge from main
| -rw-r--r-- | libpurple/ciphers/Makefile.am | 6 | ||||
| -rw-r--r-- | libpurple/ciphers/des.c | 4 | ||||
| -rw-r--r-- | libpurple/ciphers/gchecksum.c | 1 | ||||
| -rw-r--r-- | libpurple/ciphers/hmac.c | 1 | ||||
| -rw-r--r-- | libpurple/ciphers/md4.c | 1 | ||||
| -rw-r--r-- | libpurple/ciphers/rc4.c | 1 |
6 files changed, 11 insertions, 3 deletions
diff --git a/libpurple/ciphers/Makefile.am b/libpurple/ciphers/Makefile.am index 9c8ca933a7..67d887694e 100644 --- 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 index 9aa7687ba0..506cba0b82 100644 --- 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, const guchar input[], size_t in_len, int i = 0; int tmp; guint8 buf[8]; - memcpy(buf, ctx->iv, 8); ssize_t out_len; + memcpy(buf, ctx->iv, 8); 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 index 727ea1369b..11ec463e4b 100644 --- a/libpurple/ciphers/gchecksum.c +++ b/libpurple/ciphers/gchecksum.c @@ -127,6 +127,7 @@ purple_g_checksum_digest(PurpleCipherContext *context, GChecksumType type, 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 index ead3351233..ab8bada421 100644 --- 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 index be8614eff4..25583424d4 100644 --- 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 index 64f296ba3d..de8101f58b 100644 --- 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 * |