From: Timo Sirainen Date: Fri, 15 Nov 2024 13:41:20 +0000 (+0200) Subject: mail-crypt: Fix test keys to be inline X-Git-Tag: 2.4.1~1074 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4043ee682787bd7d89a83d96d425e05e2acbd701;p=thirdparty%2Fdovecot%2Fcore.git mail-crypt: Fix test keys to be inline --- diff --git a/src/plugins/mail-crypt/test-fs-crypt.c b/src/plugins/mail-crypt/test-fs-crypt.c index 78606b0772..7815c6389c 100644 --- a/src/plugins/mail-crypt/test-fs-crypt.c +++ b/src/plugins/mail-crypt/test-fs-crypt.c @@ -16,13 +16,15 @@ #include #define PRIVATE_KEY_PEM \ +SET_FILE_INLINE_PREFIX \ "-----BEGIN PRIVATE KEY-----\n" \ "MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgYIufJZZe2Y6iFz5x\n" \ "koIoysb3dZLZWsyekjOc/GjsLd2hRANCAASnIWgQuhE8jqALcmfiunRyEk7vkq/y\n" \ "a9vYK50b3cFhCsLU4tfVTLkB1Y/6VlZj63QKMzXNvk5G5OD1ofElcpyj\n" \ "-----END PRIVATE KEY-----" #define PUBLIC_KEY_PEM \ - "-----BEGIN PUBLIC KEY-----\n" \ +SET_FILE_INLINE_PREFIX \ +"-----BEGIN PUBLIC KEY-----\n" \ "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEpyFoELoRPI6gC3Jn4rp0chJO75Kv\n" \ "8mvb2CudG93BYQrC1OLX1Uy5AdWP+lZWY+t0CjM1zb5ORuTg9aHxJXKcow==\n" \ "-----END PUBLIC KEY-----" @@ -50,9 +52,9 @@ static void test_fs_crypt_read_write(void) "fs", "crypt posix", "fs/crypt/fs_driver", "crypt", "fs/posix/fs_driver", "posix", - "crypt_global_public_key", PUBLIC_KEY_PEM, + "crypt_global_public_key_file", PUBLIC_KEY_PEM, "crypt_global_private_key", "main", - "crypt_global_private_key/main/crypt_private_key", PRIVATE_KEY_PEM, + "crypt_global_private_key/main/crypt_private_key_file", PRIVATE_KEY_PEM, NULL }; struct settings_simple test_set; @@ -109,9 +111,9 @@ static void test_fs_crypt_read_write_0(void) "fs", "crypt posix", "fs/crypt/fs_driver", "crypt", "fs/posix/fs_driver", "posix", - "crypt_global_public_key", PUBLIC_KEY_PEM, + "crypt_global_public_key_file", PUBLIC_KEY_PEM, "crypt_global_private_key", "main", - "crypt_global_private_key/main/crypt_private_key", PRIVATE_KEY_PEM, + "crypt_global_private_key/main/crypt_private_key_file", PRIVATE_KEY_PEM, NULL }; struct settings_simple test_set; @@ -163,7 +165,7 @@ static void test_fs_crypt_read_write_unencrypted(void) "fs_crypt_read_plain_fallback", "yes", "crypt_write_algorithm", "", "crypt_global_private_key", "main", - "crypt_global_private_key/main/crypt_private_key", PRIVATE_KEY_PEM, + "crypt_global_private_key/main/crypt_private_key_file", PRIVATE_KEY_PEM, NULL }; struct settings_simple test_set; @@ -214,9 +216,9 @@ static void test_fs_crypt_read_write_unencrypted(void) "fs/posix/fs_driver", "posix", "fs_crypt_read_plain_fallback", "yes", "crypt_write_algorithm", "", - "crypt_global_public_key", PUBLIC_KEY_PEM, + "crypt_global_public_key_file", PUBLIC_KEY_PEM, "crypt_global_private_key", "main", - "crypt_global_private_key/main/crypt_private_key", PRIVATE_KEY_PEM, + "crypt_global_private_key/main/crypt_private_key_file", PRIVATE_KEY_PEM, NULL }; settings_simple_init(&test_set, test_settings2); diff --git a/src/plugins/mail-crypt/test-mail-global-key.c b/src/plugins/mail-crypt/test-mail-global-key.c index 2f4b686439..b5e01ab7b5 100644 --- a/src/plugins/mail-crypt/test-mail-global-key.c +++ b/src/plugins/mail-crypt/test-mail-global-key.c @@ -14,12 +14,12 @@ static const char *settings[] = { "crypt_global_private_key", "nopw pw", - "crypt_global_private_key/nopw/crypt_private_key", - "LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JR0hBZ0VBTUJNR0J5cUdTTTQ5QWdFR0NDcUdTTTQ5QXdFSEJHMHdhd0lCQVFRZ1lJdWZKWlplMlk2aUZ6NXgKa29Jb3lzYjNkWkxaV3N5ZWtqT2MvR2pzTGQyaFJBTkNBQVNuSVdnUXVoRThqcUFMY21maXVuUnlFazd2a3EveQphOXZZSzUwYjNjRmhDc0xVNHRmVlRMa0IxWS82VmxaajYzUUtNelhOdms1RzVPRDFvZkVsY3B5agotLS0tLUVORCBQUklWQVRFIEtFWS0tLS0tCg==", - "crypt_global_public_key", - "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUZrd0V3WUhLb1pJemowQ0FRWUlLb1pJemowREFRY0RRZ0FFcHlGb0VMb1JQSTZnQzNKbjRycDBjaEpPNzVLdgo4bXZiMkN1ZEc5M0JZUXJDMU9MWDFVeTVBZFdQK2xaV1krdDBDak0xemI1T1J1VGc5YUh4SlhLY293PT0KLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0tCg==", - "crypt_global_private_key/pw/crypt_private_key", - "LS0tLS1CRUdJTiBFTkNSWVBURUQgUFJJVkFURSBLRVktLS0tLQpNSUhlTUVrR0NTcUdTSWIzRFFFRkRUQThNQnNHQ1NxR1NJYjNEUUVGRERBT0JBaXA2cUpja1FET3F3SUNDQUF3CkhRWUpZSVpJQVdVREJBRXFCQkFXN09oUFRlU0xSOExLcGYwZjZHa3ZCSUdRZk5rYUpodnM2VWVWS2RkN2NzdFMKMURSNXJYTWtON09FbVNjTTljRlk2UDVrMzdnY1VJUFZudTQrOTFYZUE1MTU2cnBpUEpycEdkZnprcjhPNVFqZApsMWRycmR6Z0hqZHE4T2VmbUR1MEEzMjRZd25SS3hGRExUcjlHMkxVMkhoYmV6a0xjV1FwMVJISDZsNXRRcUtwCjZid05iMnc3OXhCb01YSjN6MVZqcElOZk9wRnJ6M3lucVlqUXhseTIrQjg2Ci0tLS0tRU5EIEVOQ1JZUFRFRCBQUklWQVRFIEtFWS0tLS0tCg==", + "crypt_global_private_key/nopw/crypt_private_key_file", + SET_FILE_INLINE_PREFIX"LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JR0hBZ0VBTUJNR0J5cUdTTTQ5QWdFR0NDcUdTTTQ5QXdFSEJHMHdhd0lCQVFRZ1lJdWZKWlplMlk2aUZ6NXgKa29Jb3lzYjNkWkxaV3N5ZWtqT2MvR2pzTGQyaFJBTkNBQVNuSVdnUXVoRThqcUFMY21maXVuUnlFazd2a3EveQphOXZZSzUwYjNjRmhDc0xVNHRmVlRMa0IxWS82VmxaajYzUUtNelhOdms1RzVPRDFvZkVsY3B5agotLS0tLUVORCBQUklWQVRFIEtFWS0tLS0tCg==", + "crypt_global_public_key_file", + SET_FILE_INLINE_PREFIX"LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUZrd0V3WUhLb1pJemowQ0FRWUlLb1pJemowREFRY0RRZ0FFcHlGb0VMb1JQSTZnQzNKbjRycDBjaEpPNzVLdgo4bXZiMkN1ZEc5M0JZUXJDMU9MWDFVeTVBZFdQK2xaV1krdDBDak0xemI1T1J1VGc5YUh4SlhLY293PT0KLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0tCg==", + "crypt_global_private_key/pw/crypt_private_key_file", + SET_FILE_INLINE_PREFIX"LS0tLS1CRUdJTiBFTkNSWVBURUQgUFJJVkFURSBLRVktLS0tLQpNSUhlTUVrR0NTcUdTSWIzRFFFRkRUQThNQnNHQ1NxR1NJYjNEUUVGRERBT0JBaXA2cUpja1FET3F3SUNDQUF3CkhRWUpZSVpJQVdVREJBRXFCQkFXN09oUFRlU0xSOExLcGYwZjZHa3ZCSUdRZk5rYUpodnM2VWVWS2RkN2NzdFMKMURSNXJYTWtON09FbVNjTTljRlk2UDVrMzdnY1VJUFZudTQrOTFYZUE1MTU2cnBpUEpycEdkZnprcjhPNVFqZApsMWRycmR6Z0hqZHE4T2VmbUR1MEEzMjRZd25SS3hGRExUcjlHMkxVMkhoYmV6a0xjV1FwMVJISDZsNXRRcUtwCjZid05iMnc3OXhCb01YSjN6MVZqcElOZk9wRnJ6M3lucVlqUXhseTIrQjg2Ci0tLS0tRU5EIEVOQ1JZUFRFRCBQUklWQVRFIEtFWS0tLS0tCg==", "crypt_global_private_key/pw/crypt_private_key_password", "password", NULL