changeset
fixed the cipher unittests and removed some uncessary g_return_val_if_fails since the cipher api is alredy doing the check, and since the ones in the des stuff seemed to be doing the opposite of the check that the cipher api was doing
Sun, 23 Jun 2013 02:34:22 -0500
- author
- Gary Kramlich <grim@reaperworld.com>
- date
- Sun, 23 Jun 2013 02:34:22 -0500
- changeset 34221
- cdb480f66f8d
- parent 34220
- a9b4ed1c1ee5
- child 34222
- 8967e773228f
fixed the cipher unittests and removed some uncessary g_return_val_if_fails since the cipher api is alredy doing the check, and since the ones in the des stuff seemed to be doing the opposite of the check that the cipher api was doing
| libpurple/ciphers/des.c | file | annotate | diff | comparison | revisions | |
| libpurple/tests/test_cipher.c | file | annotate | diff | comparison | revisions |
--- a/libpurple/ciphers/des.c Sun Jun 23 02:33:38 2013 -0500 +++ b/libpurple/ciphers/des.c Sun Jun 23 02:34:22 2013 -0500 @@ -399,8 +399,6 @@ guint8 buf[8] = {0,0,0,0,0,0,0,0}; ssize_t out_len; - g_return_val_if_fail(out_size < in_len, -1); - while(offset+8<=in_len) { des_ecb_crypt(purple_cipher_context_get_data(context), input+offset, @@ -435,8 +433,6 @@ guint8 buf[8] = {0,0,0,0,0,0,0,0}; ssize_t out_len; - g_return_val_if_fail(out_size < in_len, -1); - while(offset+8<=in_len) { des_ecb_crypt(purple_cipher_context_get_data(context), input+offset, @@ -562,8 +558,6 @@ guint8 buf[8] = {0,0,0,0,0,0,0,0}; ssize_t out_len; - g_return_val_if_fail(out_size < in_len, -1); - while (offset + 8 <= in_len) { des_ecb_crypt(&ctx->key1, input+offset, @@ -616,8 +610,6 @@ ssize_t out_len; memcpy(buf, ctx->iv, 8); - g_return_val_if_fail(out_size < in_len, -1); - while (offset + 8 <= in_len) { for (i = 0; i < 8; i++) buf[i] ^= input[offset + i]; @@ -690,8 +682,6 @@ guint8 buf[8] = {0,0,0,0,0,0,0,0}; ssize_t out_len; - g_return_val_if_fail(out_size < in_len, -1); - while (offset + 8 <= in_len) { /* NOTE: Apply key in reverse */ des_ecb_crypt(&ctx->key3, @@ -745,8 +735,6 @@ guint8 link[8]; ssize_t out_len; - g_return_val_if_fail(out_size < in_len, -1); - memcpy(link, ctx->iv, 8); while (offset + 8 <= in_len) { des_ecb_crypt(&ctx->key3,
--- a/libpurple/tests/test_cipher.c Sun Jun 23 02:33:38 2013 -0500 +++ b/libpurple/tests/test_cipher.c Sun Jun 23 02:34:22 2013 -0500 @@ -22,8 +22,7 @@ context = purple_cipher_context_new(cipher, NULL); \ purple_cipher_context_append(context, (guchar *)(data), strlen((data))); \ \ - ret = purple_cipher_context_digest_to_str(context, sizeof(cdigest), cdigest, \ - NULL); \ + ret = purple_cipher_context_digest_to_str(context, cdigest, sizeof(cdigest)); \ \ fail_unless(ret == TRUE, NULL); \ \ @@ -85,8 +84,7 @@ context = purple_cipher_context_new(cipher, NULL); \ purple_cipher_context_append(context, (guchar *)(data), strlen((data))); \ \ - ret = purple_cipher_context_digest_to_str(context, sizeof(cdigest), cdigest, \ - NULL); \ + ret = purple_cipher_context_digest_to_str(context, cdigest, sizeof(cdigest)); \ \ fail_unless(ret == TRUE, NULL); \ \ @@ -159,8 +157,7 @@ purple_cipher_context_append(context, buff, 1000); \ } \ \ - ret = purple_cipher_context_digest_to_str(context, sizeof(cdigest), cdigest, \ - NULL); \ + ret = purple_cipher_context_digest_to_str(context, cdigest, sizeof(cdigest)); \ \ fail_unless(ret == TRUE, NULL); \ \ @@ -220,8 +217,7 @@ purple_cipher_context_append(context, buff, 1000); \ } \ \ - ret = purple_cipher_context_digest_to_str(context, sizeof(cdigest), cdigest, \ - NULL); \ + ret = purple_cipher_context_digest_to_str(context, cdigest, sizeof(cdigest)); \ \ fail_unless(ret == TRUE, NULL); \ \ @@ -267,20 +263,17 @@ guchar decrypt[len+1] = in; \ guchar key[8+1] = keyz;\ guchar encrypt[len+1] = out;\ - size_t outlen; \ \ cipher = purple_ciphers_find_cipher("des"); \ context = purple_cipher_context_new(cipher, NULL); \ - purple_cipher_context_set_key(context, key); \ + purple_cipher_context_set_key(context, key, sizeof(key)); \ \ - ret = purple_cipher_context_encrypt(context, decrypt, len, answer, &outlen); \ - fail_unless(ret == 0, NULL); \ - fail_unless(outlen == (len), NULL); \ + ret = purple_cipher_context_encrypt(context, decrypt, len, answer, sizeof(answer)); \ + fail_unless(ret == len, NULL); \ fail_unless(memcmp(encrypt, answer, len) == 0, NULL); \ \ - ret = purple_cipher_context_decrypt(context, encrypt, len, answer, &outlen); \ - fail_unless(ret == 0, NULL); \ - fail_unless(outlen == (len), NULL); \ + ret = purple_cipher_context_decrypt(context, encrypt, len, answer, sizeof(answer)); \ + fail_unless(ret == len, NULL); \ fail_unless(memcmp(decrypt, answer, len) == 0, NULL); \ \ purple_cipher_context_destroy(context); \ @@ -314,23 +307,20 @@ guchar answer[len+1]; \ guchar decrypt[len+1] = in; \ guchar encrypt[len+1] = out; \ - size_t outlen; \ gint ret = 0; \ \ cipher = purple_ciphers_find_cipher("des3"); \ context = purple_cipher_context_new(cipher, NULL); \ - purple_cipher_context_set_key(context, (guchar *)key); \ + purple_cipher_context_set_key(context, (guchar *)key, sizeof(key)); \ purple_cipher_context_set_batch_mode(context, (mode)); \ purple_cipher_context_set_iv(context, (guchar *)iv, 8); \ \ - ret = purple_cipher_context_encrypt(context, decrypt, len, answer, &outlen); \ - fail_unless(ret == 0, NULL); \ - fail_unless(outlen == (len), NULL); \ + ret = purple_cipher_context_encrypt(context, decrypt, len, answer, sizeof(answer)); \ + fail_unless(ret == len, NULL); \ fail_unless(memcmp(encrypt, answer, len) == 0, NULL); \ \ - ret = purple_cipher_context_decrypt(context, encrypt, len, answer, &outlen); \ - fail_unless(ret == 0, NULL); \ - fail_unless(outlen == (len), NULL); \ + ret = purple_cipher_context_decrypt(context, encrypt, len, answer, sizeof(answer)); \ + fail_unless(ret == len, NULL); \ fail_unless(memcmp(decrypt, answer, len) == 0, NULL); \ \ purple_cipher_context_destroy(context); \ @@ -488,11 +478,10 @@ cipher = purple_ciphers_find_cipher("hmac"); \ context = purple_cipher_context_new(cipher, NULL); \ purple_cipher_context_set_option(context, "hash", type); \ - purple_cipher_context_set_key_with_len(context, (guchar *)key, (key_len)); \ + purple_cipher_context_set_key(context, (guchar *)key, (key_len)); \ \ purple_cipher_context_append(context, (guchar *)(data), (data_len)); \ - ret = purple_cipher_context_digest_to_str(context, sizeof(cdigest), cdigest, \ - NULL); \ + ret = purple_cipher_context_digest_to_str(context, cdigest, sizeof(cdigest)); \ \ fail_unless(ret == TRUE, NULL); \ fail_unless(strcmp((digest), cdigest) == 0, NULL); \
