diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2017-10-11 10:57:43 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-10-11 11:15:47 +0000 |
| commit | 6ef693dec1fd189d0995d8ad6a06c29c05823ce8 (patch) | |
| tree | 19e4fbd96576f8c1744eaa8dc6c4f5fd3198cb86 | |
| parent | 8fbad3dd56b45874463f9d811b80006314413c0e (diff) | |
[Solaredge] Fix SuSE 11.4 build packet-solaredge.c:1013: error:
declaration of rand shadows a global declaration
Change-Id: I98f4edb14cd241bd709d50e8ac9151448773a658
Reviewed-on: https://code.wireshark.org/review/23884
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/dissectors/packet-solaredge.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-solaredge.c b/epan/dissectors/packet-solaredge.c index 5256237e1c..f2e9795b02 100644 --- a/epan/dissectors/packet-solaredge.c +++ b/epan/dissectors/packet-solaredge.c @@ -1010,27 +1010,27 @@ guint16 calculate_crc(t_solaredge_packet_header *header, const guint8 *data, gin static void solaredge_decrypt(const guint8 *in, gint length, guint8 *out, gcry_cipher_hd_t cipher) { - guint8 rand[SOLAREDGE_ENCRYPTION_KEY_LENGTH]; guint8 rand1[SOLAREDGE_ENCRYPTION_KEY_LENGTH]; + guint8 rand2[SOLAREDGE_ENCRYPTION_KEY_LENGTH]; gint payload_length = length - SOLAREDGE_ENCRYPTION_KEY_LENGTH; guint8 *payload = (guint8 *) wmem_alloc(wmem_packet_scope(), payload_length); guint8 *intermediate_decrypted_payload = (guint8 *) wmem_alloc(wmem_packet_scope(), payload_length); gint i = 0, posa = 0, posb = 0, posc = 0; - memcpy(rand1, in, SOLAREDGE_ENCRYPTION_KEY_LENGTH); + memcpy(rand2, in, SOLAREDGE_ENCRYPTION_KEY_LENGTH); memcpy(payload, in + SOLAREDGE_ENCRYPTION_KEY_LENGTH, payload_length); - gcry_cipher_encrypt(cipher, rand, SOLAREDGE_ENCRYPTION_KEY_LENGTH, rand1, SOLAREDGE_ENCRYPTION_KEY_LENGTH); + gcry_cipher_encrypt(cipher, rand1, SOLAREDGE_ENCRYPTION_KEY_LENGTH, rand2, SOLAREDGE_ENCRYPTION_KEY_LENGTH); for (posb = 0; posb < payload_length; posb++) { - intermediate_decrypted_payload[posb] = payload[posb] ^ rand[posa++]; + intermediate_decrypted_payload[posb] = payload[posb] ^ rand1[posa++]; if (posa == 16) { posa = 0; for (posc = 15; posc >= 0; posc--) { - rand1[posc] = (rand1[posc] + 1) & 0xFF; - if (rand1[posc]) { + rand2[posc] = (rand2[posc] + 1) & 0xFF; + if (rand2[posc]) { break; } } - gcry_cipher_encrypt(cipher, rand, SOLAREDGE_ENCRYPTION_KEY_LENGTH, rand1, SOLAREDGE_ENCRYPTION_KEY_LENGTH); + gcry_cipher_encrypt(cipher, rand1, SOLAREDGE_ENCRYPTION_KEY_LENGTH, rand2, SOLAREDGE_ENCRYPTION_KEY_LENGTH); } } |