]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
lib-dcrypt: Reformatted test-crypto.c.
authorStephan Bosch <stephan.bosch@dovecot.fi>
Sat, 17 Feb 2018 20:43:06 +0000 (21:43 +0100)
committerVille Savolainen <ville.savolainen@dovecot.fi>
Mon, 16 Apr 2018 08:22:46 +0000 (11:22 +0300)
src/lib-dcrypt/test-crypto.c

index ed6160231139d6d9285d849a61a9a7373cceefbd..ce34085af495850079060caf9b18262d4f5eeee4 100644 (file)
 #include <sys/stat.h>
 #include <stdio.h>
 
-
-static
-void test_cipher_test_vectors(void)
+static void test_cipher_test_vectors(void)
 {
        static const struct {
                const char *key;
                const char *iv;
                const char *pt;
                const char *ct;
-       } vectors[] =
-       {
-               { "2b7e151628aed2a6abf7158809cf4f3c", "000102030405060708090a0b0c0d0e0f", "6bc1bee22e409f96e93d7e117393172a", "7649abac8119b246cee98e9b12e9197d" },
-               { "2b7e151628aed2a6abf7158809cf4f3c", "7649ABAC8119B246CEE98E9B12E9197D", "ae2d8a571e03ac9c9eb76fac45af8e51", "5086cb9b507219ee95db113a917678b2" }
+       } vectors[] = {
+               { 
+                       "2b7e151628aed2a6abf7158809cf4f3c",
+                       "000102030405060708090a0b0c0d0e0f",
+                       "6bc1bee22e409f96e93d7e117393172a",
+                       "7649abac8119b246cee98e9b12e9197d"
+               }, { 
+                       "2b7e151628aed2a6abf7158809cf4f3c",
+                       "7649ABAC8119B246CEE98E9B12E9197D",
+                       "ae2d8a571e03ac9c9eb76fac45af8e51",
+                       "5086cb9b507219ee95db113a917678b2"
+               }
        };
 
 
@@ -59,8 +65,10 @@ void test_cipher_test_vectors(void)
                hex_to_binary(vectors[i].pt, pt);
                hex_to_binary(vectors[i].ct, ct);
 
-               if (!dcrypt_ctx_sym_create("AES-128-CBC", DCRYPT_MODE_ENCRYPT, &ctx, NULL)) {
-                       test_assert_failed("dcrypt_ctx_sym_create", __FILE__, __LINE__-1);
+               if (!dcrypt_ctx_sym_create("AES-128-CBC", DCRYPT_MODE_ENCRYPT,
+                                          &ctx, NULL)) {
+                       test_assert_failed("dcrypt_ctx_sym_create", 
+                                          __FILE__, __LINE__-1);
                        continue;
                }
 
@@ -71,15 +79,18 @@ void test_cipher_test_vectors(void)
 
                test_assert_idx(dcrypt_ctx_sym_init(ctx, NULL), i);
 
-               test_assert_idx(dcrypt_ctx_sym_update(ctx, pt->data, pt->used, res_enc, NULL), i);
+               test_assert_idx(dcrypt_ctx_sym_update(ctx,
+                       pt->data, pt->used, res_enc, NULL), i);
                test_assert_idx(dcrypt_ctx_sym_final(ctx, res_enc, NULL), i);
 
                test_assert_idx(buffer_cmp(ct, res_enc), i);
 
                dcrypt_ctx_sym_destroy(&ctx);
 
-               if (!dcrypt_ctx_sym_create("AES-128-CBC", DCRYPT_MODE_DECRYPT, &ctx, NULL)) {
-                       test_assert_failed("dcrypt_ctx_sym_create", __FILE__, __LINE__-1);
+               if (!dcrypt_ctx_sym_create("AES-128-CBC", DCRYPT_MODE_DECRYPT,
+                                          &ctx, NULL)) {
+                       test_assert_failed("dcrypt_ctx_sym_create",
+                                          __FILE__, __LINE__-1);
                        continue;
                }
 
@@ -89,7 +100,8 @@ void test_cipher_test_vectors(void)
                dcrypt_ctx_sym_set_iv(ctx, iv->data, iv->used);
 
                test_assert_idx(dcrypt_ctx_sym_init(ctx, NULL), i);
-               test_assert_idx(dcrypt_ctx_sym_update(ctx, res_enc->data, res_enc->used, res_dec, NULL), i);
+               test_assert_idx(dcrypt_ctx_sym_update(ctx,
+                       res_enc->data, res_enc->used, res_dec, NULL), i);
                test_assert_idx(dcrypt_ctx_sym_final(ctx, res_dec, NULL), i);
 
                test_assert_idx(buffer_cmp(pt, res_dec), i);
@@ -100,16 +112,17 @@ void test_cipher_test_vectors(void)
        test_end();
 }
 
-static
-void test_cipher_aead_test_vectors(void)
+static void test_cipher_aead_test_vectors(void)
 {
        struct dcrypt_context_symmetric *ctx;
        const char *error = NULL;
 
        test_begin("test_cipher_aead_test_vectors");
 
-       if (!dcrypt_ctx_sym_create("aes-128-gcm", DCRYPT_MODE_ENCRYPT, &ctx, &error)) {
-               test_assert_failed("dcrypt_ctx_sym_create", __FILE__, __LINE__-1);
+       if (!dcrypt_ctx_sym_create("aes-128-gcm", DCRYPT_MODE_ENCRYPT,
+                                  &ctx, &error)) {
+               test_assert_failed("dcrypt_ctx_sym_create",
+                                  __FILE__, __LINE__-1);
                return;
        }
 
@@ -126,8 +139,14 @@ void test_cipher_aead_test_vectors(void)
 
        hex_to_binary("feffe9928665731c6d6a8f9467308308", key);
        hex_to_binary("cafebabefacedbaddecaf888", iv);
-       hex_to_binary("d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255", pt);
-       hex_to_binary("42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091473f5985", ct);
+       hex_to_binary("d9313225f88406e5a55909c5aff5269a"
+                     "86a7a9531534f7da2e4c303d8a318a72"
+                     "1c3c0c95956809532fcf0e2449a6b525"
+                     "b16aedf5aa0de657ba637b391aafd255", pt);
+       hex_to_binary("42831ec2217774244b7221b784d0d49c"
+                     "e3aa212f2c02a4e035c17e2329aca12e"
+                     "21d514b25466931c7d8f6a5aac84aa05"
+                     "1ba30b396a0aac973d58e091473f5985", ct);
        hex_to_binary("4d5c2af327cd64a62cf35abd2ba6fab4", tag);
 
        dcrypt_ctx_sym_set_key(ctx, key->data, key->used);
@@ -143,8 +162,10 @@ void test_cipher_aead_test_vectors(void)
 
        dcrypt_ctx_sym_destroy(&ctx);
 
-       if (!dcrypt_ctx_sym_create("aes-128-gcm", DCRYPT_MODE_DECRYPT, &ctx, &error)) {
-               test_assert_failed("dcrypt_ctx_sym_create", __FILE__, __LINE__-1);
+       if (!dcrypt_ctx_sym_create("aes-128-gcm", DCRYPT_MODE_DECRYPT,
+                                  &ctx, &error)) {
+               test_assert_failed("dcrypt_ctx_sym_create",
+                                  __FILE__, __LINE__-1);
        } else {
 
                buffer_set_used_size(res, 0);
@@ -154,7 +175,8 @@ void test_cipher_aead_test_vectors(void)
                dcrypt_ctx_sym_set_aad(ctx, aad->data, aad->used);
                dcrypt_ctx_sym_set_tag(ctx, tag->data, tag->used);
                test_assert(dcrypt_ctx_sym_init(ctx, &error));
-               test_assert(dcrypt_ctx_sym_update(ctx, ct->data, ct->used, res, &error));
+               test_assert(dcrypt_ctx_sym_update(ctx,
+                       ct->data, ct->used, res, &error));
                test_assert(dcrypt_ctx_sym_final(ctx, res, &error));
 
                test_assert(buffer_cmp(pt, res) == TRUE);
@@ -165,8 +187,7 @@ void test_cipher_aead_test_vectors(void)
        test_end();
 }
 
-static
-void test_hmac_test_vectors(void)
+static void test_hmac_test_vectors(void)
 {
        test_begin("test_hmac_test_vectors");
 
@@ -177,16 +198,20 @@ void test_hmac_test_vectors(void)
        res = t_buffer_create(32);
 
        hex_to_binary("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", key);
-       hex_to_binary("dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd", pt);
-       hex_to_binary("773ea91e36800e46854db8ebd09181a72959098b3ef8c122d9635514ced565fe", res);
+       hex_to_binary("dddddddddddddddddddddddddddddddddddddddddddddddddd"
+                     "dddddddddddddddddddddddddddddddddddddddddddddddddd", pt);
+       hex_to_binary("773ea91e36800e46854db8ebd09181a7"
+                     "2959098b3ef8c122d9635514ced565fe", res);
 
        struct dcrypt_context_hmac *hctx;
        if (!dcrypt_ctx_hmac_create("sha256", &hctx, NULL)) {
-               test_assert_failed("dcrypt_ctx_hmac_create", __FILE__, __LINE__-1);
+               test_assert_failed("dcrypt_ctx_hmac_create",
+                                  __FILE__, __LINE__-1);
        } else {
                dcrypt_ctx_hmac_set_key(hctx, key->data, key->used);
                test_assert(dcrypt_ctx_hmac_init(hctx, NULL));
-               test_assert(dcrypt_ctx_hmac_update(hctx, pt->data, pt->used, NULL));
+               test_assert(dcrypt_ctx_hmac_update(hctx,
+                       pt->data, pt->used, NULL));
                test_assert(dcrypt_ctx_hmac_final(hctx, ct, NULL));
                test_assert(buffer_cmp(ct, res));
                dcrypt_ctx_hmac_destroy(&hctx);
@@ -195,13 +220,21 @@ void test_hmac_test_vectors(void)
        test_end();
 }
 
-static
-void test_load_v1_keys(void)
+static void test_load_v1_keys(void)
 {
        test_begin("test_load_v1_keys");
 
        const char *error = NULL;
-       const char *data1 = "1\t716\t1\t0567e6bf9579813ae967314423b0fceb14bda24749303923de9a9bb9370e0026f995901a57e63113eeb2baf0c940e978d00686cbb52bd5014bc318563375876255\t0300E46DA2125427BE968EB3B649910CDC4C405E5FFDE18D433A97CABFEE28CEEFAE9EE356C792004FFB80981D67E741B8CC036A34235A8D2E1F98D1658CFC963D07EB\td0cfaca5d335f9edc41c84bb47465184cb0e2ec3931bebfcea4dd433615e77a0\t7c9a1039ea2e4fed73e81dd3ffc3fa22ea4a28352939adde7bf8ea858b00fa4f";
+       const char *data1 = 
+               "1\t716\t1\t0567e6bf9579813ae967314423b0fceb14bda24"
+               "749303923de9a9bb9370e0026f995901a57e63113eeb2baf0c"
+               "940e978d00686cbb52bd5014bc318563375876255\t0300E46"
+               "DA2125427BE968EB3B649910CDC4C405E5FFDE18D433A97CAB"
+               "FEE28CEEFAE9EE356C792004FFB80981D67E741B8CC036A342"
+               "35A8D2E1F98D1658CFC963D07EB\td0cfaca5d335f9edc41c8"
+               "4bb47465184cb0e2ec3931bebfcea4dd433615e77a0\t7c9a1"
+               "039ea2e4fed73e81dd3ffc3fa22ea4a28352939adde7bf8ea8"
+               "58b00fa4f";
 
        enum dcrypt_key_format format;
        enum dcrypt_key_version version;
@@ -220,10 +253,19 @@ void test_load_v1_keys(void)
        test_assert(version == DCRYPT_KEY_VERSION_1);
        test_assert(kind == DCRYPT_KEY_KIND_PRIVATE);
        test_assert(encryption_type == DCRYPT_KEY_ENCRYPTION_TYPE_KEY);
-       test_assert(strcmp(encryption_key_hash, "d0cfaca5d335f9edc41c84bb47465184cb0e2ec3931bebfcea4dd433615e77a0") == 0);
-       test_assert(strcmp(key_hash, "7c9a1039ea2e4fed73e81dd3ffc3fa22ea4a28352939adde7bf8ea858b00fa4f") == 0);
-
-       const char* data2 = "1\t716\t0301EB00973C4EFC8FCECA4EA33E941F50B561199A5159BCB6C2EED9DD1D62D65E38A254979D89E28F0C28883E71EE2AD264CD16B863FA094A8F6F69A56B62E8918040\t7c9a1039ea2e4fed73e81dd3ffc3fa22ea4a28352939adde7bf8ea858b00fa4f";
+       test_assert(strcmp(encryption_key_hash,
+               "d0cfaca5d335f9edc41c84bb47465184"
+               "cb0e2ec3931bebfcea4dd433615e77a0") == 0);
+       test_assert(strcmp(key_hash,
+               "7c9a1039ea2e4fed73e81dd3ffc3fa22"
+               "ea4a28352939adde7bf8ea858b00fa4f") == 0);
+
+       const char* data2 = 
+               "1\t716\t0301EB00973C4EFC8FCECA4EA33E941F50B561199A"
+               "5159BCB6C2EED9DD1D62D65E38A254979D89E28F0C28883E71"
+               "EE2AD264CD16B863FA094A8F6F69A56B62E8918040\t7c9a10"
+               "39ea2e4fed73e81dd3ffc3fa22ea4a28352939adde7bf8ea85"
+               "8b00fa4f";
 
        error = NULL;
        encryption_key_hash = NULL;
@@ -240,10 +282,17 @@ void test_load_v1_keys(void)
        test_assert(kind == DCRYPT_KEY_KIND_PUBLIC);
        test_assert(encryption_type == DCRYPT_KEY_ENCRYPTION_TYPE_NONE);
        test_assert(encryption_key_hash == NULL);
-       test_assert(strcmp(key_hash, "7c9a1039ea2e4fed73e81dd3ffc3fa22ea4a28352939adde7bf8ea858b00fa4f") == 0);
+       test_assert(strcmp(key_hash,
+               "7c9a1039ea2e4fed73e81dd3ffc3fa22"
+               "ea4a28352939adde7bf8ea858b00fa4f") == 0);
 
        /* This is the key that should be able to decrypt key1 */
-       const char *data3 = "1\t716\t0\t048FD04FD3612B22D32790C592CF21CEF417EFD2EA34AE5F688FA5B51BED29E05A308B68DA78E16E90B47A11E133BD9A208A2894FD01B0BEE865CE339EA3FB17AC\td0cfaca5d335f9edc41c84bb47465184cb0e2ec3931bebfcea4dd433615e77a0";
+       const char *data3 =
+               "1\t716\t0\t048FD04FD3612B22D32790C592CF21CEF417EFD"
+               "2EA34AE5F688FA5B51BED29E05A308B68DA78E16E90B47A11E"
+               "133BD9A208A2894FD01B0BEE865CE339EA3FB17AC\td0cfaca"
+               "5d335f9edc41c84bb47465184cb0e2ec3931bebfcea4dd4336"
+               "15e77a0";
 
        error = NULL;
        encryption_key_hash = NULL;
@@ -259,7 +308,9 @@ void test_load_v1_keys(void)
        test_assert(kind == DCRYPT_KEY_KIND_PRIVATE);
        test_assert(encryption_type == DCRYPT_KEY_ENCRYPTION_TYPE_NONE);
        test_assert(encryption_key_hash == NULL);
-       test_assert(strcmp(key_hash, "d0cfaca5d335f9edc41c84bb47465184cb0e2ec3931bebfcea4dd433615e77a0") == 0);
+       test_assert(strcmp(key_hash,
+               "d0cfaca5d335f9edc41c84bb47465184"
+               "cb0e2ec3931bebfcea4dd433615e77a0") == 0);
 
        /* key3's key_hash should and does match key1's encryption_key_hash */
        struct dcrypt_private_key *pkey = NULL;
@@ -281,8 +332,7 @@ void test_load_v1_keys(void)
        test_end();
 }
 
-static
-void test_load_v1_key(void)
+static void test_load_v1_key(void)
 {
        test_begin("test_load_v1_key");
 
@@ -291,30 +341,54 @@ void test_load_v1_key(void)
        struct dcrypt_private_key *pkey = NULL, *pkey2 = NULL;
        const char *error = NULL;
 
-       test_assert(dcrypt_key_load_private(&pkey, "1\t716\t0\t048FD04FD3612B22D32790C592CF21CEF417EFD2EA34AE5F688FA5B51BED29E05A308B68DA78E16E90B47A11E133BD9A208A2894FD01B0BEE865CE339EA3FB17AC\td0cfaca5d335f9edc41c84bb47465184cb0e2ec3931bebfcea4dd433615e77a0", NULL, NULL, &error));
+       test_assert(dcrypt_key_load_private(&pkey, 
+               "1\t716\t0\t048FD04FD3612B22D32790C592CF21CEF417EFD"
+               "2EA34AE5F688FA5B51BED29E05A308B68DA78E16E90B47A11E"
+               "133BD9A208A2894FD01B0BEE865CE339EA3FB17AC\td0cfaca"
+               "5d335f9edc41c84bb47465184cb0e2ec3931bebfcea4dd4336"
+               "15e77a0", NULL, NULL, &error));
        if (pkey != NULL) {
                buffer_set_used_size(key_1, 0);
                /* check that key_id matches */
                struct dcrypt_public_key *pubkey = NULL;
                dcrypt_key_convert_private_to_public(pkey, &pubkey);
-               test_assert(dcrypt_key_store_public(pubkey, DCRYPT_FORMAT_DOVECOT, key_1, NULL));
+               test_assert(dcrypt_key_store_public(pubkey,
+                           DCRYPT_FORMAT_DOVECOT, key_1, NULL));
                buffer_set_used_size(key_1, 0);
                dcrypt_key_id_public(pubkey, "sha256", key_1, &error);
-               test_assert(strcmp("792caad4d38c9eb2134a0cbc844eae386116de096a0ccafc98479825fc99b6a1", binary_to_hex(key_1->data, key_1->used)) == 0);
+               test_assert(strcmp("792caad4d38c9eb2134a0cbc844eae38"
+                                  "6116de096a0ccafc98479825fc99b6a1",
+                                  binary_to_hex(key_1->data, key_1->used))
+                               == 0);
 
                dcrypt_key_unref_public(&pubkey);
                pkey2 = NULL;
 
-               test_assert(dcrypt_key_load_private(&pkey2, "1\t716\t1\t0567e6bf9579813ae967314423b0fceb14bda24749303923de9a9bb9370e0026f995901a57e63113eeb2baf0c940e978d00686cbb52bd5014bc318563375876255\t0300E46DA2125427BE968EB3B649910CDC4C405E5FFDE18D433A97CABFEE28CEEFAE9EE356C792004FFB80981D67E741B8CC036A34235A8D2E1F98D1658CFC963D07EB\td0cfaca5d335f9edc41c84bb47465184cb0e2ec3931bebfcea4dd433615e77a0\t7c9a1039ea2e4fed73e81dd3ffc3fa22ea4a28352939adde7bf8ea858b00fa4f", NULL, pkey, &error));
+               test_assert(dcrypt_key_load_private(&pkey2,
+                       "1\t716\t1\t0567e6bf9579813ae967314423b0fceb14"
+                       "bda24749303923de9a9bb9370e0026f995901a57e6311"
+                       "3eeb2baf0c940e978d00686cbb52bd5014bc318563375"
+                       "876255\t0300E46DA2125427BE968EB3B649910CDC4C4"
+                       "05E5FFDE18D433A97CABFEE28CEEFAE9EE356C792004F"
+                       "FB80981D67E741B8CC036A34235A8D2E1F98D1658CFC9"
+                       "63D07EB\td0cfaca5d335f9edc41c84bb47465184cb0e"
+                       "2ec3931bebfcea4dd433615e77a0\t7c9a1039ea2e4fe"
+                       "d73e81dd3ffc3fa22ea4a28352939adde7bf8ea858b00"
+                       "fa4f", NULL, pkey, &error));
                if (pkey2 != NULL) {
                        buffer_set_used_size(key_1, 0);
                        /* check that key_id matches */
                        struct dcrypt_public_key *pubkey = NULL;
                        dcrypt_key_convert_private_to_public(pkey2, &pubkey);
-                       test_assert(dcrypt_key_store_public(pubkey, DCRYPT_FORMAT_DOVECOT, key_1, NULL));
+                       test_assert(dcrypt_key_store_public(pubkey,
+                               DCRYPT_FORMAT_DOVECOT, key_1, NULL));
                        buffer_set_used_size(key_1, 0);
-                       test_assert(dcrypt_key_id_public_old(pubkey, key_1, &error));
-                       test_assert(strcmp("7c9a1039ea2e4fed73e81dd3ffc3fa22ea4a28352939adde7bf8ea858b00fa4f", binary_to_hex(key_1->data, key_1->used)) == 0);
+                       test_assert(dcrypt_key_id_public_old(pubkey,
+                               key_1, &error));
+                       test_assert(strcmp(
+                               "7c9a1039ea2e4fed73e81dd3ffc3fa22"
+                               "ea4a28352939adde7bf8ea858b00fa4f",
+                               binary_to_hex(key_1->data, key_1->used)) == 0);
 
                        dcrypt_key_unref_public(&pubkey);
                        dcrypt_key_unref_private(&pkey2);
@@ -325,12 +399,16 @@ void test_load_v1_key(void)
        test_end();
 }
 
-static
-void test_load_v1_public_key(void)
+static void test_load_v1_public_key(void)
 {
        test_begin("test_load_v1_public_key");
 
-       const char* data1 = "1\t716\t030131D8A5FD5167947A0AE9CB112ADED6526654635AA5887051EE2364414B60FF32EBA8FA0BBE9485DBDE8794BBBCB44BBFC0D662A4287A848BA570D4E5E45A11FE0F\td0cfaca5d335f9edc41c84bb47465184cb0e2ec3931bebfcea4dd433615e77a0";
+       const char* data1 =
+               "1\t716\t030131D8A5FD5167947A0AE9CB112ADED652665463"
+               "5AA5887051EE2364414B60FF32EBA8FA0BBE9485DBDE8794BB"
+               "BCB44BBFC0D662A4287A848BA570D4E5E45A11FE0F\td0cfac"
+               "a5d335f9edc41c84bb47465184cb0e2ec3931bebfcea4dd433"
+               "615e77a0";
 
        const char* error = NULL;
        const char* key_hash = NULL;
@@ -351,7 +429,9 @@ void test_load_v1_public_key(void)
        test_assert(version == DCRYPT_KEY_VERSION_1);
        test_assert(kind == DCRYPT_KEY_KIND_PUBLIC);
        test_assert(encryption_type == DCRYPT_KEY_ENCRYPTION_TYPE_NONE);
-       test_assert(key_hash != NULL && strcmp(key_hash, "d0cfaca5d335f9edc41c84bb47465184cb0e2ec3931bebfcea4dd433615e77a0") == 0);
+       test_assert(key_hash != NULL &&
+               strcmp(key_hash, "d0cfaca5d335f9edc41c84bb47465184"
+                                "cb0e2ec3931bebfcea4dd433615e77a0") == 0);
        test_assert(encryption_key_hash == NULL);
 
        struct dcrypt_public_key *pub_key = NULL;
@@ -367,18 +447,32 @@ void test_load_v1_public_key(void)
        test_end();
 }
 
-static
-void test_load_v2_key(void)
+static void test_load_v2_key(void)
 {
        const char *keys[] = {
-               "-----BEGIN PRIVATE KEY-----\n" \
-"MGcCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQcETTBLAgEBBCC25AkD65uhlZXCAdwN\n" \
-"yLJV2ui8A/CUyqyEMrezvwgMO6EkAyIAAybRUR3MsH0+0PQcDwkrXOJ9aePwzTQV\n" \
-"DN51+n1JCxbI\n" \
-"-----END PRIVATE KEY-----\n",
-               "2:1.2.840.10045.3.1.7:0:0000002100b6e40903eb9ba19595c201dc0dc8b255dae8bc03f094caac8432b7b3bf080c3b:ab13d251976dedab546b67354e7678821740dd534b749c2857f66bf62bbaddfd",
-               "2:1.2.840.10045.3.1.7:2:aes-256-ctr:483bd74fd3d91763:sha256:2048:d44ae35d3af7a2febcb15cde0c3693e7ed98595665ed655a97fa918d346d5c661a6e2339f4:ab13d251976dedab546b67354e7678821740dd534b749c2857f66bf62bbaddfd",
-               "2:1.2.840.10045.3.1.7:1:aes-256-ctr:2574c10be28a4c09:sha256:2048:a750ec9dea91999f108f943485a20f273f40f75c37fc9bcccdedda514c8243e550d69ce1bd:02237a199d7d945aa6492275a02881071eceec5749caf2485da8c64fb601229098:ab13d251976dedab546b67354e7678821740dd534b749c2857f66bf62bbaddfd:ab13d251976dedab546b67354e7678821740dd534b749c2857f66bf62bbaddfd"
+               "-----BEGIN PRIVATE KEY-----\n"
+               "MGcCAQAwEwYHKoZIzj0CAQYIKoZIzj0D"
+                       "AQcETTBLAgEBBCC25AkD65uhlZXCAdwN\n"
+               "yLJV2ui8A/CUyqyEMrezvwgMO6EkAyIA"
+                       "AybRUR3MsH0+0PQcDwkrXOJ9aePwzTQV\n"
+               "DN51+n1JCxbI\n"
+               "-----END PRIVATE KEY-----\n",
+               "2:1.2.840.10045.3.1.7:0:0000002100b6e40903eb9ba195"
+               "95c201dc0dc8b255dae8bc03f094caac8432b7b3bf080c3b:a"
+               "b13d251976dedab546b67354e7678821740dd534b749c2857f"
+               "66bf62bbaddfd",
+               "2:1.2.840.10045.3.1.7:2:aes-256-ctr:483bd74fd3d917"
+               "63:sha256:2048:d44ae35d3af7a2febcb15cde0c3693e7ed9"
+               "8595665ed655a97fa918d346d5c661a6e2339f4:ab13d25197"
+               "6dedab546b67354e7678821740dd534b749c2857f66bf62bba"
+               "ddfd",
+               "2:1.2.840.10045.3.1.7:1:aes-256-ctr:2574c10be28a4c"
+               "09:sha256:2048:a750ec9dea91999f108f943485a20f273f4"
+               "0f75c37fc9bcccdedda514c8243e550d69ce1bd:02237a199d"
+               "7d945aa6492275a02881071eceec5749caf2485da8c64fb601"
+               "229098:ab13d251976dedab546b67354e7678821740dd534b7"
+               "49c2857f66bf62bbaddfd:ab13d251976dedab546b67354e76"
+               "78821740dd534b749c2857f66bf62bbaddfd"
        };
 
        test_begin("test_load_v2_key");
@@ -387,26 +481,36 @@ void test_load_v2_key(void)
 
        struct dcrypt_private_key *priv,*priv2;
 
-       test_assert_idx(dcrypt_key_load_private(&priv2, keys[0], NULL, NULL, &error), 0);
-       test_assert_idx(dcrypt_key_store_private(priv2, DCRYPT_FORMAT_PEM, NULL, tmp, NULL, NULL, &error), 0);
+       test_assert_idx(dcrypt_key_load_private(&priv2,
+               keys[0], NULL, NULL, &error), 0);
+       test_assert_idx(dcrypt_key_store_private(priv2,
+               DCRYPT_FORMAT_PEM, NULL, tmp, NULL, NULL, &error), 0);
        test_assert_idx(strcmp(str_c(tmp), keys[0])==0, 0);
        buffer_set_used_size(tmp, 0);
 
-       test_assert_idx(dcrypt_key_load_private(&priv, keys[1], NULL, NULL, &error), 1);
-       test_assert_idx(dcrypt_key_store_private(priv, DCRYPT_FORMAT_DOVECOT, NULL, tmp, NULL, NULL, &error), 1);
+       test_assert_idx(dcrypt_key_load_private(&priv,
+               keys[1], NULL, NULL, &error), 1);
+       test_assert_idx(dcrypt_key_store_private(priv,
+               DCRYPT_FORMAT_DOVECOT, NULL, tmp, NULL, NULL, &error), 1);
        test_assert_idx(strcmp(str_c(tmp), keys[1])==0, 1);
        buffer_set_used_size(tmp, 0);
        dcrypt_key_unref_private(&priv);
 
-       test_assert_idx(dcrypt_key_load_private(&priv, keys[2], "This Is Sparta", NULL, &error), 2);
-       test_assert_idx(dcrypt_key_store_private(priv, DCRYPT_FORMAT_DOVECOT, "aes-256-ctr", tmp, "This Is Sparta", NULL, &error), 2);
+       test_assert_idx(dcrypt_key_load_private(&priv,
+               keys[2], "This Is Sparta", NULL, &error), 2);
+       test_assert_idx(dcrypt_key_store_private(priv,
+               DCRYPT_FORMAT_DOVECOT, "aes-256-ctr", tmp,
+               "This Is Sparta", NULL, &error), 2);
        buffer_set_used_size(tmp, 0);
        dcrypt_key_unref_private(&priv);
 
        struct dcrypt_public_key *pub = NULL;
        dcrypt_key_convert_private_to_public(priv2, &pub);
-       test_assert_idx(dcrypt_key_load_private(&priv, keys[3], NULL, priv2, &error), 3);
-       test_assert_idx(dcrypt_key_store_private(priv, DCRYPT_FORMAT_DOVECOT, "ecdh-aes-256-ctr", tmp, NULL, pub, &error), 3);
+       test_assert_idx(dcrypt_key_load_private(&priv,
+               keys[3], NULL, priv2, &error), 3);
+       test_assert_idx(dcrypt_key_store_private(priv,
+               DCRYPT_FORMAT_DOVECOT, "ecdh-aes-256-ctr", tmp,
+               NULL, pub, &error), 3);
        buffer_set_used_size(tmp, 0);
        dcrypt_key_unref_private(&priv2);
        dcrypt_key_unref_private(&priv);
@@ -419,21 +523,27 @@ void test_load_v2_key(void)
        test_end();
 }
 
-static
-void test_load_v2_public_key(void)
+static void test_load_v2_public_key(void)
 {
        struct dcrypt_public_key *pub = NULL;
        const char *error;
 
        test_begin("test_load_v2_public_key");
-       const char *key = "2:3058301006072a8648ce3d020106052b810400230344000301c50954e734dd8b410a607764a7057065a45510da52f2c6e28e0cb353b9c389fa8cb786943ae991fce9befed78fb162fbbc615415f06af06c8cc80c37f4e94ff6c7:185a7212542782e239111f9c19d126ad55b18ddaf4883d66afe8d9627c3607d8";
+       const char *key =
+               "2:3058301006072a8648ce3d020106052b810400230344000"
+               "301c50954e734dd8b410a607764a7057065a45510da52f2c6"
+               "e28e0cb353b9c389fa8cb786943ae991fce9befed78fb162f"
+               "bbc615415f06af06c8cc80c37f4e94ff6c7:185a721254278"
+               "2e239111f9c19d126ad55b18ddaf4883d66afe8d9627c3607"
+               "d8";
 
        test_assert(dcrypt_key_load_public(&pub, key, &error));
 
        buffer_t *tmp = buffer_create_dynamic(default_pool, 256);
 
        if (pub != NULL) {
-               test_assert(dcrypt_key_store_public(pub, DCRYPT_FORMAT_DOVECOT, tmp, &error));
+               test_assert(dcrypt_key_store_public(pub,
+                       DCRYPT_FORMAT_DOVECOT, tmp, &error));
                test_assert(strcmp(key, str_c(tmp))==0);
                buffer_free(&tmp);
                dcrypt_key_unref_public(&pub);
@@ -442,11 +552,17 @@ void test_load_v2_public_key(void)
        test_end();
 }
 
-static
-void test_get_info_v2_key(void) {
+static void test_get_info_v2_key(void)
+{
        test_begin("test_get_info_v2_key");
 
-       const char *key = "2:305e301006072a8648ce3d020106052b81040026034a000203fcc90034fa03d6fb79a0fc8b3b43c3398f68e76029307360cdcb9e27bb7e84b3c19dfb7244763bc4d442d216f09b7b7945ed9d182f3156550e9ee30b237a0217dbf79d28975f31:86706b69d1f640011a65d26a42f2ba20a619173644e1cc7475eb1d90966e84dc";
+       const char *key =
+               "2:305e301006072a8648ce3d020106052b81040026034a0002"
+               "03fcc90034fa03d6fb79a0fc8b3b43c3398f68e76029307360"
+               "cdcb9e27bb7e84b3c19dfb7244763bc4d442d216f09b7b7945"
+               "ed9d182f3156550e9ee30b237a0217dbf79d28975f31:86706"
+               "b69d1f640011a65d26a42f2ba20a619173644e1cc7475eb1d9"
+               "0966e84dc";
        enum dcrypt_key_format format;
        enum dcrypt_key_version version = DCRYPT_KEY_VERSION_NA;
        enum dcrypt_key_kind kind;
@@ -466,13 +582,13 @@ void test_get_info_v2_key(void) {
        test_assert(encryption_type == DCRYPT_KEY_ENCRYPTION_TYPE_NONE);
        test_assert(encryption_key_hash == NULL);
        test_assert(key_hash != NULL && strcmp(key_hash,
-               "86706b69d1f640011a65d26a42f2ba20a619173644e1cc7475eb1d90966e84dc") == 0);
+               "86706b69d1f640011a65d26a42f2ba20"
+               "a619173644e1cc7475eb1d90966e84dc") == 0);
 
        test_end();
 }
 
-static
-void test_gen_and_get_info_rsa_pem(void)
+static void test_gen_and_get_info_rsa_pem(void)
 {
        test_begin("test_gen_and_get_info_rsa_pem");
 
@@ -535,8 +651,7 @@ void test_gen_and_get_info_rsa_pem(void)
        test_end();
 }
 
-static
-void test_get_info_rsa_private_key(void)
+static void test_get_info_rsa_private_key(void)
 {
        test_begin("test_get_info_rsa_private_key");
 
@@ -565,18 +680,29 @@ void test_get_info_rsa_private_key(void)
        test_end();
 }
 
-static
-void test_get_info_invalid_keys(void) {
+static void test_get_info_invalid_keys(void)
+{
        test_begin("test_get_info_invalid_keys");
 
-       const char *key = "1:716:030131D8A5FD5167947A0AE9CB112ADED6526654635AA5887051EE2364414B60FF32EBA8FA0BBE9485DBDE8794BBBCB44BBFC0D662A4287A848BA570D4E5E45A11FE0F:d0cfaca5d335f9edc41c84bb47465184cb0e2ec3931bebfcea4dd433615e77a0";
+       const char *key =
+               "1:716:030131D8A5FD5167947A0AE9CB112ADED6526654635A"
+               "A5887051EE2364414B60FF32EBA8FA0BBE9485DBDE8794BBBC"
+               "B44BBFC0D662A4287A848BA570D4E5E45A11FE0F:d0cfaca5d"
+               "335f9edc41c84bb47465184cb0e2ec3931bebfcea4dd433615"
+               "e77a0";
        const char *error = NULL;
 
        test_assert(dcrypt_key_string_get_info(key, NULL, NULL,
                        NULL, NULL, NULL, NULL, &error) == FALSE);
        test_assert(error != NULL && strstr(error, "tab") != NULL);
 
-       key = "2\t305e301006072a8648ce3d020106052b81040026034a000203fcc90034fa03d6fb79a0fc8b3b43c3398f68e76029307360cdcb9e27bb7e84b3c19dfb7244763bc4d442d216f09b7b7945ed9d182f3156550e9ee30b237a0217dbf79d28975f31\t86706b69d1f640011a65d26a42f2ba20a619173644e1cc7475eb1d90966e84dc";
+       key =
+               "2\t305e301006072a8648ce3d020106052b81040026034a000"
+               "203fcc90034fa03d6fb79a0fc8b3b43c3398f68e7602930736"
+               "0cdcb9e27bb7e84b3c19dfb7244763bc4d442d216f09b7b794"
+               "5ed9d182f3156550e9ee30b237a0217dbf79d28975f31\t867"
+               "06b69d1f640011a65d26a42f2ba20a619173644e1cc7475eb1"
+               "d90966e84dc";
        error = NULL;
 
        test_assert(dcrypt_key_string_get_info(key, NULL, NULL,
@@ -593,21 +719,25 @@ void test_get_info_invalid_keys(void) {
        test_end();
 }
 
-static
-void test_get_info_key_encrypted(void) {
+static void test_get_info_key_encrypted(void)
+{
        test_begin("test_get_info_key_encrypted");
 
        struct dcrypt_keypair p1, p2;
        const char *error = NULL;
-       bool ret = dcrypt_keypair_generate(&p1, DCRYPT_KEY_EC, 0, "secp521r1", &error);
+       bool ret = dcrypt_keypair_generate(&p1,
+               DCRYPT_KEY_EC, 0, "secp521r1", &error);
        test_assert(ret == TRUE);
-       ret = dcrypt_keypair_generate(&p2, DCRYPT_KEY_EC, 0, "secp521r1", &error);
+       ret = dcrypt_keypair_generate(&p2,
+               DCRYPT_KEY_EC, 0, "secp521r1", &error);
        test_assert(ret == TRUE);
 
        string_t* buf = t_str_new(4096);
 
        buffer_set_used_size(buf, 0);
-       ret = dcrypt_key_store_private(p1.priv, DCRYPT_FORMAT_DOVECOT, "ecdh-aes-256-ctr", buf, NULL, p2.pub, &error);
+       ret = dcrypt_key_store_private(p1.priv,
+               DCRYPT_FORMAT_DOVECOT, "ecdh-aes-256-ctr", buf,
+               NULL, p2.pub, &error);
        test_assert(ret == TRUE);
 
        enum dcrypt_key_format format;
@@ -633,18 +763,20 @@ void test_get_info_key_encrypted(void) {
        test_end();
 }
 
-static
-void test_get_info_pw_encrypted(void) {
+static void test_get_info_pw_encrypted(void)
+{
        test_begin("test_get_info_pw_encrypted");
 
        struct dcrypt_keypair p1;
        i_zero(&p1);
        const char *error;
-       bool ret = dcrypt_keypair_generate(&p1, DCRYPT_KEY_EC, 0, "secp521r1", &error);
+       bool ret = dcrypt_keypair_generate(&p1,
+               DCRYPT_KEY_EC, 0, "secp521r1", &error);
        test_assert(ret == TRUE);
 
        string_t* buf = t_str_new(4096);
-       ret = dcrypt_key_store_private(p1.priv, DCRYPT_FORMAT_DOVECOT, "aes-256-ctr", buf, "pw", NULL, &error);
+       ret = dcrypt_key_store_private(p1.priv,
+               DCRYPT_FORMAT_DOVECOT, "aes-256-ctr", buf, "pw", NULL, &error);
        test_assert(ret == TRUE);
 
        enum dcrypt_key_format format;
@@ -669,19 +801,21 @@ void test_get_info_pw_encrypted(void) {
        test_end();
 }
 
-static
-void test_password_change(void) {
+static void test_password_change(void)
+{
        test_begin("test_password_change");
 
        const char *pw1 = "first password";
        struct dcrypt_keypair orig;
        const char *error = NULL;
 
-       bool ret = dcrypt_keypair_generate(&orig, DCRYPT_KEY_EC, 0, "secp521r1", &error);
+       bool ret = dcrypt_keypair_generate(&orig,
+               DCRYPT_KEY_EC, 0, "secp521r1", &error);
        test_assert(ret == TRUE);
 
        string_t *buf = t_str_new(4096);
-       ret = dcrypt_key_store_private(orig.priv, DCRYPT_FORMAT_DOVECOT, "aes-256-ctr", buf, pw1, NULL, &error);
+       ret = dcrypt_key_store_private(orig.priv,
+               DCRYPT_FORMAT_DOVECOT, "aes-256-ctr", buf, pw1, NULL, &error);
        test_assert(ret == TRUE);
 
        /* load the pw-encrypted key */
@@ -691,13 +825,16 @@ void test_password_change(void) {
 
        /* encrypt a key with the pw-encrypted key k1 */
        struct dcrypt_keypair k2;
-       ret = dcrypt_keypair_generate(&k2, DCRYPT_KEY_EC, 0, "secp521r1", &error);
+       ret = dcrypt_keypair_generate(&k2,
+               DCRYPT_KEY_EC, 0, "secp521r1", &error);
        test_assert(ret == TRUE);
 
        string_t *buf2 = t_str_new(4096);
        struct dcrypt_public_key *k1_pub = NULL;
        dcrypt_key_convert_private_to_public(k1_priv, &k1_pub);
-       ret = dcrypt_key_store_private(k2.priv, DCRYPT_FORMAT_DOVECOT, "ecdh-aes-256-ctr", buf2, NULL, k1_pub, &error);
+       ret = dcrypt_key_store_private(k2.priv,
+               DCRYPT_FORMAT_DOVECOT, "ecdh-aes-256-ctr", buf2,
+               NULL, k1_pub, &error);
        test_assert(ret == TRUE);
 
        /* change the password */
@@ -705,7 +842,8 @@ void test_password_change(void) {
        string_t *buf3 = t_str_new(4096);
 
        /* encrypt k1 with pw2 */
-       ret = dcrypt_key_store_private(k1_priv, DCRYPT_FORMAT_DOVECOT, "aes-256-ctr", buf3, pw2, NULL, &error);
+       ret = dcrypt_key_store_private(k1_priv,
+               DCRYPT_FORMAT_DOVECOT, "aes-256-ctr", buf3, pw2, NULL, &error);
        test_assert(ret == TRUE);
 
        /* load the pw2 encrypted key */
@@ -715,7 +853,8 @@ void test_password_change(void) {
 
        /* load the key that was encrypted with pw1 using the pw2 encrypted key */
        struct dcrypt_private_key *k3_priv = NULL;
-       ret = dcrypt_key_load_private(&k3_priv, str_c(buf2), NULL, k2_priv, &error);
+       ret = dcrypt_key_load_private(&k3_priv,
+               str_c(buf2), NULL, k2_priv, &error);
        test_assert(ret == TRUE);
 
        dcrypt_key_unref_private(&k1_priv);
@@ -728,12 +867,17 @@ void test_password_change(void) {
        test_end();
 }
 
-static
-void test_load_invalid_keys(void) {
+static void test_load_invalid_keys(void)
+{
        test_begin("test_load_invalid_keys");
 
        const char *error = NULL;
-       const char *key = "1:716:0301EB00973C4EFC8FCECA4EA33E941F50B561199A5159BCB6C2EED9DD1D62D65E38A254979D89E28F0C28883E71EE2AD264CD16B863FA094A8F6F69A56B62E8918040:7c9a1039ea2e4fed73e81dd3ffc3fa22ea4a28352939adde7bf8ea858b00fa4f";
+       const char *key =
+               "1:716:0301EB00973C4EFC8FCECA4EA33E941F50B561199A51"
+               "59BCB6C2EED9DD1D62D65E38A254979D89E28F0C28883E71EE"
+               "2AD264CD16B863FA094A8F6F69A56B62E8918040:7c9a1039e"
+               "a2e4fed73e81dd3ffc3fa22ea4a28352939adde7bf8ea858b0"
+               "0fa4f";
        struct dcrypt_public_key *pub_key = NULL;
 
        bool ret = dcrypt_key_load_public(&pub_key, key, &error);
@@ -741,7 +885,13 @@ void test_load_invalid_keys(void) {
        test_assert(error != NULL);
 
        error = NULL;
-       key = "2:305e301006072a8648ce3d020106052b81040026034a000203fcc90034fa03d6fb79a0fc8b3b43c3398f68e76029307360cdcb9e27bb7e84b3c19dfb7244763bc4d442d216f09b7b7945ed9d182f3156550e9ee30b237a0217dbf79d28975f31:86706b69d1f640011a65d26a42f2ba20a619173644e1cc7475eb1d90966e84dc";
+       key =
+               "2:305e301006072a8648ce3d020106052b81040026034a0002"
+               "03fcc90034fa03d6fb79a0fc8b3b43c3398f68e76029307360"
+               "cdcb9e27bb7e84b3c19dfb7244763bc4d442d216f09b7b7945"
+               "ed9d182f3156550e9ee30b237a0217dbf79d28975f31:86706"
+               "b69d1f640011a65d26a42f2ba20a619173644e1cc7475eb1d9"
+               "0966e84dc";
        struct dcrypt_private_key *priv_key = NULL;
 
        ret = dcrypt_key_load_private(&priv_key, key, NULL, NULL, &error);
@@ -751,14 +901,16 @@ void test_load_invalid_keys(void) {
        test_end();
 }
 
-int main(void) {
+int main(void)
+{
        struct dcrypt_settings set = {
                .module_dir = ".libs"
        };
        const char *error;
 
        if (!dcrypt_initialize(NULL, &set, &error)) {
-               i_error("No functional dcrypt backend found - skipping tests: %s", error);
+               i_error("No functional dcrypt backend found - "
+                       "skipping tests: %s", error);
                return 0;
        }