diff options
Diffstat (limited to 'src/libnm-core-impl/tests')
| -rw-r--r-- | src/libnm-core-impl/tests/certs/test-aes-128-ec-key.pem | 8 | ||||
| -rw-r--r-- | src/libnm-core-impl/tests/certs/test-aes-256-ec-key.pem | 8 | ||||
| -rw-r--r-- | src/libnm-core-impl/tests/certs/test-ec-key-only-decrypted.der | bin | 0 -> 121 bytes | |||
| -rw-r--r-- | src/libnm-core-impl/tests/certs/test-ec-key-only-decrypted.pem | 5 | ||||
| -rw-r--r-- | src/libnm-core-impl/tests/test-crypto.c | 15 |
5 files changed, 33 insertions, 3 deletions
diff --git a/src/libnm-core-impl/tests/certs/test-aes-128-ec-key.pem b/src/libnm-core-impl/tests/certs/test-aes-128-ec-key.pem new file mode 100644 index 00000000..86989642 --- /dev/null +++ b/src/libnm-core-impl/tests/certs/test-aes-128-ec-key.pem @@ -0,0 +1,8 @@ +-----BEGIN EC PRIVATE KEY----- +Proc-Type: 4,ENCRYPTED +DEK-Info: AES-128-CBC,D6E024FACA9CFFE6B0296EBC848BC80C + +vOzvGfSmNKRGMxIlB474A3ZHYqNj0NEuJQxEYV2roY+kAWN4+zdk7I+dbGRbjlgz +lS0NBIrTEmyPugYEWnaccxKfTTJz5U1OxT/AZVVmJuD/5lh2H2qZUkFs6d10X5zd +0gsn6OwV+2j9rrWyEcgH8WOwqgiN+LaWihLhGMKaWI0= +-----END EC PRIVATE KEY----- diff --git a/src/libnm-core-impl/tests/certs/test-aes-256-ec-key.pem b/src/libnm-core-impl/tests/certs/test-aes-256-ec-key.pem new file mode 100644 index 00000000..1baf51d3 --- /dev/null +++ b/src/libnm-core-impl/tests/certs/test-aes-256-ec-key.pem @@ -0,0 +1,8 @@ +-----BEGIN EC PRIVATE KEY----- +Proc-Type: 4,ENCRYPTED +DEK-Info: AES-256-CBC,8337BC213C3280DC1884C61562719552 + +Kcdf9l8gAMkN1fb0PGpFRD1VQIGQbB55yCBLMwRBbG1XQ9rVjnP+Zl0CdDzncKXt +yLFpAAgNUahsaVJyc8/suKl8pj2VfJK8m0NUIrWWQu/KyaFTS6I30hwLJ0WATBMm +GMb2CiAqlk6U+EqtZxNmgf6SCEGUV/oTCF0AqNFKiXM= +-----END EC PRIVATE KEY----- diff --git a/src/libnm-core-impl/tests/certs/test-ec-key-only-decrypted.der b/src/libnm-core-impl/tests/certs/test-ec-key-only-decrypted.der new file mode 100644 index 00000000..e8d0765a --- /dev/null +++ b/src/libnm-core-impl/tests/certs/test-ec-key-only-decrypted.der Binary files differdiff --git a/src/libnm-core-impl/tests/certs/test-ec-key-only-decrypted.pem b/src/libnm-core-impl/tests/certs/test-ec-key-only-decrypted.pem new file mode 100644 index 00000000..c40e293b --- /dev/null +++ b/src/libnm-core-impl/tests/certs/test-ec-key-only-decrypted.pem @@ -0,0 +1,5 @@ +-----BEGIN EC PRIVATE KEY----- +MHcCAQEEIPw/e9RgNcs2cMrKn+KnxNCGC1UrcOH9S0xm5e1GxJqRoAoGCCqGSM49 +AwEHoUQDQgAEbA5LlfyjMwuyuIcBr+fk1l71EKC6NttJCGjXGexUOTGsjhVgXHjT +cc2EohzF94Zs4EjYce3aQe4YsA11YMuRaQ== +-----END EC PRIVATE KEY----- diff --git a/src/libnm-core-impl/tests/test-crypto.c b/src/libnm-core-impl/tests/test-crypto.c index 896c3c2e..fb4c213f 100644 --- a/src/libnm-core-impl/tests/test-crypto.c +++ b/src/libnm-core-impl/tests/test-crypto.c @@ -111,7 +111,7 @@ test_load_private_key(const char *path, array = nmtst_crypto_decrypt_openssl_private_key(path, password, &key_type, &error); /* Even if the password is wrong, we should determine the key type */ - g_assert_cmpint(key_type, ==, NM_CRYPTO_KEY_TYPE_RSA); + g_assert_cmpint(key_type, !=, NM_CRYPTO_KEY_TYPE_UNKNOWN); if (expected_error != -1) { g_assert(array == NULL); @@ -226,7 +226,7 @@ test_encrypt_private_key(const char *path, const char *password) array = nmtst_crypto_decrypt_openssl_private_key(path, password, &key_type, &error); nmtst_assert_success(array, error); - g_assert_cmpint(key_type, ==, NM_CRYPTO_KEY_TYPE_RSA); + g_assert_cmpint(key_type, !=, NM_CRYPTO_KEY_TYPE_UNKNOWN); /* Now re-encrypt the private key */ encrypted = nmtst_crypto_rsa_key_encrypt(g_bytes_get_data(array, NULL), @@ -244,7 +244,7 @@ test_encrypt_private_key(const char *path, const char *password) &key_type, &error); nmtst_assert_success(re_decrypted, error); - g_assert_cmpint(key_type, ==, NM_CRYPTO_KEY_TYPE_RSA); + g_assert_cmpint(key_type, !=, NM_CRYPTO_KEY_TYPE_UNKNOWN); /* Compare the original decrypted key with the re-decrypted key */ g_assert(g_bytes_equal(array, re_decrypted)); @@ -452,12 +452,21 @@ main(int argc, char **argv) g_test_add_data_func("/libnm/crypto/key/aes-128", "test-aes-128-key.pem, test-aes-password", test_key); + g_test_add_data_func("/libnm/crypto/key/aes-128-ec", + "test-aes-128-ec-key.pem, test-aes-password", + test_key); g_test_add_data_func("/libnm/crypto/key/aes-256", "test-aes-256-key.pem, test-aes-password", test_key); + g_test_add_data_func("/libnm/crypto/key/aes-256-ec", + "test-aes-256-ec-key.pem, test-aes-password", + test_key); g_test_add_data_func("/libnm/crypto/key/decrypted", "test-key-only-decrypted.pem", test_key_decrypted); + g_test_add_data_func("/libnm/crypto/key/decrypted-ec", + "test-ec-key-only-decrypted.pem", + test_key_decrypted); g_test_add_data_func("/libnm/crypto/PKCS#12/1", "test-cert.p12, test", test_pkcs12); g_test_add_data_func("/libnm/crypto/PKCS#12/2", "test2-cert.p12, 12345testing", test_pkcs12); |