vendor/libhydrogen/impl/hydrogen_p.h in dualcone-0.0.1 vs vendor/libhydrogen/impl/hydrogen_p.h in dualcone-1.0.0
- old
+ new
@@ -1,22 +1,22 @@
static int hydro_random_init(void);
/* ---------------- */
#define gimli_BLOCKBYTES 48
-#define gimli_CAPACITY 32
-#define gimli_RATE 16
+#define gimli_CAPACITY 32
+#define gimli_RATE 16
-#define gimli_TAG_HEADER 0x01
+#define gimli_TAG_HEADER 0x01
#define gimli_TAG_PAYLOAD 0x02
-#define gimli_TAG_FINAL 0x08
-#define gimli_TAG_FINAL0 0xf8
-#define gimli_TAG_KEY0 0xfe
-#define gimli_TAG_KEY 0xff
+#define gimli_TAG_FINAL 0x08
+#define gimli_TAG_FINAL0 0xf8
+#define gimli_TAG_KEY0 0xfe
+#define gimli_TAG_KEY 0xff
#define gimli_DOMAIN_AEAD 0x0
-#define gimli_DOMAIN_XOF 0xf
+#define gimli_DOMAIN_XOF 0xf
static void gimli_core_u8(uint8_t state_u8[gimli_BLOCKBYTES], uint8_t tag);
static inline void
gimli_pad_u8(uint8_t buf[gimli_BLOCKBYTES], size_t pos, uint8_t domain)
@@ -26,11 +26,11 @@
}
static inline void
hydro_mem_ct_zero_u32(uint32_t *dst_, size_t n)
{
- volatile uint32_t *volatile dst = (volatile uint32_t * volatile)(void *) dst_;
+ volatile uint32_t *volatile dst = (volatile uint32_t *volatile) (void *) dst_;
size_t i;
for (i = 0; i < n; i++) {
dst[i] = 0;
}
@@ -40,11 +40,11 @@
size_t n) _hydro_attr_warn_unused_result_;
static inline uint32_t
hydro_mem_ct_cmp_u32(const uint32_t *b1_, const uint32_t *b2, size_t n)
{
- const volatile uint32_t *volatile b1 = (const volatile uint32_t *volatile)(const void *) b1_;
+ const volatile uint32_t *volatile b1 = (const volatile uint32_t *volatile) (const void *) b1_;
size_t i;
uint32_t cv = 0;
for (i = 0; i < n; i++) {
cv |= b1[i] ^ b2[i];
@@ -59,14 +59,14 @@
const uint8_t key[hydro_hash_KEYBYTES]);
/* ---------------- */
#define hydro_secretbox_NONCEBYTES 20
-#define hydro_secretbox_MACBYTES 16
+#define hydro_secretbox_MACBYTES 16
/* ---------------- */
-#define hydro_x25519_BYTES 32
+#define hydro_x25519_BYTES 32
#define hydro_x25519_PUBLICKEYBYTES 32
#define hydro_x25519_SECRETKEYBYTES 32
static int hydro_x25519_scalarmult(uint8_t out[hydro_x25519_BYTES],
const uint8_t scalar[hydro_x25519_SECRETKEYBYTES],