osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

xtea: use same var name. 

Found by clang-tidy.

Change-Id: I5afce9464536cbbaf8f7f84b165d2ef56e166c2e
Reviewed-on: https://code.wireshark.org/review/31357
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Dario Lombardo 2019-01-04 09:40:52 +01:00 committed by Anders Broman
parent 29bfeccc8d
commit e0e1f3ff31
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wsutil/xtea.c
View File

@ -16,13 +16,13 @@
#include "pint.h"
#include "xtea.h"
void decrypt_xtea_ecb(guint8 output[8], const guint8 v_in[8], const guint32 key[4], guint num_rounds)
void decrypt_xtea_ecb(guint8 plaintext[8], const guint8 ciphertext[8], const guint32 key[4], guint num_rounds)
{
guint i;
guint32 v[2], delta = 0x9E3779B9, sum = delta * num_rounds;
v[0] = pntoh32(&v_in[0]);
v[1] = pntoh32(&v_in[4]);
v[0] = pntoh32(&ciphertext[0]);
v[1] = pntoh32(&ciphertext[4]);
for (i = 0; i < num_rounds; i++) {
v[1] -= (((v[0] << 4) ^ (v[0] >> 5)) + v[0]) ^ (sum + key[(sum >> 11) & 3]);
@ -33,16 +33,16 @@ void decrypt_xtea_ecb(guint8 output[8], const guint8 v_in[8], const guint32 key[
v[0] = GUINT32_TO_BE(v[0]);
v[1] = GUINT32_TO_BE(v[1]);
memcpy(output, v, sizeof v);
memcpy(plaintext, v, sizeof v);
}
void decrypt_xtea_le_ecb(guint8 output[8], const guint8 v_in[8], const guint32 key[4], guint num_rounds)
void decrypt_xtea_le_ecb(guint8 plaintext[8], const guint8 ciphertext[8], const guint32 key[4], guint num_rounds)
{
guint i;
guint32 v[2], delta = 0x9E3779B9, sum = delta * num_rounds;
v[0] = pletoh32(&v_in[0]);
v[1] = pletoh32(&v_in[4]);
v[0] = pletoh32(&ciphertext[0]);
v[1] = pletoh32(&ciphertext[4]);
for (i = 0; i < num_rounds; i++) {
v[1] -= (((v[0] << 4) ^ (v[0] >> 5)) + v[0]) ^ (sum + key[(sum >> 11) & 3]);
@ -53,7 +53,7 @@ void decrypt_xtea_le_ecb(guint8 output[8], const guint8 v_in[8], const guint32 k
v[0] = GUINT32_TO_LE(v[0]);
v[1] = GUINT32_TO_LE(v[1]);
memcpy(output, v, sizeof v);
memcpy(plaintext, v, sizeof v);
}
/*