rbnacl-libsodium 1.0.11 → 1.0.13

data/vendor/libsodium/test/default/aead_aes256gcm.c

@@ -3145,8 +3145,8 @@ tv(void)
             memcmp(mac, expected_ciphertext + message_len,
                    crypto_aead_aes256gcm_ABYTES) != 0) {
             printf("Detached encryption of test vector #%u failed\n", (unsigned int) i);
-            hex = (char *) sodium_malloc((size_t) found_ciphertext_len * 2 + 1);
-            sodium_bin2hex(hex, (size_t) found_ciphertext_len * 2 + 1,
+            hex = (char *) sodium_malloc((size_t) ciphertext_len * 2 + 1);
+            sodium_bin2hex(hex, (size_t) ciphertext_len * 2 + 1,
                            ciphertext, ciphertext_len);
             printf("Computed: [%s]\n", hex);
             sodium_free(hex);

data/vendor/libsodium/test/default/aead_xchacha20poly1305.c

@@ -0,0 +1,188 @@
+
+#define TEST_NAME "aead_xchacha20poly1305"
+#include "cmptest.h"
+
+static int
+tv(void)
+{
+#undef  MLEN
+#define MLEN 114U
+#undef  ADLEN
+#define ADLEN 12U
+#undef  CLEN
+#define CLEN (MLEN + crypto_aead_xchacha20poly1305_ietf_ABYTES)
+    static const unsigned char firstkey[crypto_aead_xchacha20poly1305_ietf_KEYBYTES]
+        = {
+            0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+            0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+            0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
+            0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f
+        };
+#undef  MESSAGE
+#define MESSAGE "Ladies and Gentlemen of the class of '99: If I could offer you " \
+"only one tip for the future, sunscreen would be it."
+    unsigned char *m = (unsigned char *) sodium_malloc(MLEN);
+    static const unsigned char nonce[crypto_aead_xchacha20poly1305_ietf_NPUBBYTES]
+        = { 0x07, 0x00, 0x00, 0x00, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+            0x48, 0x49, 0x4a, 0x4b };
+    static const unsigned char ad[ADLEN]
+        = { 0x50, 0x51, 0x52, 0x53, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7 };
+    unsigned char *c = (unsigned char *) sodium_malloc(CLEN);
+    unsigned char *detached_c = (unsigned char *) sodium_malloc(MLEN);
+    unsigned char *mac = (unsigned char *) sodium_malloc(crypto_aead_xchacha20poly1305_ietf_ABYTES);
+    unsigned char *m2 = (unsigned char *) sodium_malloc(MLEN);
+    unsigned long long found_clen;
+    unsigned long long found_maclen;
+    unsigned long long m2len;
+    size_t i;
+
+    assert(sizeof MESSAGE - 1U == MLEN);
+    memcpy(m, MESSAGE, MLEN);
+    crypto_aead_xchacha20poly1305_ietf_encrypt(c, &found_clen, m, MLEN,
+                                              ad, ADLEN,
+                                              NULL, nonce, firstkey);
+    if (found_clen != MLEN + crypto_aead_xchacha20poly1305_ietf_abytes()) {
+        printf("found_clen is not properly set\n");
+    }
+    for (i = 0U; i < CLEN; ++i) {
+        printf(",0x%02x", (unsigned int) c[i]);
+        if (i % 8 == 7) {
+            printf("\n");
+        }
+    }
+    printf("\n");
+    crypto_aead_xchacha20poly1305_ietf_encrypt_detached(detached_c,
+                                                       mac, &found_maclen,
+                                                       m, MLEN,
+                                                       ad, ADLEN,
+                                                       NULL, nonce, firstkey);
+    if (found_maclen != crypto_aead_xchacha20poly1305_ietf_abytes()) {
+        printf("found_maclen is not properly set\n");
+    }
+    if (memcmp(detached_c, c, MLEN) != 0) {
+        printf("detached ciphertext is bogus\n");
+    }
+
+    if (crypto_aead_xchacha20poly1305_ietf_decrypt(m2, &m2len, NULL, c, CLEN, ad,
+                                                  ADLEN, nonce, firstkey) != 0) {
+        printf("crypto_aead_xchacha20poly1305_ietf_decrypt() failed\n");
+    }
+    if (m2len != MLEN) {
+        printf("m2len is not properly set\n");
+    }
+    if (memcmp(m, m2, MLEN) != 0) {
+        printf("m != m2\n");
+    }
+    memset(m2, 0, m2len);
+    if (crypto_aead_xchacha20poly1305_ietf_decrypt_detached(m2, NULL,
+                                                           c, MLEN, mac,
+                                                           ad, ADLEN,
+                                                           nonce, firstkey) != 0) {
+        printf("crypto_aead_xchacha20poly1305_ietf_decrypt_detached() failed\n");
+    }
+    if (memcmp(m, m2, MLEN) != 0) {
+        printf("detached m != m2\n");
+    }
+
+    for (i = 0U; i < CLEN; i++) {
+        c[i] ^= (i + 1U);
+        if (crypto_aead_xchacha20poly1305_ietf_decrypt(m2, NULL, NULL, c, CLEN,
+                                                      ad, ADLEN, nonce, firstkey)
+            == 0 || memcmp(m, m2, MLEN) == 0) {
+            printf("message can be forged\n");
+        }
+        c[i] ^= (i + 1U);
+    }
+    crypto_aead_xchacha20poly1305_ietf_encrypt(c, &found_clen, m, MLEN,
+                                              NULL, 0U, NULL, nonce, firstkey);
+    if (found_clen != CLEN) {
+        printf("clen is not properly set (adlen=0)\n");
+    }
+    for (i = 0U; i < CLEN; ++i) {
+        printf(",0x%02x", (unsigned int) c[i]);
+        if (i % 8 == 7) {
+            printf("\n");
+        }
+    }
+    printf("\n");
+    if (crypto_aead_xchacha20poly1305_ietf_decrypt(m2, &m2len, NULL, c, CLEN,
+                                                  NULL, 0U, nonce, firstkey) != 0) {
+        printf("crypto_aead_xchacha20poly1305_ietf_decrypt() failed (adlen=0)\n");
+    }
+    if (m2len != MLEN) {
+        printf("m2len is not properly set (adlen=0)\n");
+    }
+    if (memcmp(m, m2, MLEN) != 0) {
+        printf("m != m2 (adlen=0)\n");
+    }
+    m2len = 1;
+    if (crypto_aead_xchacha20poly1305_ietf_decrypt(
+            m2, &m2len, NULL, NULL,
+            randombytes_uniform(crypto_aead_xchacha20poly1305_ietf_ABYTES),
+            NULL, 0U, nonce, firstkey) != -1) {
+        printf("crypto_aead_xchacha20poly1305_ietf_decrypt() worked with a short "
+               "ciphertext\n");
+    }
+    if (m2len != 0) {
+        printf("Message length should have been set to zero after a failure\n");
+    }
+    m2len = 1;
+    if (crypto_aead_xchacha20poly1305_ietf_decrypt(m2, &m2len, NULL, c, 0U, NULL, 0U,
+                                                  nonce, firstkey) != -1) {
+        printf("crypto_aead_xchacha20poly1305_ietf_decrypt() worked with an empty "
+               "ciphertext\n");
+    }
+    if (m2len != 0) {
+        printf("Message length should have been set to zero after a failure\n");
+    }
+
+    memcpy(c, m, MLEN);
+    crypto_aead_xchacha20poly1305_ietf_encrypt(c, &found_clen, c, MLEN,
+                                              NULL, 0U, NULL, nonce, firstkey);
+    if (found_clen != CLEN) {
+        printf("clen is not properly set (adlen=0)\n");
+    }
+    for (i = 0U; i < CLEN; ++i) {
+        printf(",0x%02x", (unsigned int) c[i]);
+        if (i % 8 == 7) {
+            printf("\n");
+        }
+    }
+    printf("\n");
+
+    if (crypto_aead_xchacha20poly1305_ietf_decrypt(c, &m2len, NULL, c, CLEN,
+                                                  NULL, 0U, nonce, firstkey) != 0) {
+        printf("crypto_aead_xchacha20poly1305_ietf_decrypt() failed (adlen=0)\n");
+    }
+    if (m2len != MLEN) {
+        printf("m2len is not properly set (adlen=0)\n");
+    }
+    if (memcmp(m, c, MLEN) != 0) {
+        printf("m != c (adlen=0)\n");
+    }
+
+    sodium_free(c);
+    sodium_free(detached_c);
+    sodium_free(mac);
+    sodium_free(m2);
+    sodium_free(m);
+
+    assert(crypto_aead_xchacha20poly1305_ietf_keybytes() == crypto_aead_xchacha20poly1305_ietf_KEYBYTES);
+    assert(crypto_aead_xchacha20poly1305_ietf_npubbytes() == crypto_aead_xchacha20poly1305_ietf_NPUBBYTES);
+    assert(crypto_aead_xchacha20poly1305_ietf_nsecbytes() == 0U);
+    assert(crypto_aead_xchacha20poly1305_ietf_nsecbytes() == crypto_aead_xchacha20poly1305_ietf_NSECBYTES);
+    assert(crypto_aead_xchacha20poly1305_IETF_KEYBYTES  == crypto_aead_xchacha20poly1305_ietf_KEYBYTES);
+    assert(crypto_aead_xchacha20poly1305_IETF_NSECBYTES == crypto_aead_xchacha20poly1305_ietf_NSECBYTES);
+    assert(crypto_aead_xchacha20poly1305_IETF_NPUBBYTES == crypto_aead_xchacha20poly1305_ietf_NPUBBYTES);
+    assert(crypto_aead_xchacha20poly1305_IETF_ABYTES    == crypto_aead_xchacha20poly1305_ietf_ABYTES);
+
+    return 0;
+}
+
+int
+main(void)
+{
+    tv();
+
+    return 0;
+}

data/vendor/libsodium/test/default/aead_xchacha20poly1305.exp

@@ -0,0 +1,51 @@
+,0x45,0x3c,0x06,0x93,0xa7,0x40,0x7f,0x04
+,0xff,0x4c,0x56,0xae,0xdb,0x17,0xa3,0xc0
+,0xa1,0xaf,0xff,0x01,0x17,0x49,0x30,0xfc
+,0x22,0x28,0x7c,0x33,0xdb,0xcf,0x0a,0xc8
+,0xb8,0x9a,0xd9,0x29,0x53,0x0a,0x1b,0xb3
+,0xab,0x5e,0x69,0xf2,0x4c,0x7f,0x60,0x70
+,0xc8,0xf8,0x40,0xc9,0xab,0xb4,0xf6,0x9f
+,0xbf,0xc8,0xa7,0xff,0x51,0x26,0xfa,0xee
+,0xbb,0xb5,0x58,0x05,0xee,0x9c,0x1c,0xf2
+,0xce,0x5a,0x57,0x26,0x32,0x87,0xae,0xc5
+,0x78,0x0f,0x04,0xec,0x32,0x4c,0x35,0x14
+,0x12,0x2c,0xfc,0x32,0x31,0xfc,0x1a,0x8b
+,0x71,0x8a,0x62,0x86,0x37,0x30,0xa2,0x70
+,0x2b,0xb7,0x63,0x66,0x11,0x6b,0xed,0x09
+,0xe0,0xfd,0x5c,0x6d,0x84,0xb6,0xb0,0xc1
+,0xab,0xaf,0x24,0x9d,0x5d,0xd0,0xf7,0xf5
+,0xa7,0xea
+,0x45,0x3c,0x06,0x93,0xa7,0x40,0x7f,0x04
+,0xff,0x4c,0x56,0xae,0xdb,0x17,0xa3,0xc0
+,0xa1,0xaf,0xff,0x01,0x17,0x49,0x30,0xfc
+,0x22,0x28,0x7c,0x33,0xdb,0xcf,0x0a,0xc8
+,0xb8,0x9a,0xd9,0x29,0x53,0x0a,0x1b,0xb3
+,0xab,0x5e,0x69,0xf2,0x4c,0x7f,0x60,0x70
+,0xc8,0xf8,0x40,0xc9,0xab,0xb4,0xf6,0x9f
+,0xbf,0xc8,0xa7,0xff,0x51,0x26,0xfa,0xee
+,0xbb,0xb5,0x58,0x05,0xee,0x9c,0x1c,0xf2
+,0xce,0x5a,0x57,0x26,0x32,0x87,0xae,0xc5
+,0x78,0x0f,0x04,0xec,0x32,0x4c,0x35,0x14
+,0x12,0x2c,0xfc,0x32,0x31,0xfc,0x1a,0x8b
+,0x71,0x8a,0x62,0x86,0x37,0x30,0xa2,0x70
+,0x2b,0xb7,0x63,0x66,0x11,0x6b,0xed,0x09
+,0xe0,0xfd,0xd4,0xc8,0x60,0xb7,0x07,0x4b
+,0xe8,0x94,0xfa,0xc9,0x69,0x73,0x99,0xbe
+,0x5c,0xc1
+,0x45,0x3c,0x06,0x93,0xa7,0x40,0x7f,0x04
+,0xff,0x4c,0x56,0xae,0xdb,0x17,0xa3,0xc0
+,0xa1,0xaf,0xff,0x01,0x17,0x49,0x30,0xfc
+,0x22,0x28,0x7c,0x33,0xdb,0xcf,0x0a,0xc8
+,0xb8,0x9a,0xd9,0x29,0x53,0x0a,0x1b,0xb3
+,0xab,0x5e,0x69,0xf2,0x4c,0x7f,0x60,0x70
+,0xc8,0xf8,0x40,0xc9,0xab,0xb4,0xf6,0x9f
+,0xbf,0xc8,0xa7,0xff,0x51,0x26,0xfa,0xee
+,0xbb,0xb5,0x58,0x05,0xee,0x9c,0x1c,0xf2
+,0xce,0x5a,0x57,0x26,0x32,0x87,0xae,0xc5
+,0x78,0x0f,0x04,0xec,0x32,0x4c,0x35,0x14
+,0x12,0x2c,0xfc,0x32,0x31,0xfc,0x1a,0x8b
+,0x71,0x8a,0x62,0x86,0x37,0x30,0xa2,0x70
+,0x2b,0xb7,0x63,0x66,0x11,0x6b,0xed,0x09
+,0xe0,0xfd,0xd4,0xc8,0x60,0xb7,0x07,0x4b
+,0xe8,0x94,0xfa,0xc9,0x69,0x73,0x99,0xbe
+,0x5c,0xc1

data/vendor/libsodium/test/default/auth.c

@@ -4,24 +4,28 @@
 
 /* "Test Case 2" from RFC 4231 */
 static unsigned char key[32] = "Jefe";
-static unsigned char c[] = "what do ya want for nothing?";
+static unsigned char c[]     = "what do ya want for nothing?";
 
 /* Hacker manifesto */
-static unsigned char key2[] = "Another one got caught today, it's all over the papers. \"Teenager Arrested in Computer Crime Scandal\", \"Hacker Arrested after Bank Tampering\"... Damn kids. They're all alike.";
+static unsigned char key2[] =
+    "Another one got caught today, it's all over the papers. \"Teenager "
+    "Arrested in Computer Crime Scandal\", \"Hacker Arrested after Bank "
+    "Tampering\"... Damn kids. They're all alike.";
 
 static unsigned char a[crypto_auth_BYTES];
 static unsigned char a2[crypto_auth_hmacsha512_BYTES];
 
-int main(void)
+int
+main(void)
 {
     crypto_auth_hmacsha512_state st;
-    size_t i;
+    size_t                       i;
 
     assert(crypto_auth_hmacsha512_statebytes() ==
            sizeof(crypto_auth_hmacsha512_state));
     crypto_auth(a, c, sizeof c - 1U, key);
     for (i = 0; i < sizeof a; ++i) {
-        printf(",0x%02x", (unsigned int)a[i]);
+        printf(",0x%02x", (unsigned int) a[i]);
         if (i % 8 == 7)
             printf("\n");
     }
@@ -32,7 +36,7 @@ int main(void)
     crypto_auth_hmacsha512_update(&st, c, sizeof c - 2U);
     crypto_auth_hmacsha512_final(&st, a2);
     for (i = 0; i < sizeof a2; ++i) {
-        printf(",0x%02x", (unsigned int)a2[i]);
+        printf(",0x%02x", (unsigned int) a2[i]);
         if (i % 8 == 7)
             printf("\n");
     }
@@ -43,7 +47,7 @@ int main(void)
     crypto_auth_hmacsha512_update(&st, c, sizeof c - 2U);
     crypto_auth_hmacsha512_final(&st, a2);
     for (i = 0; i < sizeof a2; ++i) {
-        printf(",0x%02x", (unsigned int)a2[i]);
+        printf(",0x%02x", (unsigned int) a2[i]);
         if (i % 8 == 7)
             printf("\n");
     }

data/vendor/libsodium/test/default/auth2.c

@@ -3,27 +3,30 @@
 #define TEST_NAME "auth2"
 #include "cmptest.h"
 
-static unsigned char key[32]
-    = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,
-        0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,
-        0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20 };
+static unsigned char key[32] = {
+    0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,
+    0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,
+    0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20
+};
 
-static unsigned char c[50]
-    = { 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
-        0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
-        0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
-        0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
-        0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd };
+static unsigned char c[50] = { 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+                               0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+                               0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+                               0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+                               0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+                               0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+                               0xcd, 0xcd };
 
 static unsigned char a[32];
 
-int main(void)
+int
+main(void)
 {
     int i;
 
     crypto_auth_hmacsha256(a, c, sizeof c, key);
     for (i = 0; i < 32; ++i) {
-        printf(",0x%02x", (unsigned int)a[i]);
+        printf(",0x%02x", (unsigned int) a[i]);
         if (i % 8 == 7)
             printf("\n");
     }

data/vendor/libsodium/test/default/auth3.c

@@ -3,24 +3,27 @@
 #define TEST_NAME "auth3"
 #include "cmptest.h"
 
-static unsigned char key[32]
-    = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,
-        0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,
-        0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20 };
+static unsigned char key[32] = {
+    0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,
+    0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,
+    0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20
+};
 
-static unsigned char c[50]
-    = { 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
-        0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
-        0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
-        0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
-        0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd };
+static unsigned char c[50] = { 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+                               0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+                               0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+                               0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+                               0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+                               0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+                               0xcd, 0xcd };
 
-static unsigned char a[32]
-    = { 0x37, 0x2e, 0xfc, 0xf9, 0xb4, 0x0b, 0x35, 0xc2, 0x11, 0x5b, 0x13,
-        0x46, 0x90, 0x3d, 0x2e, 0xf4, 0x2f, 0xce, 0xd4, 0x6f, 0x08, 0x46,
-        0xe7, 0x25, 0x7b, 0xb1, 0x56, 0xd3, 0xd7, 0xb3, 0x0d, 0x3f };
+static unsigned char a[32] = { 0x37, 0x2e, 0xfc, 0xf9, 0xb4, 0x0b, 0x35, 0xc2,
+                               0x11, 0x5b, 0x13, 0x46, 0x90, 0x3d, 0x2e, 0xf4,
+                               0x2f, 0xce, 0xd4, 0x6f, 0x08, 0x46, 0xe7, 0x25,
+                               0x7b, 0xb1, 0x56, 0xd3, 0xd7, 0xb3, 0x0d, 0x3f };
 
-int main(void)
+int
+main(void)
 {
     printf("%d\n", crypto_auth_hmacsha256_verify(a, c, sizeof c, key));
 

data/vendor/libsodium/test/default/auth5.c

@@ -6,12 +6,13 @@ static unsigned char key[32];
 static unsigned char c[1000];
 static unsigned char a[32];
 
-int main(void)
+int
+main(void)
 {
     size_t clen;
 
     for (clen = 0; clen < 1000; ++clen) {
-        randombytes_buf(key, sizeof key);
+        crypto_auth_keygen(key);
         randombytes_buf(c, clen);
         crypto_auth(a, c, clen, key);
         if (crypto_auth_verify(a, c, clen, key) != 0) {

data/vendor/libsodium/test/default/auth6.c

@@ -4,17 +4,18 @@
 
 /* "Test Case 2" from RFC 4231 */
 static unsigned char key[32] = "Jefe";
-static unsigned char c[] = "what do ya want for nothing?";
+static unsigned char c[]     = "what do ya want for nothing?";
 
 static unsigned char a[64];
 
-int main(void)
+int
+main(void)
 {
     int i;
 
     crypto_auth_hmacsha512(a, c, sizeof c - 1U, key);
     for (i = 0; i < 64; ++i) {
-        printf(",0x%02x", (unsigned int)a[i]);
+        printf(",0x%02x", (unsigned int) a[i]);
         if (i % 8 == 7)
             printf("\n");
     }

data/vendor/libsodium/test/default/auth7.c

@@ -6,12 +6,13 @@ static unsigned char key[32];
 static unsigned char c[600];
 static unsigned char a[64];
 
-int main(void)
+int
+main(void)
 {
     size_t clen;
 
     for (clen = 0; clen < sizeof c; ++clen) {
-        randombytes_buf(key, sizeof key);
+        crypto_auth_keygen(key);
         randombytes_buf(c, clen);
         crypto_auth_hmacsha512(a, c, clen, key);
         if (crypto_auth_hmacsha512_verify(a, c, clen, key) != 0) {

data/vendor/libsodium/test/default/box.c

@@ -2,55 +2,60 @@
 #define TEST_NAME "box"
 #include "cmptest.h"
 
-static const unsigned char alicesk[32]
-    = { 0x77, 0x07, 0x6d, 0x0a, 0x73, 0x18, 0xa5, 0x7d, 0x3c, 0x16, 0xc1,
-        0x72, 0x51, 0xb2, 0x66, 0x45, 0xdf, 0x4c, 0x2f, 0x87, 0xeb, 0xc0,
-        0x99, 0x2a, 0xb1, 0x77, 0xfb, 0xa5, 0x1d, 0xb9, 0x2c, 0x2a };
+static const unsigned char alicesk[32] = {
+    0x77, 0x07, 0x6d, 0x0a, 0x73, 0x18, 0xa5, 0x7d, 0x3c, 0x16, 0xc1,
+    0x72, 0x51, 0xb2, 0x66, 0x45, 0xdf, 0x4c, 0x2f, 0x87, 0xeb, 0xc0,
+    0x99, 0x2a, 0xb1, 0x77, 0xfb, 0xa5, 0x1d, 0xb9, 0x2c, 0x2a
+};
 
-static const unsigned char bobpk[32]
-    = { 0xde, 0x9e, 0xdb, 0x7d, 0x7b, 0x7d, 0xc1, 0xb4, 0xd3, 0x5b, 0x61,
-        0xc2, 0xec, 0xe4, 0x35, 0x37, 0x3f, 0x83, 0x43, 0xc8, 0x5b, 0x78,
-        0x67, 0x4d, 0xad, 0xfc, 0x7e, 0x14, 0x6f, 0x88, 0x2b, 0x4f };
+static const unsigned char bobpk[32] = {
+    0xde, 0x9e, 0xdb, 0x7d, 0x7b, 0x7d, 0xc1, 0xb4, 0xd3, 0x5b, 0x61,
+    0xc2, 0xec, 0xe4, 0x35, 0x37, 0x3f, 0x83, 0x43, 0xc8, 0x5b, 0x78,
+    0x67, 0x4d, 0xad, 0xfc, 0x7e, 0x14, 0x6f, 0x88, 0x2b, 0x4f
+};
 
-static const unsigned char small_order_p[crypto_box_PUBLICKEYBYTES]
-    = { 0xe0, 0xeb, 0x7a, 0x7c, 0x3b, 0x41, 0xb8, 0xae, 0x16, 0x56, 0xe3,
-        0xfa, 0xf1, 0x9f, 0xc4, 0x6a, 0xda, 0x09, 0x8d, 0xeb, 0x9c, 0x32,
-        0xb1, 0xfd, 0x86, 0x62, 0x05, 0x16, 0x5f, 0x49, 0xb8, 0x00 };
+static const unsigned char small_order_p[crypto_box_PUBLICKEYBYTES] = {
+    0xe0, 0xeb, 0x7a, 0x7c, 0x3b, 0x41, 0xb8, 0xae, 0x16, 0x56, 0xe3,
+    0xfa, 0xf1, 0x9f, 0xc4, 0x6a, 0xda, 0x09, 0x8d, 0xeb, 0x9c, 0x32,
+    0xb1, 0xfd, 0x86, 0x62, 0x05, 0x16, 0x5f, 0x49, 0xb8, 0x00
+};
 
-static const unsigned char nonce[24]
-    = { 0x69, 0x69, 0x6e, 0xe9, 0x55, 0xb6, 0x2b, 0x73,
-        0xcd, 0x62, 0xbd, 0xa8, 0x75, 0xfc, 0x73, 0xd6,
-        0x82, 0x19, 0xe0, 0x03, 0x6b, 0x7a, 0x0b, 0x37 };
+static const unsigned char nonce[24] = { 0x69, 0x69, 0x6e, 0xe9, 0x55, 0xb6,
+                                         0x2b, 0x73, 0xcd, 0x62, 0xbd, 0xa8,
+                                         0x75, 0xfc, 0x73, 0xd6, 0x82, 0x19,
+                                         0xe0, 0x03, 0x6b, 0x7a, 0x0b, 0x37 };
 
 /* API requires first 32 bytes to be 0 */
-static const unsigned char m[163]
-    = { 0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0xbe, 0x07, 0x5f, 0xc5,
-        0x3c, 0x81, 0xf2, 0xd5, 0xcf, 0x14, 0x13, 0x16, 0xeb, 0xeb, 0x0c, 0x7b,
-        0x52, 0x28, 0xc5, 0x2a, 0x4c, 0x62, 0xcb, 0xd4, 0x4b, 0x66, 0x84, 0x9b,
-        0x64, 0x24, 0x4f, 0xfc, 0xe5, 0xec, 0xba, 0xaf, 0x33, 0xbd, 0x75, 0x1a,
-        0x1a, 0xc7, 0x28, 0xd4, 0x5e, 0x6c, 0x61, 0x29, 0x6c, 0xdc, 0x3c, 0x01,
-        0x23, 0x35, 0x61, 0xf4, 0x1d, 0xb6, 0x6c, 0xce, 0x31, 0x4a, 0xdb, 0x31,
-        0x0e, 0x3b, 0xe8, 0x25, 0x0c, 0x46, 0xf0, 0x6d, 0xce, 0xea, 0x3a, 0x7f,
-        0xa1, 0x34, 0x80, 0x57, 0xe2, 0xf6, 0x55, 0x6a, 0xd6, 0xb1, 0x31, 0x8a,
-        0x02, 0x4a, 0x83, 0x8f, 0x21, 0xaf, 0x1f, 0xde, 0x04, 0x89, 0x77, 0xeb,
-        0x48, 0xf5, 0x9f, 0xfd, 0x49, 0x24, 0xca, 0x1c, 0x60, 0x90, 0x2e, 0x52,
-        0xf0, 0xa0, 0x89, 0xbc, 0x76, 0x89, 0x70, 0x40, 0xe0, 0x82, 0xf9, 0x37,
-        0x76, 0x38, 0x48, 0x64, 0x5e, 0x07, 0x05 };
+static const unsigned char m[163] = {
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0xbe, 0x07, 0x5f, 0xc5,
+    0x3c, 0x81, 0xf2, 0xd5, 0xcf, 0x14, 0x13, 0x16, 0xeb, 0xeb, 0x0c, 0x7b,
+    0x52, 0x28, 0xc5, 0x2a, 0x4c, 0x62, 0xcb, 0xd4, 0x4b, 0x66, 0x84, 0x9b,
+    0x64, 0x24, 0x4f, 0xfc, 0xe5, 0xec, 0xba, 0xaf, 0x33, 0xbd, 0x75, 0x1a,
+    0x1a, 0xc7, 0x28, 0xd4, 0x5e, 0x6c, 0x61, 0x29, 0x6c, 0xdc, 0x3c, 0x01,
+    0x23, 0x35, 0x61, 0xf4, 0x1d, 0xb6, 0x6c, 0xce, 0x31, 0x4a, 0xdb, 0x31,
+    0x0e, 0x3b, 0xe8, 0x25, 0x0c, 0x46, 0xf0, 0x6d, 0xce, 0xea, 0x3a, 0x7f,
+    0xa1, 0x34, 0x80, 0x57, 0xe2, 0xf6, 0x55, 0x6a, 0xd6, 0xb1, 0x31, 0x8a,
+    0x02, 0x4a, 0x83, 0x8f, 0x21, 0xaf, 0x1f, 0xde, 0x04, 0x89, 0x77, 0xeb,
+    0x48, 0xf5, 0x9f, 0xfd, 0x49, 0x24, 0xca, 0x1c, 0x60, 0x90, 0x2e, 0x52,
+    0xf0, 0xa0, 0x89, 0xbc, 0x76, 0x89, 0x70, 0x40, 0xe0, 0x82, 0xf9, 0x37,
+    0x76, 0x38, 0x48, 0x64, 0x5e, 0x07, 0x05
+};
 
 static unsigned char c[163];
 
-int main(void)
+int
+main(void)
 {
     unsigned char k[crypto_box_BEFORENMBYTES];
-    int i;
-    int ret;
+    int           i;
+    int           ret;
 
     ret = crypto_box(c, m, 163, nonce, bobpk, alicesk);
     assert(ret == 0);
     for (i = 16; i < 163; ++i) {
-        printf(",0x%02x", (unsigned int)c[i]);
+        printf(",0x%02x", (unsigned int) c[i]);
         if (i % 8 == 7)
             printf("\n");
     }
@@ -65,7 +70,7 @@ int main(void)
     assert(ret == 0);
     crypto_box_afternm(c, m, 163, nonce, k);
     for (i = 16; i < 163; ++i) {
-        printf(",0x%02x", (unsigned int)c[i]);
+        printf(",0x%02x", (unsigned int) c[i]);
         if (i % 8 == 7)
             printf("\n");
     }
@@ -83,22 +88,22 @@ int main(void)
     assert(crypto_box_boxzerobytes() > 0U);
     assert(crypto_box_macbytes() > 0U);
     assert(strcmp(crypto_box_primitive(), "curve25519xsalsa20poly1305") == 0);
-    assert(crypto_box_curve25519xsalsa20poly1305_seedbytes()
-           == crypto_box_seedbytes());
-    assert(crypto_box_curve25519xsalsa20poly1305_publickeybytes()
-           == crypto_box_publickeybytes());
-    assert(crypto_box_curve25519xsalsa20poly1305_secretkeybytes()
-           == crypto_box_secretkeybytes());
-    assert(crypto_box_curve25519xsalsa20poly1305_beforenmbytes()
-           == crypto_box_beforenmbytes());
-    assert(crypto_box_curve25519xsalsa20poly1305_noncebytes()
-           == crypto_box_noncebytes());
-    assert(crypto_box_curve25519xsalsa20poly1305_zerobytes()
-           == crypto_box_zerobytes());
-    assert(crypto_box_curve25519xsalsa20poly1305_boxzerobytes()
-           == crypto_box_boxzerobytes());
-    assert(crypto_box_curve25519xsalsa20poly1305_macbytes()
-           == crypto_box_macbytes());
+    assert(crypto_box_curve25519xsalsa20poly1305_seedbytes() ==
+           crypto_box_seedbytes());
+    assert(crypto_box_curve25519xsalsa20poly1305_publickeybytes() ==
+           crypto_box_publickeybytes());
+    assert(crypto_box_curve25519xsalsa20poly1305_secretkeybytes() ==
+           crypto_box_secretkeybytes());
+    assert(crypto_box_curve25519xsalsa20poly1305_beforenmbytes() ==
+           crypto_box_beforenmbytes());
+    assert(crypto_box_curve25519xsalsa20poly1305_noncebytes() ==
+           crypto_box_noncebytes());
+    assert(crypto_box_curve25519xsalsa20poly1305_zerobytes() ==
+           crypto_box_zerobytes());
+    assert(crypto_box_curve25519xsalsa20poly1305_boxzerobytes() ==
+           crypto_box_boxzerobytes());
+    assert(crypto_box_curve25519xsalsa20poly1305_macbytes() ==
+           crypto_box_macbytes());
 
     return 0;
 }