libpurple/ciphers/aescipher.c

branch
soc.2013.gobjectification
changeset 34889
4ea2da14cd0e
parent 34304
faf0414a8b51
parent 34874
e03d555394c5
child 34965
9abd15d6da07
--- a/libpurple/ciphers/aescipher.c	Thu Aug 22 00:32:28 2013 +0530
+++ b/libpurple/ciphers/aescipher.c	Thu Aug 22 01:35:32 2013 +0530
@@ -154,14 +154,14 @@
 static ssize_t
 purple_aes_cipher_unpad_pkcs7(guchar input[], size_t in_len)
 {
-	int padding_len, i;
+	guchar padding_len, i;
 	size_t out_len;
 
 	g_return_val_if_fail(input != NULL, -1);
 	g_return_val_if_fail(in_len > 0, -1);
 
 	padding_len = input[in_len - 1];
-	if (padding_len <= 0 || padding_len > PURPLE_AES_BLOCK_SIZE ||
+	if (padding_len == 0 || padding_len > PURPLE_AES_BLOCK_SIZE ||
 		padding_len > in_len) {
 		purple_debug_warning("cipher-aes",
 			"Invalid padding length: %d (total %" G_GSIZE_FORMAT ") - "

mercurial