CentOS 6 compilation fixes

This commit is contained in:
lucaderi 2020-06-17 15:40:07 +02:00
parent d610308156
commit 75fd32b48a
2 changed files with 83 additions and 87 deletions

View File

@ -115,19 +115,18 @@ int8_t packet_header_decrypt_if_required (uint8_t packet[], uint16_t packet_len,
int32_t packet_header_encrypt (uint8_t packet[], uint8_t header_len, he_context_t * ctx) {
uint8_t iv[16];
uint64_t *iv64 = (uint64_t*)&iv;
const uint32_t magic = 0x006E326E;
if (header_len < 20)
return (-1);
memcpy (&packet[16], &packet[00], 4);
uint8_t iv[16];
((uint64_t*)iv)[0] = n2n_rand ();
((uint64_t*)iv)[1] = n2n_rand ();
const uint32_t magic = 0x006E326E;
((uint32_t*)iv)[3] = htobe32 (magic);
iv64[0] = n2n_rand();
iv64[1] = n2n_rand();
iv64[3] = htobe32(magic);
iv[12] = header_len;
speck_he (&packet[12], &packet[12], header_len - 12, iv, (speck_context_t*)ctx);

View File

@ -23,9 +23,6 @@
#include "speck.h"
typedef struct speck_context_t he_context_t;
/* Header encryption indicators */
#define HEADER_ENCRYPTION_UNKNOWN 0
#define HEADER_ENCRYPTION_NONE 1