diff --git a/src/mozilla_des.c b/src/mozilla_des.c index 2e14477..0bc7077 100644 --- a/src/mozilla_des.c +++ b/src/mozilla_des.c @@ -748,12 +748,12 @@ void DES_EDE3_ECB(struct DESContext *cx, BYTE *out, const BYTE *in, unsigned int HALF vec[2]; while (in != bufend) { - COPY8BTOHALF(vec, in); + COPY8BTOHALF((void*){vec}, in); in += 8; vec[0] ^= cx->iv[0]; vec[1] ^= cx->iv[1]; DES_Do1Block( cx->ks0, (BYTE *)vec, (BYTE *)cx->iv); - COPY8BFROMHALF(out, cx->iv); + COPY8BFROMHALF(out, (void*){cx->iv}); out += 8; } } @@ -767,12 +767,12 @@ void DES_CBCDe(struct DESContext *cx, BYTE *out, const BYTE *in, unsigned int le for (bufend = in + len; in != bufend; ) { oldciphertext[0] = cx->iv[0]; oldciphertext[1] = cx->iv[1]; - COPY8BTOHALF(cx->iv, in); + COPY8BTOHALF((void*){cx->iv}, in); in += 8; DES_Do1Block(cx->ks0, (BYTE *)cx->iv, (BYTE *)plaintext); plaintext[0] ^= oldciphertext[0]; plaintext[1] ^= oldciphertext[1]; - COPY8BFROMHALF(out, plaintext); + COPY8BFROMHALF(out, (void*){plaintext}); out += 8; } } @@ -783,14 +783,14 @@ void DES_EDE3CBCEn(struct DESContext *cx, BYTE *out, const BYTE *in, unsigned in HALF vec[2]; while (in != bufend) { - COPY8BTOHALF(vec, in); + COPY8BTOHALF((void*){vec}, in); in += 8; vec[0] ^= cx->iv[0]; vec[1] ^= cx->iv[1]; DES_Do1Block( cx->ks0, (BYTE *)vec, (BYTE *)cx->iv); DES_Do1Block( cx->ks1, (BYTE *)cx->iv, (BYTE *)cx->iv); DES_Do1Block( cx->ks2, (BYTE *)cx->iv, (BYTE *)cx->iv); - COPY8BFROMHALF(out, cx->iv); + COPY8BFROMHALF(out, (void*){cx->iv}); out += 8; } } @@ -870,7 +870,7 @@ struct DESContext *DES_CreateContext(const BYTE * key, const BYTE *iv) struct DESContext *cx = &dcx; cx->direction = DES_DECRYPT; - COPY8BTOHALF(cx->iv, iv); + COPY8BTOHALF((void*){cx->iv}, iv); // cx->worker = &DES_EDE3CBCDe; DES_MakeSchedule(cx->ks2, key, DES_DECRYPT); DES_MakeSchedule(cx->ks1, key + 8, DES_ENCRYPT);