;;
esac
-PKG_CHECK_MODULES([mLib], [mLib >= 2.2.1])
+PKG_CHECK_MODULES([mLib], [mLib >= 2.4.1])
PKG_CHECK_MODULES([catacomb], [catacomb >= 2.5.0])
AM_CFLAGS="$AM_CFLAGS $mLib_CFLAGS $catacomb_CFLAGS"
Build-Depends: debhelper (>= 9), pkg-config, curl, rsync,
tshark, wireshark-dev (>= 1.12.1),
python (>= 2.6.6-3~),
- mlib-dev (>= 2.2.2),
+ mlib-dev (>= 2.4.1),
catacomb-dev (>= 2.5.0), catacomb-bin (>= 2.1.4)
Build-Depends-Indep: python-cdb, python-gtk2,
python-mlib (>= 1.0.2), python-catacomb (>= 1.2.0)
poly1305_ctx pm;
octet b[POLY1305_KEYSZ + POLY1305_MASKSZ];
- assert(SALSA20_NONCESZ <= sizeof(b));
+ STATIC_ASSERT(SALSA20_NONCESZ <= sizeof(b), "Need more space for nonce");
+
memset(b, 0, SALSA20_NONCESZ - 4); STORE32(b + SALSA20_NONCESZ - 4, seq);
GC_SETIV(c->c, b); GC_ENCRYPT(c->c, 0, b, sizeof(b));
poly1305_keyinit(&pk, b, POLY1305_KEYSZ);
poly1305_ctx pm;
octet b[POLY1305_KEYSZ + POLY1305_MASKSZ];
- assert(SALSA20_NONCESZ <= sizeof(b));
+ STATIC_ASSERT(SALSA20_NONCESZ <= sizeof(b), "Need more space for nonce");
+ STATIC_ASSERT(POLY1305_TAGSZ <= sizeof(b), "Need more space for tag");
+
memset(b, 0, SALSA20_NONCESZ - 4); STORE32(b + SALSA20_NONCESZ - 4, seq);
GC_SETIV(c->c, b); GC_ENCRYPT(c->c, 0, b, sizeof(b));
poly1305_keyinit(&pk, b, POLY1305_KEYSZ);
poly1305_macinit(&pm, &pk, b + POLY1305_KEYSZ);
if (msz) poly1305_hash(&pm, m, msz);
- assert(POLY1305_TAGSZ <= sizeof(b)); poly1305_done(&pm, b);
+ poly1305_done(&pm, b);
return (ct_memeq(t, b, POLY1305_TAGSZ) ? 0 : -1);
}