]> git.ipfire.org Git - thirdparty/gnutls.git/commitdiff
indented code
authorNikos Mavrogiannopoulos <nmav@redhat.com>
Mon, 11 Nov 2013 13:51:35 +0000 (14:51 +0100)
committerNikos Mavrogiannopoulos <nmav@redhat.com>
Wed, 27 Nov 2013 10:41:05 +0000 (11:41 +0100)
lib/crypto-selftests-pk.c
lib/crypto-selftests.c
tests/slow/cipher-test.c

index b89576096f63ab1b76a6eb4c272e34419835bf22..46a060a4901f0440970a17b760ce7e67b91f521c 100644 (file)
 
 #define DATASTR "Hello there!"
 static const gnutls_datum_t signed_data = {
-               .data = (void*)DATASTR,
-               .size = sizeof(DATASTR)-1
+       .data = (void *) DATASTR,
+       .size = sizeof(DATASTR) - 1
 };
 
 static const gnutls_datum_t bad_data = {
-               .data = (void*)DATASTR,
-               .size = sizeof(DATASTR)-2
+       .data = (void *) DATASTR,
+       .size = sizeof(DATASTR) - 2
 };
 
-static int test_rsa_enc(gnutls_pk_algorithm_t pk, 
-               unsigned bits,
-               gnutls_digest_algorithm_t ign)
+static int test_rsa_enc(gnutls_pk_algorithm_t pk,
+                       unsigned bits, gnutls_digest_algorithm_t ign)
 {
        int ret;
-       gnutls_datum_t enc = {NULL, 0};
-       gnutls_datum_t dec = {NULL, 0};
+       gnutls_datum_t enc = { NULL, 0 };
+       gnutls_datum_t dec = { NULL, 0 };
        gnutls_privkey_t key;
        gnutls_pubkey_t pub = NULL;
 
@@ -58,7 +57,7 @@ static int test_rsa_enc(gnutls_pk_algorithm_t pk,
                gnutls_assert();
                goto cleanup;
        }
-       
+
        ret = gnutls_privkey_generate(key, pk, bits, 0);
        if (ret < 0) {
                gnutls_assert();
@@ -76,46 +75,51 @@ static int test_rsa_enc(gnutls_pk_algorithm_t pk,
                gnutls_assert();
                goto cleanup;
        }
-               
+
        ret = gnutls_privkey_decrypt_data(key, 0, &enc, &dec);
        if (ret < 0) {
                gnutls_assert();
                goto cleanup;
        }
-       
-       if (dec.size != signed_data.size || memcmp(dec.data, signed_data.data, dec.size) != 0) {
+
+       if (dec.size != signed_data.size
+           || memcmp(dec.data, signed_data.data, dec.size) != 0) {
                ret = GNUTLS_E_SELF_TEST_ERROR;
                gnutls_assert();
                goto cleanup;
        }
 
        ret = 0;
-cleanup:
-       if (pub != NULL) gnutls_pubkey_deinit(pub);
+      cleanup:
+       if (pub != NULL)
+               gnutls_pubkey_deinit(pub);
        gnutls_privkey_deinit(key);
        gnutls_free(enc.data);
        gnutls_free(dec.data);
 
        if (ret == 0)
-               _gnutls_debug_log("%s-%u-enc self test succeeded\n", gnutls_pk_get_name(pk), bits);
+               _gnutls_debug_log("%s-%u-enc self test succeeded\n",
+                                 gnutls_pk_get_name(pk), bits);
        else
-               _gnutls_debug_log("%s-%u-enc self test failed\n", gnutls_pk_get_name(pk), bits);
+               _gnutls_debug_log("%s-%u-enc self test failed\n",
+                                 gnutls_pk_get_name(pk), bits);
 
        return ret;
 }
 
-static int test_sig(gnutls_pk_algorithm_t pk, 
-                                       unsigned bits,
-                                       gnutls_digest_algorithm_t dig)
+static int test_sig(gnutls_pk_algorithm_t pk,
+                   unsigned bits, gnutls_digest_algorithm_t dig)
 {
        int ret;
-       gnutls_datum_t sig = {NULL, 0};
+       gnutls_datum_t sig = { NULL, 0 };
        gnutls_privkey_t key;
        gnutls_pubkey_t pub = NULL;
        char param_name[32];
-       
+
        if (pk == GNUTLS_PK_EC) {
-               snprintf(param_name, sizeof(param_name), "%s", gnutls_ecc_curve_get_name(GNUTLS_BITS_TO_CURVE(bits)));
+               snprintf(param_name, sizeof(param_name), "%s",
+                        gnutls_ecc_curve_get_name(GNUTLS_BITS_TO_CURVE
+                                                  (bits)));
        } else {
                snprintf(param_name, sizeof(param_name), "%u", bits);
        }
@@ -129,7 +133,7 @@ static int test_sig(gnutls_pk_algorithm_t pk,
                gnutls_assert();
                goto cleanup;
        }
-       
+
        ret = gnutls_privkey_generate(key, pk, bits, 0);
        if (ret < 0) {
                gnutls_assert();
@@ -147,127 +151,142 @@ static int test_sig(gnutls_pk_algorithm_t pk,
                gnutls_assert();
                goto cleanup;
        }
-               
-       ret = gnutls_pubkey_verify_data2(pub, gnutls_pk_to_sign(pk, dig), 0,
-                       &signed_data, &sig);
+
+       ret =
+           gnutls_pubkey_verify_data2(pub, gnutls_pk_to_sign(pk, dig), 0,
+                                      &signed_data, &sig);
        if (ret < 0) {
                ret = GNUTLS_E_SELF_TEST_ERROR;
                gnutls_assert();
                goto cleanup;
        }
-       
-       ret = gnutls_pubkey_verify_data2(pub, gnutls_pk_to_sign(pk, dig), 0,
-                       &bad_data, &sig);
-       
+
+       ret =
+           gnutls_pubkey_verify_data2(pub, gnutls_pk_to_sign(pk, dig), 0,
+                                      &bad_data, &sig);
+
        if (ret != GNUTLS_E_PK_SIG_VERIFY_FAILED) {
                ret = GNUTLS_E_SELF_TEST_ERROR;
                gnutls_assert();
                goto cleanup;
        }
-       
+
        ret = 0;
-cleanup:
-       if (pub != NULL) gnutls_pubkey_deinit(pub);
+      cleanup:
+       if (pub != NULL)
+               gnutls_pubkey_deinit(pub);
        gnutls_privkey_deinit(key);
        gnutls_free(sig.data);
 
        if (ret == 0)
-               _gnutls_debug_log("%s-%s-sig self test succeeded\n", gnutls_pk_get_name(pk), param_name);
+               _gnutls_debug_log("%s-%s-sig self test succeeded\n",
+                                 gnutls_pk_get_name(pk), param_name);
        else
-               _gnutls_debug_log("%s-%s-sig self test failed\n", gnutls_pk_get_name(pk), param_name);
+               _gnutls_debug_log("%s-%s-sig self test failed\n",
+                                 gnutls_pk_get_name(pk), param_name);
 
        return ret;
 }
 
 static const char rsa_privkey[] = "-----BEGIN RSA PRIVATE KEY-----\n"
-"MIIBOwIBAAJBAOY5i7i6V/xreyZAXihowgsU7iZ1xXdJFLvMMCOTmXDCfgcLOuRn\n"
-"jSokU7Lpaef7VGuE3mOqVeTdUGe15JSTcdsCAwEAAQJBAKvYDFjIjuBVAckdhqq2\n"
-"9w/6gYCnq8tL+3PqB4ymoYOt3nG7wyj3/dS5wBqoVXDOTrxvqRuyPICzqFFInnxH\n"
-"6zECIQD6598eMoBdHNKwxNfvISVZwmIp2a7/O7OhZPlf7JYgzQIhAOrmLmDuwnzs\n"
-"t8up1byAFWtBXmCJy/yvlqJvfSUPnb1HAiBsAyfdAxaZfxAAgy0GR7mhk3nY1Fpu\n"
-"jA//ec2VCu9yPQIgY4FSkDlUJftY+GtfYVSYvjCYvChjQw1WsESuLK7q0S0CIQD6\n"
-"ReydpDFBsMxPewC/5By9yMNDbif/1j6j/8I+eqmzMA==\n"
-"-----END RSA PRIVATE KEY-----\n";
+    "MIIBOwIBAAJBAOY5i7i6V/xreyZAXihowgsU7iZ1xXdJFLvMMCOTmXDCfgcLOuRn\n"
+    "jSokU7Lpaef7VGuE3mOqVeTdUGe15JSTcdsCAwEAAQJBAKvYDFjIjuBVAckdhqq2\n"
+    "9w/6gYCnq8tL+3PqB4ymoYOt3nG7wyj3/dS5wBqoVXDOTrxvqRuyPICzqFFInnxH\n"
+    "6zECIQD6598eMoBdHNKwxNfvISVZwmIp2a7/O7OhZPlf7JYgzQIhAOrmLmDuwnzs\n"
+    "t8up1byAFWtBXmCJy/yvlqJvfSUPnb1HAiBsAyfdAxaZfxAAgy0GR7mhk3nY1Fpu\n"
+    "jA//ec2VCu9yPQIgY4FSkDlUJftY+GtfYVSYvjCYvChjQw1WsESuLK7q0S0CIQD6\n"
+    "ReydpDFBsMxPewC/5By9yMNDbif/1j6j/8I+eqmzMA==\n"
+    "-----END RSA PRIVATE KEY-----\n";
 
 /* A precomputed RSA-SHA1 signature using the key above */
-static const char rsa_sig[] = "\xc8\x3a\x61\xfe\x27\x67\x23\x84\xfc\x8f\x2a\xd8\x05\x00\x83\xcd\xfd\x89\xe8\xa6\x5a\x01\x41\x4b\xaf\x5b\x37\x8e\x2e\xa9\xf0\xf3\x3e\xd2\xa9\x2f\xf1\x48\xa2\xdd\x3e\xe9\x7f\x7c\x02\xe8\x05\x4d\x2a\x3b\xeb\x74\x19\x01\x1d\x1b\x83\xc9\x45\x1b\x4b\x3c\x43\x3e";
+static const char rsa_sig[] =
+    "\xc8\x3a\x61\xfe\x27\x67\x23\x84\xfc\x8f\x2a\xd8\x05\x00\x83\xcd\xfd\x89\xe8\xa6\x5a\x01\x41\x4b\xaf\x5b\x37\x8e\x2e\xa9\xf0\xf3\x3e\xd2\xa9\x2f\xf1\x48\xa2\xdd\x3e\xe9\x7f\x7c\x02\xe8\x05\x4d\x2a\x3b\xeb\x74\x19\x01\x1d\x1b\x83\xc9\x45\x1b\x4b\x3c\x43\x3e";
 
 /* ECDSA key and signature */
-static const char ecdsa_secp256r1_privkey[] = "-----BEGIN EC PRIVATE KEY-----\n"
-"MHcCAQEEIPAKWV7+pZe9c5EubMNfAEKWRQtP/MvlO9HehwHmJssNoAoGCCqGSM49\n"
-"AwEHoUQDQgAE2CNONRio3ciuXtoomJKs3MdbzLbd44VPhtzJN30VLFm5gvnfiCj2\n"
-"zzz7pl9Cv0ECHl6yedNI8QEKdcwCDgEmkQ==\n"
-"-----END EC PRIVATE KEY-----\n";
+static const char ecdsa_secp256r1_privkey[] =
+    "-----BEGIN EC PRIVATE KEY-----\n"
+    "MHcCAQEEIPAKWV7+pZe9c5EubMNfAEKWRQtP/MvlO9HehwHmJssNoAoGCCqGSM49\n"
+    "AwEHoUQDQgAE2CNONRio3ciuXtoomJKs3MdbzLbd44VPhtzJN30VLFm5gvnfiCj2\n"
+    "zzz7pl9Cv0ECHl6yedNI8QEKdcwCDgEmkQ==\n"
+    "-----END EC PRIVATE KEY-----\n";
 
-static const char ecdsa_secp256r1_sig[] = "\x30\x45\x02\x21\x00\x9b\x8f\x60\xed\x9e\x40\x8d\x74\x82\x73\xab\x20\x1a\x69\xfc\xf9\xee\x3c\x41\x80\xc0\x39\xdd\x21\x1a\x64\xfd\xbf\x7e\xaa\x43\x70\x02\x20\x44\x28\x05\xdd\x30\x47\x58\x96\x18\x39\x94\x18\xba\xe7\x7a\xf6\x1e\x2d\xba\xb1\xe0\x7d\x73\x9e\x2f\x58\xee\x0c\x2a\x89\xe8\x35";
+static const char ecdsa_secp256r1_sig[] =
+    "\x30\x45\x02\x21\x00\x9b\x8f\x60\xed\x9e\x40\x8d\x74\x82\x73\xab\x20\x1a\x69\xfc\xf9\xee\x3c\x41\x80\xc0\x39\xdd\x21\x1a\x64\xfd\xbf\x7e\xaa\x43\x70\x02\x20\x44\x28\x05\xdd\x30\x47\x58\x96\x18\x39\x94\x18\xba\xe7\x7a\xf6\x1e\x2d\xba\xb1\xe0\x7d\x73\x9e\x2f\x58\xee\x0c\x2a\x89\xe8\x35";
 
 /* sha256 */
-static const char ecdsa_secp192r1_privkey[] = "-----BEGIN EC PRIVATE KEY-----"
-"MF8CAQEEGLjezFcbgDMeApVrdtZHvu/k1a8/tVZ41KAKBggqhkjOPQMBAaE0AzIA"
-"BO1lciKdgxeRH8k64vxcaV1OYIK9akVrW02Dw21MXhRLP0l0wzCw6LGSr5rS6AaL"
-"Fg=="
-"-----END EC PRIVATE KEY-----";
-
-static const char ecdsa_secp192r1_sig[] = "\x30\x34\x02\x18\x5f\xb3\x10\x4b\x4d\x44\x48\x29\x4b\xfd\xa7\x8e\xce\x57\xac\x36\x38\x54\xab\x73\xdb\xed\xb8\x5f\x02\x18\x0b\x8b\xf3\xae\x49\x50\x0e\x47\xca\x89\x1a\x00\xca\x23\xf5\x8d\xd6\xe3\xce\x9a\xff\x2e\x4f\x5c";
-
-static const char ecdsa_secp224r1_privkey[] = "-----BEGIN EC PRIVATE KEY-----"
-"MGgCAQEEHOKWJFdWdrR/CgVrUeTeawOrJ9GozE9KKx2a8PmgBwYFK4EEACGhPAM6"
-"AAQKQj3YpenWT7lFR41SnBvmj/+Bj+kgzQnaF65qWAtPRJsZXFlLTu3/IUNqSRu9"
-"DqPsk8xBHAB7pA=="
-"-----END EC PRIVATE KEY-----";
-
-static const char ecdsa_secp224r1_sig[] = "\x30\x3d\x02\x1c\x76\x03\x8d\x74\xf4\xd3\x09\x2a\xb5\xdf\x6b\x5b\xf4\x4b\x86\xb8\x62\x81\x5d\x7b\x7a\xbb\x37\xfc\xf1\x46\x1c\x2b\x02\x1d\x00\xa0\x98\x5d\x80\x43\x89\xe5\xee\x1a\xec\x46\x08\x04\x55\xbc\x50\xfa\x2a\xd5\xa6\x18\x92\x19\xdb\x68\xa0\x2a\xda";
-
-static const char ecdsa_secp384r1_privkey[] = "-----BEGIN EC PRIVATE KEY-----"
-"MIGkAgEBBDDevshD6gb+4rZpC9vwFcIwNs4KmGzdqCxyyN40a8uOWRbyf7aHdiSS"
-"03oAyKtc4JCgBwYFK4EEACKhZANiAARO1KkPMno2tnNXx1S9EZkp8SOpDCZ4aobH"
-"IYv8RHnSmKf8I3OKD6TaoeR+1MwJmNJUH90Bj45WXla68/vsPiFcfVKboxsZYe/n"
-"pv8e4ugXagVQVBXNZJ859iYPdJR24vo="
-"-----END EC PRIVATE KEY-----";
-
-static const char ecdsa_secp384r1_sig[] = "\x30\x66\x02\x31\x00\xbb\x4d\x25\x30\x13\x1b\x3b\x75\x60\x07\xed\x53\x8b\x52\xee\xd8\x6e\xf1\x9d\xa8\x36\x0e\x2e\x20\x31\x51\x11\x48\x78\xdd\xaf\x24\x38\x64\x81\x71\x6b\xa6\xb7\x29\x58\x28\x82\x32\xba\x29\x29\xd9\x02\x31\x00\xeb\x70\x09\x87\xac\x7b\x78\x0d\x4c\x4f\x08\x2b\x86\x27\xe2\x60\x1f\xc9\x11\x9f\x1d\xf5\x82\x4c\xc7\x3d\xb0\x27\xc8\x93\x29\xc7\xd0\x0e\x88\x02\x09\x93\xc2\x72\xce\xa5\x74\x8c\x3d\xe0\x8c\xad";
-
-static const char ecdsa_secp521r1_privkey[] = "-----BEGIN EC PRIVATE KEY-----"
-"MIHbAgEBBEGO2n7NN363qSCvJVdlQtCvudtaW4o0fEufXRjE1AsCrle+VXX0Zh0w"
-"Y1slSeDHMndpakoiF+XkQ+bhcB867UV6aKAHBgUrgQQAI6GBiQOBhgAEAQb6jDpo"
-"byy1tF8Zucg0TMGUzIN2DK+RZJ3QQRdWdirO25OIC3FoFi1Yird6rpoB6HlNyJ7R"
-"0bNG9Uv34bSHMn8yAFoiqxUCdJZQbEenMoZsi6COaePe3e0QqvDMr0hEWT23Sr3t"
-"LpEV7eZGFfFIJw5wSUp2KOcs+O9WjmoukTWtDKNV"
-"-----END EC PRIVATE KEY-----";
-
-static const char ecdsa_secp521r1_sig[] = "\x30\x81\x87\x02\x42\x01\xb8\xcb\x52\x9e\x10\xa8\x49\x3f\xe1\x9e\x14\x0a\xcf\x96\xed\x7e\xab\x7d\x0c\xe1\x9b\xa4\x97\xdf\x01\xf5\x35\x42\x5f\x5b\x28\x15\x24\x33\x6e\x59\x6c\xaf\x10\x8b\x98\x8e\xe9\x4c\x23\x0d\x76\x92\x03\xdd\x6d\x8d\x08\x47\x15\x5b\xf8\x66\x75\x75\x40\xe8\xf4\xa0\x52\x02\x41\x15\x27\x7c\x5f\xa6\x33\xa6\x29\x68\x3f\x55\x8d\x7f\x1d\x4f\x88\xc6\x61\x6e\xac\x21\xdf\x2b\x7b\xde\x76\x9a\xdc\xe6\x3b\x94\x3f\x03\x9c\xa2\xa6\xa3\x63\x39\x48\xbd\x79\x70\x21\xf2\x6b\xff\x58\x66\xf1\x58\xc2\x58\xad\x4f\x84\x14\x5d\x05\x12\x83\xd0\x87\xbd\xf3";
+static const char ecdsa_secp192r1_privkey[] =
+    "-----BEGIN EC PRIVATE KEY-----"
+    "MF8CAQEEGLjezFcbgDMeApVrdtZHvu/k1a8/tVZ41KAKBggqhkjOPQMBAaE0AzIA"
+    "BO1lciKdgxeRH8k64vxcaV1OYIK9akVrW02Dw21MXhRLP0l0wzCw6LGSr5rS6AaL"
+    "Fg==" "-----END EC PRIVATE KEY-----";
+
+static const char ecdsa_secp192r1_sig[] =
+    "\x30\x34\x02\x18\x5f\xb3\x10\x4b\x4d\x44\x48\x29\x4b\xfd\xa7\x8e\xce\x57\xac\x36\x38\x54\xab\x73\xdb\xed\xb8\x5f\x02\x18\x0b\x8b\xf3\xae\x49\x50\x0e\x47\xca\x89\x1a\x00\xca\x23\xf5\x8d\xd6\xe3\xce\x9a\xff\x2e\x4f\x5c";
+
+static const char ecdsa_secp224r1_privkey[] =
+    "-----BEGIN EC PRIVATE KEY-----"
+    "MGgCAQEEHOKWJFdWdrR/CgVrUeTeawOrJ9GozE9KKx2a8PmgBwYFK4EEACGhPAM6"
+    "AAQKQj3YpenWT7lFR41SnBvmj/+Bj+kgzQnaF65qWAtPRJsZXFlLTu3/IUNqSRu9"
+    "DqPsk8xBHAB7pA==" "-----END EC PRIVATE KEY-----";
+
+static const char ecdsa_secp224r1_sig[] =
+    "\x30\x3d\x02\x1c\x76\x03\x8d\x74\xf4\xd3\x09\x2a\xb5\xdf\x6b\x5b\xf4\x4b\x86\xb8\x62\x81\x5d\x7b\x7a\xbb\x37\xfc\xf1\x46\x1c\x2b\x02\x1d\x00\xa0\x98\x5d\x80\x43\x89\xe5\xee\x1a\xec\x46\x08\x04\x55\xbc\x50\xfa\x2a\xd5\xa6\x18\x92\x19\xdb\x68\xa0\x2a\xda";
+
+static const char ecdsa_secp384r1_privkey[] =
+    "-----BEGIN EC PRIVATE KEY-----"
+    "MIGkAgEBBDDevshD6gb+4rZpC9vwFcIwNs4KmGzdqCxyyN40a8uOWRbyf7aHdiSS"
+    "03oAyKtc4JCgBwYFK4EEACKhZANiAARO1KkPMno2tnNXx1S9EZkp8SOpDCZ4aobH"
+    "IYv8RHnSmKf8I3OKD6TaoeR+1MwJmNJUH90Bj45WXla68/vsPiFcfVKboxsZYe/n"
+    "pv8e4ugXagVQVBXNZJ859iYPdJR24vo=" "-----END EC PRIVATE KEY-----";
+
+static const char ecdsa_secp384r1_sig[] =
+    "\x30\x66\x02\x31\x00\xbb\x4d\x25\x30\x13\x1b\x3b\x75\x60\x07\xed\x53\x8b\x52\xee\xd8\x6e\xf1\x9d\xa8\x36\x0e\x2e\x20\x31\x51\x11\x48\x78\xdd\xaf\x24\x38\x64\x81\x71\x6b\xa6\xb7\x29\x58\x28\x82\x32\xba\x29\x29\xd9\x02\x31\x00\xeb\x70\x09\x87\xac\x7b\x78\x0d\x4c\x4f\x08\x2b\x86\x27\xe2\x60\x1f\xc9\x11\x9f\x1d\xf5\x82\x4c\xc7\x3d\xb0\x27\xc8\x93\x29\xc7\xd0\x0e\x88\x02\x09\x93\xc2\x72\xce\xa5\x74\x8c\x3d\xe0\x8c\xad";
+
+static const char ecdsa_secp521r1_privkey[] =
+    "-----BEGIN EC PRIVATE KEY-----"
+    "MIHbAgEBBEGO2n7NN363qSCvJVdlQtCvudtaW4o0fEufXRjE1AsCrle+VXX0Zh0w"
+    "Y1slSeDHMndpakoiF+XkQ+bhcB867UV6aKAHBgUrgQQAI6GBiQOBhgAEAQb6jDpo"
+    "byy1tF8Zucg0TMGUzIN2DK+RZJ3QQRdWdirO25OIC3FoFi1Yird6rpoB6HlNyJ7R"
+    "0bNG9Uv34bSHMn8yAFoiqxUCdJZQbEenMoZsi6COaePe3e0QqvDMr0hEWT23Sr3t"
+    "LpEV7eZGFfFIJw5wSUp2KOcs+O9WjmoukTWtDKNV"
+    "-----END EC PRIVATE KEY-----";
+
+static const char ecdsa_secp521r1_sig[] =
+    "\x30\x81\x87\x02\x42\x01\xb8\xcb\x52\x9e\x10\xa8\x49\x3f\xe1\x9e\x14\x0a\xcf\x96\xed\x7e\xab\x7d\x0c\xe1\x9b\xa4\x97\xdf\x01\xf5\x35\x42\x5f\x5b\x28\x15\x24\x33\x6e\x59\x6c\xaf\x10\x8b\x98\x8e\xe9\x4c\x23\x0d\x76\x92\x03\xdd\x6d\x8d\x08\x47\x15\x5b\xf8\x66\x75\x75\x40\xe8\xf4\xa0\x52\x02\x41\x15\x27\x7c\x5f\xa6\x33\xa6\x29\x68\x3f\x55\x8d\x7f\x1d\x4f\x88\xc6\x61\x6e\xac\x21\xdf\x2b\x7b\xde\x76\x9a\xdc\xe6\x3b\x94\x3f\x03\x9c\xa2\xa6\xa3\x63\x39\x48\xbd\x79\x70\x21\xf2\x6b\xff\x58\x66\xf1\x58\xc2\x58\xad\x4f\x84\x14\x5d\x05\x12\x83\xd0\x87\xbd\xf3";
 
 /* DSA key and signature */
 static const char dsa_privkey[] = "-----BEGIN DSA PRIVATE KEY-----\n"
-"MIIBuwIBAAKBgQCMBOoV479SAPxFHL6Ty9DNCZ08nlxCWkfgSjt77Lc51tEkNlrl\n"
-"Bx8Mid4uXPL7PDQ74YWdqDWL4In2lMkOQXZ/7B8xLqjuxZqisbyqgrYbu9/yatwo\n"
-"hNa23vkXrd6duVasjoWOSkj1fVPqy8Pl1jik3BwWyRqXBn+ajbmyDGOsDQIVALBp\n"
-"lrRgiO4jHfH1C8gP1CheHROrAoGBAIint1PE9y23u0Is9qEf6i/4hki+5pRCZv/K\n"
-"VG5JGDBW+hEgVj6Rx62jFP0jkTtxJdmv1SsoccFSE42tbRkWWypOLIJKZ7nIIrHY\n"
-"vMt3Z1S0m18mYE1G/3h9PNgbY8/Ag3YqYLwVfkthnBcTpDhSSAIo/dCwNV+3AxpS\n"
-"v5hE0L+1AoGAYMeZCjvVWODKDMJPJ/d8pURroeudhB+p7d5BMZTq+mYUCm9uVVgu\n"
-"doLo/RiWcs1mhrOQM9cHgKO1Hwd8NNjtj4KE8FTU1irpKbobgOViLHE5sM2Tfzc5\n"
-"Gif2fh8SlQdrhkOnZQkGDuTFx24K9/TTCDkVmB0T+xJfQ8HIshGw7kQCFHUDZ/g5\n"
-"K0FjzkSbhgOXhhKNTFFA\n"
-"-----END DSA PRIVATE KEY-----\n";
-
-static const char dsa_sig[] = "\x30\x2d\x02\x15\x00\xaf\x2a\x27\xcb\x93\xed\x33\x21\x9d\x01\x5f\x44\x8c\x80\x06\xa7\xe2\x9d\x73\x8d\x02\x14\x19\xb9\xf7\x73\x26\x62\x7a\xc7\x7f\x18\x5a\x69\x83\xc1\xa0\x1f\xbd\x9b\xe2\x92";
+    "MIIBuwIBAAKBgQCMBOoV479SAPxFHL6Ty9DNCZ08nlxCWkfgSjt77Lc51tEkNlrl\n"
+    "Bx8Mid4uXPL7PDQ74YWdqDWL4In2lMkOQXZ/7B8xLqjuxZqisbyqgrYbu9/yatwo\n"
+    "hNa23vkXrd6duVasjoWOSkj1fVPqy8Pl1jik3BwWyRqXBn+ajbmyDGOsDQIVALBp\n"
+    "lrRgiO4jHfH1C8gP1CheHROrAoGBAIint1PE9y23u0Is9qEf6i/4hki+5pRCZv/K\n"
+    "VG5JGDBW+hEgVj6Rx62jFP0jkTtxJdmv1SsoccFSE42tbRkWWypOLIJKZ7nIIrHY\n"
+    "vMt3Z1S0m18mYE1G/3h9PNgbY8/Ag3YqYLwVfkthnBcTpDhSSAIo/dCwNV+3AxpS\n"
+    "v5hE0L+1AoGAYMeZCjvVWODKDMJPJ/d8pURroeudhB+p7d5BMZTq+mYUCm9uVVgu\n"
+    "doLo/RiWcs1mhrOQM9cHgKO1Hwd8NNjtj4KE8FTU1irpKbobgOViLHE5sM2Tfzc5\n"
+    "Gif2fh8SlQdrhkOnZQkGDuTFx24K9/TTCDkVmB0T+xJfQ8HIshGw7kQCFHUDZ/g5\n"
+    "K0FjzkSbhgOXhhKNTFFA\n" "-----END DSA PRIVATE KEY-----\n";
+
+static const char dsa_sig[] =
+    "\x30\x2d\x02\x15\x00\xaf\x2a\x27\xcb\x93\xed\x33\x21\x9d\x01\x5f\x44\x8c\x80\x06\xa7\xe2\x9d\x73\x8d\x02\x14\x19\xb9\xf7\x73\x26\x62\x7a\xc7\x7f\x18\x5a\x69\x83\xc1\xa0\x1f\xbd\x9b\xe2\x92";
 
 static int test_known_sig(gnutls_pk_algorithm_t pk, unsigned bits,
-                                               gnutls_digest_algorithm_t dig,
-                                               const void* privkey, size_t privkey_size,
-                                               const void* stored_sig, size_t stored_sig_size,
-                                               unsigned deterministic_sigs)
+                         gnutls_digest_algorithm_t dig,
+                         const void *privkey, size_t privkey_size,
+                         const void *stored_sig, size_t stored_sig_size,
+                         unsigned deterministic_sigs)
 {
        int ret;
-       gnutls_datum_t sig = {NULL, 0};
+       gnutls_datum_t sig = { NULL, 0 };
        gnutls_datum_t t, ssig;
        gnutls_pubkey_t pub = NULL;
        gnutls_privkey_t key;
        char param_name[32];
-       
+
        if (pk == GNUTLS_PK_EC) {
-               snprintf(param_name, sizeof(param_name), "%s", gnutls_ecc_curve_get_name(GNUTLS_BITS_TO_CURVE(bits)));
+               snprintf(param_name, sizeof(param_name), "%s",
+                        gnutls_ecc_curve_get_name(GNUTLS_BITS_TO_CURVE
+                                                  (bits)));
        } else {
                snprintf(param_name, sizeof(param_name), "%u", bits);
        }
@@ -282,41 +301,46 @@ static int test_known_sig(gnutls_pk_algorithm_t pk, unsigned bits,
                return ret;
        }
 
-       t.data = (void*)privkey;
+       t.data = (void *) privkey;
        t.size = privkey_size;
-       
-       ret = gnutls_privkey_import_x509_raw(key, &t, GNUTLS_X509_FMT_PEM, NULL, 0);
+
+       ret =
+           gnutls_privkey_import_x509_raw(key, &t, GNUTLS_X509_FMT_PEM,
+                                          NULL, 0);
        if (ret < 0) {
                gnutls_assert();
                goto cleanup;
        }
-       
-       if (pk != (unsigned)gnutls_privkey_get_pk_algorithm(key, NULL)) {
+
+       if (pk != (unsigned) gnutls_privkey_get_pk_algorithm(key, NULL)) {
                ret = GNUTLS_E_SELF_TEST_ERROR;
                goto cleanup;
        }
 
        /* Test if the signature we generate matches the stored */
-       ssig.data = (void*)stored_sig;
+       ssig.data = (void *) stored_sig;
        ssig.size = stored_sig_size;
 
-       if (deterministic_sigs != 0) { /* do not compare against stored signature if not provided */
-               ret = gnutls_privkey_sign_data(key, dig, 0, &signed_data, &sig);
+       if (deterministic_sigs != 0) {  /* do not compare against stored signature if not provided */
+               ret =
+                   gnutls_privkey_sign_data(key, dig, 0, &signed_data,
+                                            &sig);
                if (ret < 0) {
                        gnutls_assert();
                        goto cleanup;
                }
 
-               if (sig.size != ssig.size || memcmp(sig.data, ssig.data, sig.size) != 0) {
+               if (sig.size != ssig.size
+                   || memcmp(sig.data, ssig.data, sig.size) != 0) {
                        ret = GNUTLS_E_SELF_TEST_ERROR;
-unsigned i;
-fprintf(stderr, "\nstored[%d]: ", ssig.size);
-for (i=0;i<ssig.size;i++)
-       fprintf(stderr, "%.2x", ssig.data[i]);
+                       unsigned i;
+                       fprintf(stderr, "\nstored[%d]: ", ssig.size);
+                       for (i = 0; i < ssig.size; i++)
+                               fprintf(stderr, "%.2x", ssig.data[i]);
 
-fprintf(stderr, "\ngenerated[%d]: ", sig.size);
-for (i=0;i<sig.size;i++)
-       fprintf(stderr, "%.2x", sig.data[i]);
+                       fprintf(stderr, "\ngenerated[%d]: ", sig.size);
+                       for (i = 0; i < sig.size; i++)
+                               fprintf(stderr, "%.2x", sig.data[i]);
 
                        gnutls_assert();
                        goto cleanup;
@@ -331,8 +355,9 @@ for (i=0;i<sig.size;i++)
                goto cleanup;
        }
 
-       ret = gnutls_pubkey_verify_data2(pub, gnutls_pk_to_sign(pk, dig), 0,
-                       &signed_data, &ssig);
+       ret =
+           gnutls_pubkey_verify_data2(pub, gnutls_pk_to_sign(pk, dig), 0,
+                                      &signed_data, &ssig);
        if (ret < 0) {
                ret = GNUTLS_E_SELF_TEST_ERROR;
                gnutls_assert();
@@ -341,25 +366,29 @@ for (i=0;i<sig.size;i++)
 
        /* Test if a broken signature will cause verification error */
 
-       ret = gnutls_pubkey_verify_data2(pub, gnutls_pk_to_sign(pk, dig), 0,
-                       &bad_data, &ssig);
+       ret =
+           gnutls_pubkey_verify_data2(pub, gnutls_pk_to_sign(pk, dig), 0,
+                                      &bad_data, &ssig);
 
        if (ret != GNUTLS_E_PK_SIG_VERIFY_FAILED) {
                ret = GNUTLS_E_SELF_TEST_ERROR;
                gnutls_assert();
                goto cleanup;
        }
-       
+
        ret = 0;
 
-cleanup:
-       if (pub != 0) gnutls_pubkey_deinit(pub);
+      cleanup:
+       if (pub != 0)
+               gnutls_pubkey_deinit(pub);
        gnutls_privkey_deinit(key);
 
        if (ret == 0)
-               _gnutls_debug_log("%s-%s-known-sig self test succeeded\n", gnutls_pk_get_name(pk), param_name);
+               _gnutls_debug_log("%s-%s-known-sig self test succeeded\n",
+                                 gnutls_pk_get_name(pk), param_name);
        else
-               _gnutls_debug_log("%s-%s-known-sig self test failed\n", gnutls_pk_get_name(pk), param_name);
+               _gnutls_debug_log("%s-%s-known-sig self test failed\n",
+                                 gnutls_pk_get_name(pk), param_name);
 
        return ret;
 }
@@ -395,45 +424,77 @@ cleanup:
  **/
 int gnutls_pk_self_test(unsigned all, gnutls_pk_algorithm_t pk)
 {
-int ret;
-       
+       int ret;
+
        if (all != 0)
                pk = GNUTLS_PK_UNKNOWN;
 
-       switch(pk) {
-               case GNUTLS_PK_UNKNOWN:
-
-               case GNUTLS_PK_RSA:
-                       PK_KNOWN_TEST(GNUTLS_PK_RSA, 1, 512, GNUTLS_DIG_SHA1, rsa_privkey, rsa_sig);
-                       PK_TEST(GNUTLS_PK_RSA, test_rsa_enc, 512, 0);
-                       PK_TEST(GNUTLS_PK_RSA, test_sig, 512, GNUTLS_DIG_SHA1);
-               case GNUTLS_PK_DSA:
-                       PK_KNOWN_TEST(GNUTLS_PK_DSA, 0, 1024, GNUTLS_DIG_SHA1, dsa_privkey, dsa_sig);
-                       PK_TEST(GNUTLS_PK_DSA, test_sig, 1024, GNUTLS_DIG_SHA1);
-               case GNUTLS_PK_EC: /* Testing ECDSA */
-                       PK_KNOWN_TEST(GNUTLS_PK_EC, 0, GNUTLS_CURVE_TO_BITS(GNUTLS_ECC_CURVE_SECP192R1), GNUTLS_DIG_SHA256, ecdsa_secp192r1_privkey, ecdsa_secp192r1_sig);
-                       PK_TEST(GNUTLS_PK_EC, test_sig, GNUTLS_CURVE_TO_BITS(GNUTLS_ECC_CURVE_SECP192R1), GNUTLS_DIG_SHA256);
-
-                       PK_KNOWN_TEST(GNUTLS_PK_EC, 0, GNUTLS_CURVE_TO_BITS(GNUTLS_ECC_CURVE_SECP224R1), GNUTLS_DIG_SHA256, ecdsa_secp224r1_privkey, ecdsa_secp224r1_sig);
-                       PK_TEST(GNUTLS_PK_EC, test_sig, GNUTLS_CURVE_TO_BITS(GNUTLS_ECC_CURVE_SECP224R1), GNUTLS_DIG_SHA256);
-                       
-                       PK_KNOWN_TEST(GNUTLS_PK_EC, 0, GNUTLS_CURVE_TO_BITS(GNUTLS_ECC_CURVE_SECP256R1), GNUTLS_DIG_SHA256, ecdsa_secp256r1_privkey, ecdsa_secp256r1_sig);
-                       PK_TEST(GNUTLS_PK_EC, test_sig, GNUTLS_CURVE_TO_BITS(GNUTLS_ECC_CURVE_SECP256R1), GNUTLS_DIG_SHA256);
-
-                       PK_KNOWN_TEST(GNUTLS_PK_EC, 0, GNUTLS_CURVE_TO_BITS(GNUTLS_ECC_CURVE_SECP384R1), GNUTLS_DIG_SHA256, ecdsa_secp384r1_privkey, ecdsa_secp384r1_sig);
-                       PK_TEST(GNUTLS_PK_EC, test_sig, GNUTLS_CURVE_TO_BITS(GNUTLS_ECC_CURVE_SECP384R1), GNUTLS_DIG_SHA384);
-
-                       PK_KNOWN_TEST(GNUTLS_PK_EC, 0, GNUTLS_CURVE_TO_BITS(GNUTLS_ECC_CURVE_SECP521R1), GNUTLS_DIG_SHA512, ecdsa_secp521r1_privkey, ecdsa_secp521r1_sig);
-                       PK_TEST(GNUTLS_PK_EC, test_sig, GNUTLS_CURVE_TO_BITS(GNUTLS_ECC_CURVE_SECP521R1), GNUTLS_DIG_SHA512);
-
-                       break;
-                       
-               default:
-                       return gnutls_assert_val(GNUTLS_E_NO_SELF_TEST);
+       switch (pk) {
+       case GNUTLS_PK_UNKNOWN:
+
+       case GNUTLS_PK_RSA:
+               PK_KNOWN_TEST(GNUTLS_PK_RSA, 1, 512, GNUTLS_DIG_SHA1,
+                             rsa_privkey, rsa_sig);
+               PK_TEST(GNUTLS_PK_RSA, test_rsa_enc, 512, 0);
+               PK_TEST(GNUTLS_PK_RSA, test_sig, 512, GNUTLS_DIG_SHA1);
+       case GNUTLS_PK_DSA:
+               PK_KNOWN_TEST(GNUTLS_PK_DSA, 0, 1024, GNUTLS_DIG_SHA1,
+                             dsa_privkey, dsa_sig);
+               PK_TEST(GNUTLS_PK_DSA, test_sig, 1024, GNUTLS_DIG_SHA1);
+       case GNUTLS_PK_EC:      /* Testing ECDSA */
+               PK_KNOWN_TEST(GNUTLS_PK_EC, 0,
+                             GNUTLS_CURVE_TO_BITS
+                             (GNUTLS_ECC_CURVE_SECP192R1),
+                             GNUTLS_DIG_SHA256, ecdsa_secp192r1_privkey,
+                             ecdsa_secp192r1_sig);
+               PK_TEST(GNUTLS_PK_EC, test_sig,
+                       GNUTLS_CURVE_TO_BITS(GNUTLS_ECC_CURVE_SECP192R1),
+                       GNUTLS_DIG_SHA256);
+
+               PK_KNOWN_TEST(GNUTLS_PK_EC, 0,
+                             GNUTLS_CURVE_TO_BITS
+                             (GNUTLS_ECC_CURVE_SECP224R1),
+                             GNUTLS_DIG_SHA256, ecdsa_secp224r1_privkey,
+                             ecdsa_secp224r1_sig);
+               PK_TEST(GNUTLS_PK_EC, test_sig,
+                       GNUTLS_CURVE_TO_BITS(GNUTLS_ECC_CURVE_SECP224R1),
+                       GNUTLS_DIG_SHA256);
+
+               PK_KNOWN_TEST(GNUTLS_PK_EC, 0,
+                             GNUTLS_CURVE_TO_BITS
+                             (GNUTLS_ECC_CURVE_SECP256R1),
+                             GNUTLS_DIG_SHA256, ecdsa_secp256r1_privkey,
+                             ecdsa_secp256r1_sig);
+               PK_TEST(GNUTLS_PK_EC, test_sig,
+                       GNUTLS_CURVE_TO_BITS(GNUTLS_ECC_CURVE_SECP256R1),
+                       GNUTLS_DIG_SHA256);
+
+               PK_KNOWN_TEST(GNUTLS_PK_EC, 0,
+                             GNUTLS_CURVE_TO_BITS
+                             (GNUTLS_ECC_CURVE_SECP384R1),
+                             GNUTLS_DIG_SHA256, ecdsa_secp384r1_privkey,
+                             ecdsa_secp384r1_sig);
+               PK_TEST(GNUTLS_PK_EC, test_sig,
+                       GNUTLS_CURVE_TO_BITS(GNUTLS_ECC_CURVE_SECP384R1),
+                       GNUTLS_DIG_SHA384);
+
+               PK_KNOWN_TEST(GNUTLS_PK_EC, 0,
+                             GNUTLS_CURVE_TO_BITS
+                             (GNUTLS_ECC_CURVE_SECP521R1),
+                             GNUTLS_DIG_SHA512, ecdsa_secp521r1_privkey,
+                             ecdsa_secp521r1_sig);
+               PK_TEST(GNUTLS_PK_EC, test_sig,
+                       GNUTLS_CURVE_TO_BITS(GNUTLS_ECC_CURVE_SECP521R1),
+                       GNUTLS_DIG_SHA512);
+
+               break;
+
+       default:
+               return gnutls_assert_val(GNUTLS_E_NO_SELF_TEST);
        }
 
        ret = 0;
 
-cleanup:
+      cleanup:
        return ret;
 }
index 18a44718788cb3237c42d98672f540e2834c0d88..350efb274833806f557547b32182ce913812ebc1 100644 (file)
@@ -71,122 +71,160 @@ struct cipher_aead_vectors_st {
 
 const struct cipher_aead_vectors_st aes128_gcm_vectors[] = {
        {
-        STR(key, key_size, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"),
+        STR(key, key_size,
+            "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"),
         .auth = NULL,
         .auth_size = 0,
         .plaintext = NULL,
         .plaintext_size = 0,
         .ciphertext = NULL,
-        STR(iv, iv_size, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"),
+        STR(iv, iv_size,
+            "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"),
         .tag = (void *)
         "\x58\xe2\xfc\xce\xfa\x7e\x30\x61\x36\x7f\x1d\x57\xa4\xe7\x45\x5a"},
        {
-        STR(key, key_size, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"),
+        STR(key, key_size,
+            "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"),
         .auth = NULL,
         .auth_size = 0,
-        STR(plaintext, plaintext_size, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"),
+        STR(plaintext, plaintext_size,
+            "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"),
         .ciphertext = (void *)
         "\x03\x88\xda\xce\x60\xb6\xa3\x92\xf3\x28\xc2\xb9\x71\xb2\xfe\x78",
-        STR(iv, iv_size,  "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"),
+        STR(iv, iv_size,
+            "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"),
         .tag = (void *)
         "\xab\x6e\x47\xd4\x2c\xec\x13\xbd\xf5\x3a\x67\xb2\x12\x57\xbd\xdf"},
        {
-        STR(key, key_size, "\xfe\xff\xe9\x92\x86\x65\x73\x1c\x6d\x6a\x8f\x94\x67\x30\x83\x08"),
+        STR(key, key_size,
+            "\xfe\xff\xe9\x92\x86\x65\x73\x1c\x6d\x6a\x8f\x94\x67\x30\x83\x08"),
         .auth = (void *)
         "\xfe\xed\xfa\xce\xde\xad\xbe\xef\xfe\xed\xfa\xce\xde\xad\xbe\xef\xab\xad\xda\xd2",
         .auth_size = 20,
-        STR(plaintext, plaintext_size, "\xd9\x31\x32\x25\xf8\x84\x06\xe5\xa5\x59\x09\xc5\xaf\xf5\x26\x9a\x86\xa7\xa9\x53\x15\x34\xf7\xda\x2e\x4c\x30\x3d\x8a\x31\x8a\x72\x1c\x3c\x0c\x95\x95\x68\x09\x53\x2f\xcf\x0e\x24\x49\xa6\xb5\x25\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57\xba\x63\x7b\x39"),
+        STR(plaintext, plaintext_size,
+            "\xd9\x31\x32\x25\xf8\x84\x06\xe5\xa5\x59\x09\xc5\xaf\xf5\x26\x9a\x86\xa7\xa9\x53\x15\x34\xf7\xda\x2e\x4c\x30\x3d\x8a\x31\x8a\x72\x1c\x3c\x0c\x95\x95\x68\x09\x53\x2f\xcf\x0e\x24\x49\xa6\xb5\x25\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57\xba\x63\x7b\x39"),
         .ciphertext = (void *)
         "\x42\x83\x1e\xc2\x21\x77\x74\x24\x4b\x72\x21\xb7\x84\xd0\xd4\x9c\xe3\xaa\x21\x2f\x2c\x02\xa4\xe0\x35\xc1\x7e\x23\x29\xac\xa1\x2e\x21\xd5\x14\xb2\x54\x66\x93\x1c\x7d\x8f\x6a\x5a\xac\x84\xaa\x05\x1b\xa3\x0b\x39\x6a\x0a\xac\x97\x3d\x58\xe0\x91",
-        STR(iv, iv_size, "\xca\xfe\xba\xbe\xfa\xce\xdb\xad\xde\xca\xf8\x88"),
+        STR(iv, iv_size,
+            "\xca\xfe\xba\xbe\xfa\xce\xdb\xad\xde\xca\xf8\x88"),
         .tag = (void *)
         "\x5b\xc9\x4f\xbc\x32\x21\xa5\xdb\x94\xfa\xe9\x5a\xe7\x12\x1a\x47"}
 };
 
 const struct cipher_aead_vectors_st aes256_gcm_vectors[] = {
        {
-         STR(key, key_size, "\xfe\xff\xe9\x92\x86\x65\x73\x1c\x6d\x6a\x8f\x94\x67\x30\x83\x08\xfe\xff\xe9\x92\x86\x65\x73\x1c\x6d\x6a\x8f\x94\x67\x30\x83\x08"),
+        STR(key, key_size,
+            "\xfe\xff\xe9\x92\x86\x65\x73\x1c\x6d\x6a\x8f\x94\x67\x30\x83\x08\xfe\xff\xe9\x92\x86\x65\x73\x1c\x6d\x6a\x8f\x94\x67\x30\x83\x08"),
         .auth = NULL,
         .auth_size = 0,
-        STR(plaintext, plaintext_size, "\xd9\x31\x32\x25\xf8\x84\x06\xe5\xa5\x59\x09\xc5\xaf\xf5\x26\x9a\x86\xa7\xa9\x53\x15\x34\xf7\xda\x2e\x4c\x30\x3d\x8a\x31\x8a\x72\x1c\x3c\x0c\x95\x95\x68\x09\x53\x2f\xcf\x0e\x24\x49\xa6\xb5\x25\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57\xba\x63\x7b\x39\x1a\xaf\xd2\x55"),
-        .ciphertext = (uint8_t*)"\x52\x2d\xc1\xf0\x99\x56\x7d\x07\xf4\x7f\x37\xa3\x2a\x84\x42\x7d\x64\x3a\x8c\xdc\xbf\xe5\xc0\xc9\x75\x98\xa2\xbd\x25\x55\xd1\xaa\x8c\xb0\x8e\x48\x59\x0d\xbb\x3d\xa7\xb0\x8b\x10\x56\x82\x88\x38\xc5\xf6\x1e\x63\x93\xba\x7a\x0a\xbc\xc9\xf6\x62\x89\x80\x15\xad",
-        STR(iv, iv_size, "\xca\xfe\xba\xbe\xfa\xce\xdb\xad\xde\xca\xf8\x88"),
-        .tag = (void *)"\xb0\x94\xda\xc5\xd9\x34\x71\xbd\xec\x1a\x50\x22\x70\xe3\xcc\x6c"
-       },
+        STR(plaintext, plaintext_size,
+            "\xd9\x31\x32\x25\xf8\x84\x06\xe5\xa5\x59\x09\xc5\xaf\xf5\x26\x9a\x86\xa7\xa9\x53\x15\x34\xf7\xda\x2e\x4c\x30\x3d\x8a\x31\x8a\x72\x1c\x3c\x0c\x95\x95\x68\x09\x53\x2f\xcf\x0e\x24\x49\xa6\xb5\x25\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57\xba\x63\x7b\x39\x1a\xaf\xd2\x55"),
+        .ciphertext =
+        (uint8_t *)
+        "\x52\x2d\xc1\xf0\x99\x56\x7d\x07\xf4\x7f\x37\xa3\x2a\x84\x42\x7d\x64\x3a\x8c\xdc\xbf\xe5\xc0\xc9\x75\x98\xa2\xbd\x25\x55\xd1\xaa\x8c\xb0\x8e\x48\x59\x0d\xbb\x3d\xa7\xb0\x8b\x10\x56\x82\x88\x38\xc5\xf6\x1e\x63\x93\xba\x7a\x0a\xbc\xc9\xf6\x62\x89\x80\x15\xad",
+        STR(iv, iv_size,
+            "\xca\xfe\xba\xbe\xfa\xce\xdb\xad\xde\xca\xf8\x88"),
+        .tag =
+        (void *)
+        "\xb0\x94\xda\xc5\xd9\x34\x71\xbd\xec\x1a\x50\x22\x70\xe3\xcc\x6c"},
 
 };
 
 const struct cipher_vectors_st aes128_cbc_vectors[] = {
        {
-        STR(key, key_size, "\x2b\x7e\x15\x16\x28\xae\xd2\xa6\xab\xf7\x15\x88\x09\xcf\x4f\x3c"),
-        STR(plaintext, plaintext_size, "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96\xe9\x3d\x7e\x11\x73\x93\x17\x2a"),
+        STR(key, key_size,
+            "\x2b\x7e\x15\x16\x28\xae\xd2\xa6\xab\xf7\x15\x88\x09\xcf\x4f\x3c"),
+        STR(plaintext, plaintext_size,
+            "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96\xe9\x3d\x7e\x11\x73\x93\x17\x2a"),
         .ciphertext = (uint8_t *)
         "\x76\x49\xab\xac\x81\x19\xb2\x46\xce\xe9\x8e\x9b\x12\xe9\x19\x7d",
-        STR(iv, iv_size, "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F"),
-       },
+        STR(iv, iv_size,
+            "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F"),
+        },
        {
-         STR(key, key_size, "\x2b\x7e\x15\x16\x28\xae\xd2\xa6\xab\xf7\x15\x88\x09\xcf\x4f\x3c"),
-         STR(plaintext, plaintext_size, "\xae\x2d\x8a\x57\x1e\x03\xac\x9c\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"),
-         .ciphertext = (uint8_t *)"\x50\x86\xcb\x9b\x50\x72\x19\xee\x95\xdb\x11\x3a\x91\x76\x78\xb2",
-         STR(iv, iv_size, "\x76\x49\xab\xac\x81\x19\xb2\x46\xce\xe9\x8e\x9b\x12\xe9\x19\x7d"),
-       },
+        STR(key, key_size,
+            "\x2b\x7e\x15\x16\x28\xae\xd2\xa6\xab\xf7\x15\x88\x09\xcf\x4f\x3c"),
+        STR(plaintext, plaintext_size,
+            "\xae\x2d\x8a\x57\x1e\x03\xac\x9c\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"),
+        .ciphertext =
+        (uint8_t *)
+        "\x50\x86\xcb\x9b\x50\x72\x19\xee\x95\xdb\x11\x3a\x91\x76\x78\xb2",
+        STR(iv, iv_size,
+            "\x76\x49\xab\xac\x81\x19\xb2\x46\xce\xe9\x8e\x9b\x12\xe9\x19\x7d"),
+        },
 };
 
 const struct cipher_vectors_st aes192_cbc_vectors[] = {
        {
-        STR(key, key_size, "\x8e\x73\xb0\xf7\xda\x0e\x64\x52\xc8\x10\xf3\x2b\x80\x90\x79\xe5\x62\xf8\xea\xd2\x52\x2c\x6b\x7b"),
-        STR(plaintext, plaintext_size, "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96\xe9\x3d\x7e\x11\x73\x93\x17\x2a"),
+        STR(key, key_size,
+            "\x8e\x73\xb0\xf7\xda\x0e\x64\x52\xc8\x10\xf3\x2b\x80\x90\x79\xe5\x62\xf8\xea\xd2\x52\x2c\x6b\x7b"),
+        STR(plaintext, plaintext_size,
+            "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96\xe9\x3d\x7e\x11\x73\x93\x17\x2a"),
         .ciphertext = (uint8_t *)
         "\x4f\x02\x1d\xb2\x43\xbc\x63\x3d\x71\x78\x18\x3a\x9f\xa0\x71\xe8",
-        STR(iv, iv_size, "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F"),
-    },
+        STR(iv, iv_size,
+            "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F"),
+        },
        {
-        STR(key, key_size, "\x8e\x73\xb0\xf7\xda\x0e\x64\x52\xc8\x10\xf3\x2b\x80\x90\x79\xe5\x62\xf8\xea\xd2\x52\x2c\x6b\x7b"),
-        STR(plaintext, plaintext_size, "\xae\x2d\x8a\x57\x1e\x03\xac\x9c\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"),
+        STR(key, key_size,
+            "\x8e\x73\xb0\xf7\xda\x0e\x64\x52\xc8\x10\xf3\x2b\x80\x90\x79\xe5\x62\xf8\xea\xd2\x52\x2c\x6b\x7b"),
+        STR(plaintext, plaintext_size,
+            "\xae\x2d\x8a\x57\x1e\x03\xac\x9c\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"),
         .ciphertext = (uint8_t *)
         "\xb4\xd9\xad\xa9\xad\x7d\xed\xf4\xe5\xe7\x38\x76\x3f\x69\x14\x5a",
-        STR(iv, iv_size, "\x4F\x02\x1D\xB2\x43\xBC\x63\x3D\x71\x78\x18\x3A\x9F\xA0\x71\xE8"),
-       },
+        STR(iv, iv_size,
+            "\x4F\x02\x1D\xB2\x43\xBC\x63\x3D\x71\x78\x18\x3A\x9F\xA0\x71\xE8"),
+        },
 };
 
 const struct cipher_vectors_st aes256_cbc_vectors[] = {
        {
-        STR(key, key_size, "\x60\x3d\xeb\x10\x15\xca\x71\xbe\x2b\x73\xae\xf0\x85\x7d\x77\x81\x1f\x35\x2c\x07\x3b\x61\x08\xd7\x2d\x98\x10\xa3\x09\x14\xdf\xf4"),
-        STR(plaintext, plaintext_size, "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96\xe9\x3d\x7e\x11\x73\x93\x17\x2a"),
+        STR(key, key_size,
+            "\x60\x3d\xeb\x10\x15\xca\x71\xbe\x2b\x73\xae\xf0\x85\x7d\x77\x81\x1f\x35\x2c\x07\x3b\x61\x08\xd7\x2d\x98\x10\xa3\x09\x14\xdf\xf4"),
+        STR(plaintext, plaintext_size,
+            "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96\xe9\x3d\x7e\x11\x73\x93\x17\x2a"),
         .ciphertext = (uint8_t *)
         "\xF5\x8C\x4C\x04\xD6\xE5\xF1\xBA\x77\x9E\xAB\xFB\x5F\x7B\xFB\xD6",
-        STR(iv, iv_size, "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F"),
-    },
+        STR(iv, iv_size,
+            "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F"),
+        },
        {
-        STR(key, key_size, "\x60\x3d\xeb\x10\x15\xca\x71\xbe\x2b\x73\xae\xf0\x85\x7d\x77\x81\x1f\x35\x2c\x07\x3b\x61\x08\xd7\x2d\x98\x10\xa3\x09\x14\xdf\xf4"),
-        STR(plaintext, plaintext_size, "\xae\x2d\x8a\x57\x1e\x03\xac\x9c\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"),
+        STR(key, key_size,
+            "\x60\x3d\xeb\x10\x15\xca\x71\xbe\x2b\x73\xae\xf0\x85\x7d\x77\x81\x1f\x35\x2c\x07\x3b\x61\x08\xd7\x2d\x98\x10\xa3\x09\x14\xdf\xf4"),
+        STR(plaintext, plaintext_size,
+            "\xae\x2d\x8a\x57\x1e\x03\xac\x9c\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"),
         .ciphertext = (uint8_t *)
         "\x9c\xfc\x4e\x96\x7e\xdb\x80\x8d\x67\x9f\x77\x7b\xc6\x70\x2c\x7d",
-        STR(iv, iv_size, "\xF5\x8C\x4C\x04\xD6\xE5\xF1\xBA\x77\x9E\xAB\xFB\x5F\x7B\xFB\xD6"),
-       },
+        STR(iv, iv_size,
+            "\xF5\x8C\x4C\x04\xD6\xE5\xF1\xBA\x77\x9E\xAB\xFB\x5F\x7B\xFB\xD6"),
+        },
 };
 
 const struct cipher_vectors_st tdes_cbc_vectors[] = {
 /* First 2 from https://www.cosic.esat.kuleuven.be/nessie/testvectors/bc/des/Triple-Des-3-Key-192-64.unverified.test-vectors */
        {
-        STR(key, key_size, "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17"),
-        STR(plaintext, plaintext_size, "\x98\x26\x62\x60\x55\x53\x24\x4D"),
+        STR(key, key_size,
+            "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17"),
+        STR(plaintext, plaintext_size,
+            "\x98\x26\x62\x60\x55\x53\x24\x4D"),
         .ciphertext = (uint8_t *)
         "\x00\x11\x22\x33\x44\x55\x66\x77",
         STR(iv, iv_size, "\x00\x00\x00\x00\x00\x00\x00\x00"),
-       },
+        },
        {
-        STR(key, key_size, "\x2B\xD6\x45\x9F\x82\xC5\xB3\x00\x95\x2C\x49\x10\x48\x81\xFF\x48\x2B\xD6\x45\x9F\x82\xC5\xB3\x00"),
-        STR(plaintext, plaintext_size, "\x85\x98\x53\x8A\x8E\xCF\x11\x7D"),
+        STR(key, key_size,
+            "\x2B\xD6\x45\x9F\x82\xC5\xB3\x00\x95\x2C\x49\x10\x48\x81\xFF\x48\x2B\xD6\x45\x9F\x82\xC5\xB3\x00"),
+        STR(plaintext, plaintext_size,
+            "\x85\x98\x53\x8A\x8E\xCF\x11\x7D"),
         .ciphertext = (uint8_t *)
         "\xEA\x02\x47\x14\xAD\x5C\x4D\x84",
         STR(iv, iv_size, "\x00\x00\x00\x00\x00\x00\x00\x00"),
-       },
+        },
 };
 
 static int test_cipher(gnutls_cipher_algorithm_t cipher,
-               const struct cipher_vectors_st *vectors,
-               size_t vectors_size)
+                      const struct cipher_vectors_st *vectors,
+                      size_t vectors_size)
 {
        gnutls_cipher_hd_t hd;
        int ret;
@@ -200,12 +238,11 @@ static int test_cipher(gnutls_cipher_algorithm_t cipher,
 
                iv.data = (void *) vectors[i].iv;
                iv.size = gnutls_cipher_get_iv_size(cipher);
-               
+
                if (iv.size != vectors[i].iv_size)
                        return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
 
-               ret =
-                   gnutls_cipher_init(&hd, cipher, &key, &iv);
+               ret = gnutls_cipher_init(&hd, cipher, &key, &iv);
                if (ret < 0) {
                        _gnutls_debug_log("error initializing: %s\n",
                                          gnutls_cipher_get_name(cipher));
@@ -215,7 +252,7 @@ static int test_cipher(gnutls_cipher_algorithm_t cipher,
                ret =
                    gnutls_cipher_encrypt2(hd,
                                           vectors[i].plaintext,
-                                          vectors[i].plaintext_size, 
+                                          vectors[i].plaintext_size,
                                           tmp, sizeof(tmp));
                if (ret < 0)
                        return 0;
@@ -226,7 +263,8 @@ static int test_cipher(gnutls_cipher_algorithm_t cipher,
                    (tmp, vectors[i].ciphertext,
                     vectors[i].plaintext_size) != 0) {
                        _gnutls_debug_log("%s test vector %d failed!\n",
-                                         gnutls_cipher_get_name(cipher), i);
+                                         gnutls_cipher_get_name(cipher),
+                                         i);
                }
        }
 
@@ -238,43 +276,45 @@ static int test_cipher(gnutls_cipher_algorithm_t cipher,
 
                iv.data = (void *) vectors[i].iv;
 
-               ret =
-                   gnutls_cipher_init(&hd, cipher, &key, &iv);
+               ret = gnutls_cipher_init(&hd, cipher, &key, &iv);
                if (ret < 0)
                        return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
 
                ret =
                    gnutls_cipher_decrypt2(hd,
-                                          vectors[i].
-                                          ciphertext, 16, tmp,
+                                          vectors[i].ciphertext, 16, tmp,
                                           sizeof(tmp));
                if (ret < 0) {
-                       _gnutls_debug_log("%s decryption of test vector %d failed!\n",
-                                         gnutls_cipher_get_name(cipher), i);
+                       _gnutls_debug_log
+                           ("%s decryption of test vector %d failed!\n",
+                            gnutls_cipher_get_name(cipher), i);
                        return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
                }
 
                gnutls_cipher_deinit(hd);
 
-               if (memcmp(tmp, vectors[i].plaintext, vectors[i].plaintext_size) != 0) {
+               if (memcmp
+                   (tmp, vectors[i].plaintext,
+                    vectors[i].plaintext_size) != 0) {
                        _gnutls_debug_log("%s test vector %d failed!\n",
-                                         gnutls_cipher_get_name(cipher), i);
+                                         gnutls_cipher_get_name(cipher),
+                                         i);
                        return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
                }
        }
 
-    _gnutls_debug_log
-                           ("%s self check was successful\n",
-                                gnutls_cipher_get_name(cipher));
+       _gnutls_debug_log
+           ("%s self check was successful\n",
+            gnutls_cipher_get_name(cipher));
 
        return 0;
 
 }
 
 /* AEAD modes */
-static int test_cipher_aead(gnutls_cipher_algorithm_t cipher, 
-               const struct cipher_aead_vectors_st* vectors,
-               size_t vectors_size)
+static int test_cipher_aead(gnutls_cipher_algorithm_t cipher,
+                           const struct cipher_aead_vectors_st *vectors,
+                           size_t vectors_size)
 {
        gnutls_cipher_hd_t hd;
        int ret;
@@ -293,8 +333,7 @@ static int test_cipher_aead(gnutls_cipher_algorithm_t cipher,
                if (iv.size != vectors[i].iv_size)
                        return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
 
-               ret =
-                   gnutls_cipher_init(&hd, cipher, &key, &iv);
+               ret = gnutls_cipher_init(&hd, cipher, &key, &iv);
                if (ret < 0) {
                        _gnutls_debug_log("error initializing: %s\n",
                                          gnutls_cipher_get_name(cipher));
@@ -304,10 +343,8 @@ static int test_cipher_aead(gnutls_cipher_algorithm_t cipher,
                if (vectors[i].auth_size > 0) {
                        ret =
                            gnutls_cipher_add_auth(hd,
-                                                  vectors[i].
-                                                  auth,
-                                                  vectors[i].
-                                                  auth_size);
+                                                  vectors[i].auth,
+                                                  vectors[i].auth_size);
 
                        if (ret < 0)
                                return
@@ -318,8 +355,7 @@ static int test_cipher_aead(gnutls_cipher_algorithm_t cipher,
                if (vectors[i].plaintext_size > 0) {
                        ret =
                            gnutls_cipher_encrypt2(hd,
-                                                  vectors[i].
-                                                  plaintext,
+                                                  vectors[i].plaintext,
                                                   vectors
                                                   [i].plaintext_size, tmp,
                                                   sizeof(tmp));
@@ -336,7 +372,7 @@ static int test_cipher_aead(gnutls_cipher_algorithm_t cipher,
                             vectors[i].plaintext_size) != 0) {
                                _gnutls_debug_log
                                    ("%s test vector %d failed!\n",
-                                     gnutls_cipher_get_name(cipher), i);
+                                    gnutls_cipher_get_name(cipher), i);
                                return
                                    gnutls_assert_val
                                    (GNUTLS_E_SELF_TEST_ERROR);
@@ -346,16 +382,16 @@ static int test_cipher_aead(gnutls_cipher_algorithm_t cipher,
                if (memcmp(tmp, vectors[i].tag, 16) != 0) {
                        _gnutls_debug_log
                            ("%s test vector %d failed (tag)!\n",
-                                gnutls_cipher_get_name(cipher), i);
+                            gnutls_cipher_get_name(cipher), i);
                        return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
                }
 
                gnutls_cipher_deinit(hd);
        }
 
-    _gnutls_debug_log
-                           ("%s self check was successful\n",
-                                gnutls_cipher_get_name(cipher));
+       _gnutls_debug_log
+           ("%s self check was successful\n",
+            gnutls_cipher_get_name(cipher));
 
        return 0;
 
@@ -370,60 +406,74 @@ struct hash_vectors_st {
 
 const struct hash_vectors_st md5_vectors[] = {
        {
-               STR(plaintext, plaintext_size, "abcdefghijklmnopqrstuvwxyz"),
-               STR(output, output_size, "\xc3\xfc\xd3\xd7\x61\x92\xe4\x00\x7d\xfb\x49\x6c\xca\x67\xe1\x3b"),
-       },
+        STR(plaintext, plaintext_size, "abcdefghijklmnopqrstuvwxyz"),
+        STR(output, output_size,
+            "\xc3\xfc\xd3\xd7\x61\x92\xe4\x00\x7d\xfb\x49\x6c\xca\x67\xe1\x3b"),
+        },
 };
 
 const struct hash_vectors_st sha1_vectors[] = {
        {
-               STR(plaintext, plaintext_size, "what do ya want for nothing?"),
-               STR(output, output_size, "\x8f\x82\x03\x94\xf9\x53\x35\x18\x20\x45\xda\x24\xf3\x4d\xe5\x2b\xf8\xbc\x34\x32"),
-       },
+        STR(plaintext, plaintext_size, "what do ya want for nothing?"),
+        STR(output, output_size,
+            "\x8f\x82\x03\x94\xf9\x53\x35\x18\x20\x45\xda\x24\xf3\x4d\xe5\x2b\xf8\xbc\x34\x32"),
+        },
        {
-               STR(plaintext, plaintext_size, "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopqabcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopqabcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"),
-               STR(output, output_size, "\xbe\xae\xd1\x6d\x65\x8e\xc7\x92\x9e\xdf\xd6\x2b\xfa\xfe\xac\x29\x9f\x0d\x74\x4d"),
-       },
+        STR(plaintext, plaintext_size,
+            "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopqabcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopqabcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"),
+        STR(output, output_size,
+            "\xbe\xae\xd1\x6d\x65\x8e\xc7\x92\x9e\xdf\xd6\x2b\xfa\xfe\xac\x29\x9f\x0d\x74\x4d"),
+        },
 };
 
 const struct hash_vectors_st sha224_vectors[] = {
        {
-               STR(plaintext, plaintext_size, "The quick brown fox jumps over the lazy dog"),
-               STR(output, output_size, "\x73\x0e\x10\x9b\xd7\xa8\xa3\x2b\x1c\xb9\xd9\xa0\x9a\xa2\x32\x5d\x24\x30\x58\x7d\xdb\xc0\xc3\x8b\xad\x91\x15\x25"),
-       },
+        STR(plaintext, plaintext_size,
+            "The quick brown fox jumps over the lazy dog"),
+        STR(output, output_size,
+            "\x73\x0e\x10\x9b\xd7\xa8\xa3\x2b\x1c\xb9\xd9\xa0\x9a\xa2\x32\x5d\x24\x30\x58\x7d\xdb\xc0\xc3\x8b\xad\x91\x15\x25"),
+        },
 };
 
 const struct hash_vectors_st sha256_vectors[] = {
        {
-               STR(plaintext, plaintext_size, "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"),
-               STR(output, output_size, "\x24\x8d\x6a\x61\xd2\x06\x38\xb8\xe5\xc0\x26\x93\x0c\x3e\x60\x39\xa3\x3c\xe4\x59\x64\xff\x21\x67\xf6\xec\xed\xd4\x19\xdb\x06\xc1"),
-       },
+        STR(plaintext, plaintext_size,
+            "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"),
+        STR(output, output_size,
+            "\x24\x8d\x6a\x61\xd2\x06\x38\xb8\xe5\xc0\x26\x93\x0c\x3e\x60\x39\xa3\x3c\xe4\x59\x64\xff\x21\x67\xf6\xec\xed\xd4\x19\xdb\x06\xc1"),
+        },
        {
-               STR(plaintext, plaintext_size, "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopqabcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopqabcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"),
-               STR(output, output_size, "\x50\xea\x82\x5d\x96\x84\xf4\x22\x9c\xa2\x9f\x1f\xec\x51\x15\x93\xe2\x81\xe4\x6a\x14\x0d\x81\xe0\x00\x5f\x8f\x68\x86\x69\xa0\x6c"),
-       },
+        STR(plaintext, plaintext_size,
+            "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopqabcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopqabcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"),
+        STR(output, output_size,
+            "\x50\xea\x82\x5d\x96\x84\xf4\x22\x9c\xa2\x9f\x1f\xec\x51\x15\x93\xe2\x81\xe4\x6a\x14\x0d\x81\xe0\x00\x5f\x8f\x68\x86\x69\xa0\x6c"),
+        },
 };
 
 const struct hash_vectors_st sha384_vectors[] = {
        {
-               STR(plaintext, plaintext_size, "The quick brown fox jumps over the lazy dog"),
-               STR(output, output_size, "\xca\x73\x7f\x10\x14\xa4\x8f\x4c\x0b\x6d\xd4\x3c\xb1\x77\xb0\xaf\xd9\xe5\x16\x93\x67\x54\x4c\x49\x40\x11\xe3\x31\x7d\xbf\x9a\x50\x9c\xb1\xe5\xdc\x1e\x85\xa9\x41\xbb\xee\x3d\x7f\x2a\xfb\xc9\xb1"),
-       },
+        STR(plaintext, plaintext_size,
+            "The quick brown fox jumps over the lazy dog"),
+        STR(output, output_size,
+            "\xca\x73\x7f\x10\x14\xa4\x8f\x4c\x0b\x6d\xd4\x3c\xb1\x77\xb0\xaf\xd9\xe5\x16\x93\x67\x54\x4c\x49\x40\x11\xe3\x31\x7d\xbf\x9a\x50\x9c\xb1\xe5\xdc\x1e\x85\xa9\x41\xbb\xee\x3d\x7f\x2a\xfb\xc9\xb1"),
+        },
 };
 
 const struct hash_vectors_st sha512_vectors[] = {
        {
-               STR(plaintext, plaintext_size, "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"),
-               STR(output, output_size, "\x8e\x95\x9b\x75\xda\xe3\x13\xda\x8c\xf4\xf7\x28\x14\xfc\x14\x3f\x8f\x77\x79\xc6\xeb\x9f\x7f\xa1\x72\x99\xae\xad\xb6\x88\x90\x18\x50\x1d\x28\x9e\x49\x00\xf7\xe4\x33\x1b\x99\xde\xc4\xb5\x43\x3a\xc7\xd3\x29\xee\xb6\xdd\x26\x54\x5e\x96\xe5\x5b\x87\x4b\xe9\x09"),
-       },
+        STR(plaintext, plaintext_size,
+            "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"),
+        STR(output, output_size,
+            "\x8e\x95\x9b\x75\xda\xe3\x13\xda\x8c\xf4\xf7\x28\x14\xfc\x14\x3f\x8f\x77\x79\xc6\xeb\x9f\x7f\xa1\x72\x99\xae\xad\xb6\x88\x90\x18\x50\x1d\x28\x9e\x49\x00\xf7\xe4\x33\x1b\x99\xde\xc4\xb5\x43\x3a\xc7\xd3\x29\xee\xb6\xdd\x26\x54\x5e\x96\xe5\x5b\x87\x4b\xe9\x09"),
+        },
 };
 
 #define HASH_DATA_SIZE 64
 
 /* SHA1 and other hashes */
 static int test_digest(gnutls_digest_algorithm_t dig,
-               const struct hash_vectors_st *vectors,
-               size_t vectors_size)
+                      const struct hash_vectors_st *vectors,
+                      size_t vectors_size)
 {
        uint8_t data[HASH_DATA_SIZE];
        unsigned int i;
@@ -432,44 +482,41 @@ static int test_digest(gnutls_digest_algorithm_t dig,
        gnutls_hash_hd_t hd;
 
        for (i = 0; i < vectors_size; i++) {
-                       ret = gnutls_hash_init(&hd, dig);
-                       if (ret < 0) {
-                                       _gnutls_debug_log("error initializing: %s\n",
+               ret = gnutls_hash_init(&hd, dig);
+               if (ret < 0) {
+                       _gnutls_debug_log("error initializing: %s\n",
                                          gnutls_digest_get_name(dig));
-                               return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
-                       }
+                       return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
+               }
 
-                       ret = gnutls_hash(hd,
-                                         vectors[i].plaintext, 1);
-                       if (ret < 0)
-                               return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
+               ret = gnutls_hash(hd, vectors[i].plaintext, 1);
+               if (ret < 0)
+                       return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
 
-                       ret = gnutls_hash(hd,
-                                         &vectors[i].plaintext[1],
-                                         vectors[i].plaintext_size -
-                                         1);
-                       if (ret < 0)
-                               return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
+               ret = gnutls_hash(hd,
+                                 &vectors[i].plaintext[1],
+                                 vectors[i].plaintext_size - 1);
+               if (ret < 0)
+                       return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
 
-                       gnutls_hash_deinit(hd, data);
+               gnutls_hash_deinit(hd, data);
 
-                       data_size =
-                           gnutls_hash_get_len(dig);
-                       if (ret < 0)
-                               return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
+               data_size = gnutls_hash_get_len(dig);
+               if (ret < 0)
+                       return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
 
                if (data_size != vectors[i].output_size ||
                    memcmp(data, vectors[i].output,
                           vectors[i].output_size) != 0) {
 
                        _gnutls_debug_log("%s test vector %d failed!\n",
-                                       gnutls_digest_get_name(dig), i);
+                                         gnutls_digest_get_name(dig), i);
                        return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
                }
        }
 
-    _gnutls_debug_log ("%s self check was successful\n",
-                                gnutls_digest_get_name(dig));
+       _gnutls_debug_log("%s self check was successful\n",
+                         gnutls_digest_get_name(dig));
 
        return 0;
 }
@@ -486,55 +533,67 @@ struct mac_vectors_st {
 
 const struct mac_vectors_st hmac_md5_vectors[] = {
        {
-               STR(key, key_size, "Jefe"),
-               STR(plaintext, plaintext_size, "what do ya want for nothing?"),
-               STR(output, output_size, "\x75\x0c\x78\x3e\x6a\xb0\xb5\x03\xea\xa8\x6e\x31\x0a\x5d\xb7\x38"),
-       },
+        STR(key, key_size, "Jefe"),
+        STR(plaintext, plaintext_size, "what do ya want for nothing?"),
+        STR(output, output_size,
+            "\x75\x0c\x78\x3e\x6a\xb0\xb5\x03\xea\xa8\x6e\x31\x0a\x5d\xb7\x38"),
+        },
 };
 
 const struct mac_vectors_st hmac_sha1_vectors[] = {
        {
-               STR(key, key_size, "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"),
-               STR(plaintext, plaintext_size, "Hi There"),
-               STR(output, output_size, "\x67\x5b\x0b\x3a\x1b\x4d\xdf\x4e\x12\x48\x72\xda\x6c\x2f\x63\x2b\xfe\xd9\x57\xe9"),
-       },
+        STR(key, key_size,
+            "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"),
+        STR(plaintext, plaintext_size, "Hi There"),
+        STR(output, output_size,
+            "\x67\x5b\x0b\x3a\x1b\x4d\xdf\x4e\x12\x48\x72\xda\x6c\x2f\x63\x2b\xfe\xd9\x57\xe9"),
+        },
 };
+
            /* from rfc4231 */
 const struct mac_vectors_st hmac_sha224_vectors[] = {
        {
-               STR(key, key_size, "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"),
-               STR(plaintext, plaintext_size, "Hi There"),
-               STR(output, output_size, "\x89\x6f\xb1\x12\x8a\xbb\xdf\x19\x68\x32\x10\x7c\xd4\x9d\xf3\x3f\x47\xb4\xb1\x16\x99\x12\xba\x4f\x53\x68\x4b\x22"),
-       },
+        STR(key, key_size,
+            "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"),
+        STR(plaintext, plaintext_size, "Hi There"),
+        STR(output, output_size,
+            "\x89\x6f\xb1\x12\x8a\xbb\xdf\x19\x68\x32\x10\x7c\xd4\x9d\xf3\x3f\x47\xb4\xb1\x16\x99\x12\xba\x4f\x53\x68\x4b\x22"),
+        },
 };
 
 const struct mac_vectors_st hmac_sha256_vectors[] = {
        {
-               STR(key, key_size, "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"),
-               STR(plaintext, plaintext_size, "Hi There"),
-               STR(output, output_size, "\xb0\x34\x4c\x61\xd8\xdb\x38\x53\x5c\xa8\xaf\xce\xaf\x0b\xf1\x2b\x88\x1d\xc2\x00\xc9\x83\x3d\xa7\x26\xe9\x37\x6c\x2e\x32\xcf\xf7"),
-       },
+        STR(key, key_size,
+            "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"),
+        STR(plaintext, plaintext_size, "Hi There"),
+        STR(output, output_size,
+            "\xb0\x34\x4c\x61\xd8\xdb\x38\x53\x5c\xa8\xaf\xce\xaf\x0b\xf1\x2b\x88\x1d\xc2\x00\xc9\x83\x3d\xa7\x26\xe9\x37\x6c\x2e\x32\xcf\xf7"),
+        },
 };
 
 const struct mac_vectors_st hmac_sha384_vectors[] = {
        {
-               STR(key, key_size, "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"),
-               STR(plaintext, plaintext_size, "Hi There"),
-               STR(output, output_size, "\xaf\xd0\x39\x44\xd8\x48\x95\x62\x6b\x08\x25\xf4\xab\x46\x90\x7f\x15\xf9\xda\xdb\xe4\x10\x1e\xc6\x82\xaa\x03\x4c\x7c\xeb\xc5\x9c\xfa\xea\x9e\xa9\x07\x6e\xde\x7f\x4a\xf1\x52\xe8\xb2\xfa\x9c\xb6"),
-       },
+        STR(key, key_size,
+            "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"),
+        STR(plaintext, plaintext_size, "Hi There"),
+        STR(output, output_size,
+            "\xaf\xd0\x39\x44\xd8\x48\x95\x62\x6b\x08\x25\xf4\xab\x46\x90\x7f\x15\xf9\xda\xdb\xe4\x10\x1e\xc6\x82\xaa\x03\x4c\x7c\xeb\xc5\x9c\xfa\xea\x9e\xa9\x07\x6e\xde\x7f\x4a\xf1\x52\xe8\xb2\xfa\x9c\xb6"),
+        },
 };
 
 const struct mac_vectors_st hmac_sha512_vectors[] = {
        {
-               STR(key, key_size, "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"),
-           STR(plaintext, plaintext_size, "Hi There"),
-               STR(output, output_size, "\x87\xaa\x7c\xde\xa5\xef\x61\x9d\x4f\xf0\xb4\x24\x1a\x1d\x6c\xb0\x23\x79\xf4\xe2\xce\x4e\xc2\x78\x7a\xd0\xb3\x05\x45\xe1\x7c\xde\xda\xa8\x33\xb7\xd6\xb8\xa7\x02\x03\x8b\x27\x4e\xae\xa3\xf4\xe4\xbe\x9d\x91\x4e\xeb\x61\xf1\x70\x2e\x69\x6c\x20\x3a\x12\x68\x54"),
-       },
+        STR(key, key_size,
+            "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"),
+        STR(plaintext, plaintext_size, "Hi There"),
+        STR(output, output_size,
+            "\x87\xaa\x7c\xde\xa5\xef\x61\x9d\x4f\xf0\xb4\x24\x1a\x1d\x6c\xb0\x23\x79\xf4\xe2\xce\x4e\xc2\x78\x7a\xd0\xb3\x05\x45\xe1\x7c\xde\xda\xa8\x33\xb7\xd6\xb8\xa7\x02\x03\x8b\x27\x4e\xae\xa3\xf4\xe4\xbe\x9d\x91\x4e\xeb\x61\xf1\x70\x2e\x69\x6c\x20\x3a\x12\x68\x54"),
+        },
 };
 
 static int test_mac(gnutls_mac_algorithm_t mac,
-               const struct mac_vectors_st *vectors,
-               size_t vectors_size)
+                   const struct mac_vectors_st *vectors,
+                   size_t vectors_size)
 {
        uint8_t data[HASH_DATA_SIZE];
        unsigned int i;
@@ -543,47 +602,47 @@ static int test_mac(gnutls_mac_algorithm_t mac,
        gnutls_hmac_hd_t hd;
 
        for (i = 0; i < vectors_size; i++) {
-                       ret = gnutls_hmac_init(&hd,
-                                            mac, vectors[i].key, vectors[i].key_size);
+               ret = gnutls_hmac_init(&hd,
+                                      mac, vectors[i].key,
+                                      vectors[i].key_size);
 
-                       if (ret < 0) {
-                               _gnutls_debug_log("error initializing: MAC-%s\n",
+               if (ret < 0) {
+                       _gnutls_debug_log("error initializing: MAC-%s\n",
                                          gnutls_mac_get_name(mac));
-                               return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
-                       }
+                       return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
+               }
 
-                       ret = gnutls_hmac(hd,
-                                         vectors[i].plaintext, 1);
-                       if (ret < 0)
-                               return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
+               ret = gnutls_hmac(hd, vectors[i].plaintext, 1);
+               if (ret < 0)
+                       return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
 
-                       ret = gnutls_hmac(hd,
-                                         &vectors[i].plaintext[1],
-                                         vectors[i].plaintext_size - 1);
-                       if (ret < 0)
-                               return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
+               ret = gnutls_hmac(hd,
+                                 &vectors[i].plaintext[1],
+                                 vectors[i].plaintext_size - 1);
+               if (ret < 0)
+                       return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
 
-                       gnutls_hmac_deinit(hd, data);
+               gnutls_hmac_deinit(hd, data);
 
-                       data_size =
-                           gnutls_hmac_get_len(mac);
-                       if (ret < 0)
-                               return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
+               data_size = gnutls_hmac_get_len(mac);
+               if (ret < 0)
+                       return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
 
                if (data_size != vectors[i].output_size ||
                    memcmp(data, vectors[i].output,
                           vectors[i].output_size) != 0) {
 
-                       _gnutls_debug_log("MAC-%s test vector %d failed!\n",
-                               gnutls_mac_get_name(mac), i);
+                       _gnutls_debug_log
+                           ("MAC-%s test vector %d failed!\n",
+                            gnutls_mac_get_name(mac), i);
 
                        return gnutls_assert_val(GNUTLS_E_SELF_TEST_ERROR);
                }
        }
 
-    _gnutls_debug_log
-                           ("MAC-%s self check was successful\n",
-                                gnutls_mac_get_name(mac));
+       _gnutls_debug_log
+           ("MAC-%s self check was successful\n",
+            gnutls_mac_get_name(mac));
 
        return 0;
 }
@@ -607,22 +666,28 @@ static int test_mac(gnutls_mac_algorithm_t mac,
  **/
 int gnutls_cipher_self_test(unsigned all, gnutls_cipher_algorithm_t cipher)
 {
-int ret;
+       int ret;
 
        if (all != 0)
                cipher = GNUTLS_CIPHER_UNKNOWN;
 
        switch (cipher) {
-               case GNUTLS_CIPHER_UNKNOWN:
-               CASE(GNUTLS_CIPHER_AES_128_CBC, test_cipher, aes128_cbc_vectors);
-               CASE(GNUTLS_CIPHER_AES_192_CBC, test_cipher, aes192_cbc_vectors);
-               CASE(GNUTLS_CIPHER_AES_256_CBC, test_cipher, aes256_cbc_vectors);
-               CASE(GNUTLS_CIPHER_3DES_CBC, test_cipher, tdes_cbc_vectors);
-               CASE(GNUTLS_CIPHER_AES_128_GCM, test_cipher_aead, aes128_gcm_vectors);
-               CASE(GNUTLS_CIPHER_AES_256_GCM, test_cipher_aead, aes256_gcm_vectors);
-                       break;
-               default:
-                       return gnutls_assert_val(GNUTLS_E_NO_SELF_TEST);
+       case GNUTLS_CIPHER_UNKNOWN:
+               CASE(GNUTLS_CIPHER_AES_128_CBC, test_cipher,
+                    aes128_cbc_vectors);
+               CASE(GNUTLS_CIPHER_AES_192_CBC, test_cipher,
+                    aes192_cbc_vectors);
+               CASE(GNUTLS_CIPHER_AES_256_CBC, test_cipher,
+                    aes256_cbc_vectors);
+               CASE(GNUTLS_CIPHER_3DES_CBC, test_cipher,
+                    tdes_cbc_vectors);
+               CASE(GNUTLS_CIPHER_AES_128_GCM, test_cipher_aead,
+                    aes128_gcm_vectors);
+               CASE(GNUTLS_CIPHER_AES_256_GCM, test_cipher_aead,
+                    aes256_gcm_vectors);
+               break;
+       default:
+               return gnutls_assert_val(GNUTLS_E_NO_SELF_TEST);
        }
 
        return 0;
@@ -641,13 +706,13 @@ int ret;
  **/
 int gnutls_mac_self_test(unsigned all, gnutls_mac_algorithm_t mac)
 {
-int ret;
+       int ret;
 
        if (all != 0)
                mac = GNUTLS_MAC_UNKNOWN;
 
        switch (mac) {
-               case GNUTLS_MAC_UNKNOWN:
+       case GNUTLS_MAC_UNKNOWN:
                CASE(GNUTLS_MAC_MD5, test_mac, hmac_md5_vectors);
                CASE(GNUTLS_MAC_SHA1, test_mac, hmac_sha1_vectors);
                CASE(GNUTLS_MAC_SHA224, test_mac, hmac_sha224_vectors);
@@ -655,11 +720,11 @@ int ret;
                CASE(GNUTLS_MAC_SHA384, test_mac, hmac_sha384_vectors);
                CASE(GNUTLS_MAC_SHA512, test_mac, hmac_sha512_vectors);
 
-                       break;
-               default:
-                       return gnutls_assert_val(GNUTLS_E_NO_SELF_TEST);
+               break;
+       default:
+               return gnutls_assert_val(GNUTLS_E_NO_SELF_TEST);
        }
-       
+
        return 0;
 }
 
@@ -676,23 +741,23 @@ int ret;
  **/
 int gnutls_digest_self_test(unsigned all, gnutls_digest_algorithm_t digest)
 {
-int ret;
+       int ret;
 
        if (all != 0)
                digest = GNUTLS_DIG_UNKNOWN;
 
        switch (digest) {
-               case GNUTLS_DIG_UNKNOWN:
+       case GNUTLS_DIG_UNKNOWN:
                CASE(GNUTLS_DIG_MD5, test_digest, md5_vectors);
                CASE(GNUTLS_DIG_SHA1, test_digest, sha1_vectors);
                CASE(GNUTLS_DIG_SHA224, test_digest, sha224_vectors);
                CASE(GNUTLS_DIG_SHA256, test_digest, sha256_vectors);
                CASE(GNUTLS_DIG_SHA384, test_digest, sha384_vectors);
                CASE(GNUTLS_DIG_SHA512, test_digest, sha512_vectors);
-                       
-                       break;
-               default:
-                       return gnutls_assert_val(GNUTLS_E_NO_SELF_TEST);
+
+               break;
+       default:
+               return gnutls_assert_val(GNUTLS_E_NO_SELF_TEST);
        }
 
        return 0;
index 3c85a793ae23212259155d171f27ac7cfd19fc13..129a7b129b569b4aa4c5df30689f7b630a612012 100644 (file)
  * cpu instructions (AES-NI or padlock).
  */
 
-static void
-tls_log_func (int level, const char *str)
+static void tls_log_func(int level, const char *str)
 {
        fprintf(stderr, "<%d>| %s", level, str);
 }
 
 #ifndef ENABLE_SELF_CHECKS
-# include "../../lib/crypto-selftests.c"
-# include "../../lib/crypto-selftests-pk.c"
+#include "../../lib/crypto-selftests.c"
+#include "../../lib/crypto-selftests-pk.c"
 #endif
 
 int main(int argc, char **argv)
@@ -31,22 +30,22 @@ int main(int argc, char **argv)
 
        global_init();
 
-    /* ciphers */
-    if (gnutls_cipher_self_test(1, 0) < 0)
-        return 1;
+       /* ciphers */
+       if (gnutls_cipher_self_test(1, 0) < 0)
+               return 1;
 
-    /* message digests */        
-    if (gnutls_digest_self_test(1, 0) < 0)
-        return 1;
+       /* message digests */
+       if (gnutls_digest_self_test(1, 0) < 0)
+               return 1;
 
-    /* MAC */
-    if (gnutls_mac_self_test(1, 0) < 0)
-        return 1;
+       /* MAC */
+       if (gnutls_mac_self_test(1, 0) < 0)
+               return 1;
 
-    /* PK */
-    if (gnutls_pk_self_test(1, 0) < 0)
-        return 1;
+       /* PK */
+       if (gnutls_pk_self_test(1, 0) < 0)
+               return 1;
 
-    gnutls_global_deinit ();
-    return 0;
+       gnutls_global_deinit();
+       return 0;
 }