Mercurial > hg > quicktun
changeset 53:15d651dec8e9 V2.2.3
Fixed a bug in the salty protocol encoding (prepare the buffer as expected by the encryption function)
| author | Ivo Smits <Ivo@UCIS.nl> |
|---|---|
| date | Sat, 16 Nov 2013 14:55:14 +0100 |
| parents | 3115f8af98bb |
| children | 4ff8003d0973 |
| files | src/proto.salty.c version |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/proto.salty.c Sun Oct 27 23:10:43 2013 +0100 +++ b/src/proto.salty.c Sat Nov 16 14:55:14 2013 +0100 @@ -328,6 +328,7 @@ for (i = NONCEBYTES - 1; i >= 0 && ++e->nonce[i] == 0; i--) ; if (e->nonce[20] & 0xE0) return 0; if (debug) dumphex("ENCODE KEY", e->sharedkey, 32); + memset(raw, 0, crypto_box_curve25519xsalsa20poly1305_ZEROBYTES); if (crypto_box_curve25519xsalsa20poly1305_afternm(enc, raw, len + 32, e->nonce, e->sharedkey)) return errorexit("Encryption failed"); enc[12] = (e->nonce[20] & 0x1F) | (0 << 7) | (d->datalocalkeyid << 6) | (d->dataremotekeyid << 5); enc[13] = e->nonce[21]; @@ -376,7 +377,7 @@ dec->nonce[21] = enc[13]; dec->nonce[22] = enc[14]; dec->nonce[23] = enc[15]; - memset(enc, 0, 16); + memset(enc, 0, crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES); if (debug) dumphex("DECODE KEY", dec->sharedkey, 32); if (crypto_box_curve25519xsalsa20poly1305_open_afternm(raw, enc, len - 4 + 16, dec->nonce, dec->sharedkey)) { fprintf(stderr, "Decryption of data packet failed len=%d\n", len);