|
 |
2804ca |
From 0590bacaecdfb57d5289a2c3d0628424689353d1 Mon Sep 17 00:00:00 2001
|
|
|
2804ca |
From: Beniamino Galvani <bgalvani@redhat.com>
|
|
|
2804ca |
Date: Mon, 27 Aug 2018 17:04:34 +0200
|
|
|
2804ca |
Subject: [PATCH] libnm-core: support private keys encrypted with
|
|
|
2804ca |
AES-{192,256}-CBC
|
|
|
2804ca |
|
|
|
2804ca |
https://github.com/NetworkManager/NetworkManager/pull/189
|
|
|
2804ca |
(cherry picked from commit 93f85edcce502cfa6d3676f58bf9e8e1a527ea53)
|
|
|
2804ca |
(cherry picked from commit 74fc6f30b2fef3b8631128907e036bda88491970)
|
|
|
2804ca |
---
|
|
|
2804ca |
Makefile.am | 3 +-
|
|
|
2804ca |
libnm-core/crypto.c | 30 +++++++----
|
|
|
2804ca |
libnm-core/crypto.h | 6 ++-
|
|
|
2804ca |
libnm-core/crypto_gnutls.c | 14 ++++-
|
|
|
2804ca |
libnm-core/crypto_nss.c | 9 +++-
|
|
|
2804ca |
...{test-aes-key.pem => test-aes-128-key.pem} | 0
|
|
|
2804ca |
libnm-core/tests/certs/test-aes-256-key.pem | 54 +++++++++++++++++++
|
|
|
2804ca |
libnm-core/tests/test-crypto.c | 7 ++-
|
|
|
2804ca |
libnm-util/tests/test-crypto.c | 4 +-
|
|
|
2804ca |
9 files changed, 106 insertions(+), 21 deletions(-)
|
|
|
2804ca |
rename libnm-core/tests/certs/{test-aes-key.pem => test-aes-128-key.pem} (100%)
|
|
|
2804ca |
create mode 100644 libnm-core/tests/certs/test-aes-256-key.pem
|
|
|
2804ca |
|
|
|
2804ca |
diff --git a/Makefile.am b/Makefile.am
|
|
|
2804ca |
index cdb5cfc9d..d86fa26c7 100644
|
|
|
2804ca |
--- a/Makefile.am
|
|
|
2804ca |
+++ b/Makefile.am
|
|
|
2804ca |
@@ -749,7 +749,8 @@ EXTRA_DIST += \
|
|
|
2804ca |
libnm-core/tests/certs/test2_ca_cert.pem \
|
|
|
2804ca |
libnm-core/tests/certs/test2-cert.p12 \
|
|
|
2804ca |
libnm-core/tests/certs/test2_key_and_cert.pem \
|
|
|
2804ca |
- libnm-core/tests/certs/test-aes-key.pem \
|
|
|
2804ca |
+ libnm-core/tests/certs/test-aes-128-key.pem \
|
|
|
2804ca |
+ libnm-core/tests/certs/test-aes-256-key.pem \
|
|
|
2804ca |
libnm-core/tests/certs/test_ca_cert.der \
|
|
|
2804ca |
libnm-core/tests/certs/test_ca_cert.pem \
|
|
|
2804ca |
libnm-core/tests/certs/test-ca-cert.pem \
|
|
|
2804ca |
diff --git a/libnm-core/crypto.c b/libnm-core/crypto.c
|
|
|
2804ca |
index c4e48475f..319f8055f 100644
|
|
|
2804ca |
--- a/libnm-core/crypto.c
|
|
|
2804ca |
+++ b/libnm-core/crypto.c
|
|
|
2804ca |
@@ -158,7 +158,13 @@ parse_old_openssl_key_file (const guint8 *data,
|
|
|
2804ca |
goto parse_error;
|
|
|
2804ca |
}
|
|
|
2804ca |
} else if (!strncmp (p, DEK_INFO_TAG, strlen (DEK_INFO_TAG))) {
|
|
|
2804ca |
+ static const char *const known_ciphers[] = { CIPHER_DES_EDE3_CBC,
|
|
|
2804ca |
+ CIPHER_DES_CBC,
|
|
|
2804ca |
+ CIPHER_AES_128_CBC,
|
|
|
2804ca |
+ CIPHER_AES_192_CBC,
|
|
|
2804ca |
+ CIPHER_AES_256_CBC };
|
|
|
2804ca |
char *comma;
|
|
|
2804ca |
+ guint i;
|
|
|
2804ca |
|
|
|
2804ca |
if (enc_tags++ != 1 || str->len != 0) {
|
|
|
2804ca |
g_set_error (error, NM_CRYPTO_ERROR,
|
|
|
2804ca |
@@ -187,13 +193,13 @@ parse_old_openssl_key_file (const guint8 *data,
|
|
|
2804ca |
iv = g_strdup (comma);
|
|
|
2804ca |
|
|
|
2804ca |
/* Get the private key cipher */
|
|
|
2804ca |
- if (!strcasecmp (p, "DES-EDE3-CBC")) {
|
|
|
2804ca |
- cipher = g_strdup (p);
|
|
|
2804ca |
- } else if (!strcasecmp (p, "DES-CBC")) {
|
|
|
2804ca |
- cipher = g_strdup (p);
|
|
|
2804ca |
- } else if (!strcasecmp (p, "AES-128-CBC")) {
|
|
|
2804ca |
- cipher = g_strdup (p);
|
|
|
2804ca |
- } else {
|
|
|
2804ca |
+ for (i = 0; i < G_N_ELEMENTS (known_ciphers); i++) {
|
|
|
2804ca |
+ if (!g_ascii_strcasecmp (p, known_ciphers[i])) {
|
|
|
2804ca |
+ cipher = g_strdup (known_ciphers[i]);
|
|
|
2804ca |
+ break;
|
|
|
2804ca |
+ }
|
|
|
2804ca |
+ }
|
|
|
2804ca |
+ if (i == G_N_ELEMENTS (known_ciphers)) {
|
|
|
2804ca |
g_set_error (error, NM_CRYPTO_ERROR,
|
|
|
2804ca |
NM_CRYPTO_ERROR_INVALID_DATA,
|
|
|
2804ca |
_("Malformed PEM file: unknown private key cipher '%s'."),
|
|
|
2804ca |
@@ -383,12 +389,16 @@ crypto_make_des_aes_key (const char *cipher,
|
|
|
2804ca |
g_return_val_if_fail (password != NULL, NULL);
|
|
|
2804ca |
g_return_val_if_fail (out_len != NULL, NULL);
|
|
|
2804ca |
|
|
|
2804ca |
- if (!strcmp (cipher, "DES-EDE3-CBC"))
|
|
|
2804ca |
+ if (!strcmp (cipher, CIPHER_DES_EDE3_CBC))
|
|
|
2804ca |
digest_len = 24;
|
|
|
2804ca |
- else if (!strcmp (cipher, "DES-CBC"))
|
|
|
2804ca |
+ else if (!strcmp (cipher, CIPHER_DES_CBC))
|
|
|
2804ca |
digest_len = 8;
|
|
|
2804ca |
- else if (!strcmp (cipher, "AES-128-CBC"))
|
|
|
2804ca |
+ else if (!strcmp (cipher, CIPHER_AES_128_CBC))
|
|
|
2804ca |
digest_len = 16;
|
|
|
2804ca |
+ else if (!strcmp (cipher, CIPHER_AES_192_CBC))
|
|
|
2804ca |
+ digest_len = 24;
|
|
|
2804ca |
+ else if (!strcmp (cipher, CIPHER_AES_256_CBC))
|
|
|
2804ca |
+ digest_len = 32;
|
|
|
2804ca |
else {
|
|
|
2804ca |
g_set_error (error, NM_CRYPTO_ERROR,
|
|
|
2804ca |
NM_CRYPTO_ERROR_UNKNOWN_CIPHER,
|
|
|
2804ca |
diff --git a/libnm-core/crypto.h b/libnm-core/crypto.h
|
|
|
2804ca |
index e89f09193..d20d6f310 100644
|
|
|
2804ca |
--- a/libnm-core/crypto.h
|
|
|
2804ca |
+++ b/libnm-core/crypto.h
|
|
|
2804ca |
@@ -30,8 +30,10 @@
|
|
|
2804ca |
|
|
|
2804ca |
#define MD5_HASH_LEN 20
|
|
|
2804ca |
#define CIPHER_DES_EDE3_CBC "DES-EDE3-CBC"
|
|
|
2804ca |
-#define CIPHER_DES_CBC "DES-CBC"
|
|
|
2804ca |
-#define CIPHER_AES_CBC "AES-128-CBC"
|
|
|
2804ca |
+#define CIPHER_DES_CBC "DES-CBC"
|
|
|
2804ca |
+#define CIPHER_AES_128_CBC "AES-128-CBC"
|
|
|
2804ca |
+#define CIPHER_AES_192_CBC "AES-192-CBC"
|
|
|
2804ca |
+#define CIPHER_AES_256_CBC "AES-256-CBC"
|
|
|
2804ca |
|
|
|
2804ca |
typedef enum {
|
|
|
2804ca |
NM_CRYPTO_KEY_TYPE_UNKNOWN = 0,
|
|
|
2804ca |
diff --git a/libnm-core/crypto_gnutls.c b/libnm-core/crypto_gnutls.c
|
|
|
2804ca |
index 53a3ba4ad..49181ee72 100644
|
|
|
2804ca |
--- a/libnm-core/crypto_gnutls.c
|
|
|
2804ca |
+++ b/libnm-core/crypto_gnutls.c
|
|
|
2804ca |
@@ -82,9 +82,15 @@ crypto_decrypt (const char *cipher,
|
|
|
2804ca |
} else if (!strcmp (cipher, CIPHER_DES_CBC)) {
|
|
|
2804ca |
cipher_mech = GNUTLS_CIPHER_DES_CBC;
|
|
|
2804ca |
real_iv_len = SALT_LEN;
|
|
|
2804ca |
- } else if (!strcmp (cipher, CIPHER_AES_CBC)) {
|
|
|
2804ca |
+ } else if (!strcmp (cipher, CIPHER_AES_128_CBC)) {
|
|
|
2804ca |
cipher_mech = GNUTLS_CIPHER_AES_128_CBC;
|
|
|
2804ca |
real_iv_len = 16;
|
|
|
2804ca |
+ } else if (!strcmp (cipher, CIPHER_AES_192_CBC)) {
|
|
|
2804ca |
+ cipher_mech = GNUTLS_CIPHER_AES_192_CBC;
|
|
|
2804ca |
+ real_iv_len = 16;
|
|
|
2804ca |
+ } else if (!strcmp (cipher, CIPHER_AES_256_CBC)) {
|
|
|
2804ca |
+ cipher_mech = GNUTLS_CIPHER_AES_256_CBC;
|
|
|
2804ca |
+ real_iv_len = 16;
|
|
|
2804ca |
} else {
|
|
|
2804ca |
g_set_error (error, NM_CRYPTO_ERROR,
|
|
|
2804ca |
NM_CRYPTO_ERROR_UNKNOWN_CIPHER,
|
|
|
2804ca |
@@ -189,8 +195,12 @@ crypto_encrypt (const char *cipher,
|
|
|
2804ca |
|
|
|
2804ca |
if (!strcmp (cipher, CIPHER_DES_EDE3_CBC))
|
|
|
2804ca |
cipher_mech = GNUTLS_CIPHER_3DES_CBC;
|
|
|
2804ca |
- else if (!strcmp (cipher, CIPHER_AES_CBC))
|
|
|
2804ca |
+ else if (!strcmp (cipher, CIPHER_AES_128_CBC))
|
|
|
2804ca |
cipher_mech = GNUTLS_CIPHER_AES_128_CBC;
|
|
|
2804ca |
+ else if (!strcmp (cipher, CIPHER_AES_192_CBC))
|
|
|
2804ca |
+ cipher_mech = GNUTLS_CIPHER_AES_192_CBC;
|
|
|
2804ca |
+ else if (!strcmp (cipher, CIPHER_AES_256_CBC))
|
|
|
2804ca |
+ cipher_mech = GNUTLS_CIPHER_AES_256_CBC;
|
|
|
2804ca |
else {
|
|
|
2804ca |
g_set_error (error, NM_CRYPTO_ERROR,
|
|
|
2804ca |
NM_CRYPTO_ERROR_UNKNOWN_CIPHER,
|
|
|
2804ca |
diff --git a/libnm-core/crypto_nss.c b/libnm-core/crypto_nss.c
|
|
|
2804ca |
index 56e91e26f..9a0c43349 100644
|
|
|
2804ca |
--- a/libnm-core/crypto_nss.c
|
|
|
2804ca |
+++ b/libnm-core/crypto_nss.c
|
|
|
2804ca |
@@ -103,7 +103,9 @@ crypto_decrypt (const char *cipher,
|
|
|
2804ca |
} else if (!strcmp (cipher, CIPHER_DES_CBC)) {
|
|
|
2804ca |
cipher_mech = CKM_DES_CBC_PAD;
|
|
|
2804ca |
real_iv_len = 8;
|
|
|
2804ca |
- } else if (!strcmp (cipher, CIPHER_AES_CBC)) {
|
|
|
2804ca |
+ } else if (NM_IN_STRSET (cipher, CIPHER_AES_128_CBC,
|
|
|
2804ca |
+ CIPHER_AES_192_CBC,
|
|
|
2804ca |
+ CIPHER_AES_256_CBC)) {
|
|
|
2804ca |
cipher_mech = CKM_AES_CBC_PAD;
|
|
|
2804ca |
real_iv_len = 16;
|
|
|
2804ca |
} else {
|
|
|
2804ca |
@@ -269,7 +271,10 @@ crypto_encrypt (const char *cipher,
|
|
|
2804ca |
|
|
|
2804ca |
if (!strcmp (cipher, CIPHER_DES_EDE3_CBC))
|
|
|
2804ca |
cipher_mech = CKM_DES3_CBC_PAD;
|
|
|
2804ca |
- else if (!strcmp (cipher, CIPHER_AES_CBC))
|
|
|
2804ca |
+ else if (NM_IN_STRSET (cipher,
|
|
|
2804ca |
+ CIPHER_AES_128_CBC,
|
|
|
2804ca |
+ CIPHER_AES_192_CBC,
|
|
|
2804ca |
+ CIPHER_AES_256_CBC))
|
|
|
2804ca |
cipher_mech = CKM_AES_CBC_PAD;
|
|
|
2804ca |
else {
|
|
|
2804ca |
g_set_error (error, NM_CRYPTO_ERROR,
|
|
|
2804ca |
diff --git a/libnm-core/tests/certs/test-aes-key.pem b/libnm-core/tests/certs/test-aes-128-key.pem
|
|
|
2804ca |
similarity index 100%
|
|
|
2804ca |
rename from libnm-core/tests/certs/test-aes-key.pem
|
|
|
2804ca |
rename to libnm-core/tests/certs/test-aes-128-key.pem
|
|
|
2804ca |
diff --git a/libnm-core/tests/certs/test-aes-256-key.pem b/libnm-core/tests/certs/test-aes-256-key.pem
|
|
|
2804ca |
new file mode 100644
|
|
|
2804ca |
index 000000000..e51bafd3d
|
|
|
2804ca |
--- /dev/null
|
|
|
2804ca |
+++ b/libnm-core/tests/certs/test-aes-256-key.pem
|
|
|
2804ca |
@@ -0,0 +1,54 @@
|
|
|
2804ca |
+-----BEGIN RSA PRIVATE KEY-----
|
|
|
2804ca |
+Proc-Type: 4,ENCRYPTED
|
|
|
2804ca |
+DEK-Info: AES-256-CBC,5FF6BD2D4E57E8933D4A6814DEF5305A
|
|
|
2804ca |
+
|
|
|
2804ca |
+9Br+xw6XOg7qUqfeE5PJ4g/PAm7eTcPMb4FzSKkaEosLo6oj4f37TwXuojJZeAmi
|
|
|
2804ca |
+1EytpqM1vdYHCLdjg+qYaTIq6mzMZIyoaREokcOhcNrq5S0J39gJLVV9LjiXhCAH
|
|
|
2804ca |
+GQgDBnbRT6HGz70AyTRLcW9aj6uBzTv/m92sLUw2txFeBXK8n2AA1oHJTgsFNYjf
|
|
|
2804ca |
+/ZvTCE1VMQHDPx31Vn5WXSUHNc0hx4MTIwpHqWI17ohr8IiWCs5HXVfVaqrNeNEw
|
|
|
2804ca |
+haD7fg8oNxjLs46/4dDWmfWXhDsMFSweZv03gZdyVjwn1IOqeVGmTdLpllfgOW7E
|
|
|
2804ca |
++XE8Y/d55s5nkOxu6eXNMtWgjclKBGr2iMxxnODmEsUt2WcV98cPS+25o3hOfy3s
|
|
|
2804ca |
+NIcfxtWVRFUtjqf3ragyGLuXFqATkj1slj4LVMeewRJ1g+Z6ti0mwBN+ZrYtKdec
|
|
|
2804ca |
+FRNb4zr5FW+3SqkIIJVfxJEYJDB4zODhMg8tySEHLKuT0uz42YQ4aoOHTzO5WDBY
|
|
|
2804ca |
+2BI7TjRppXcExPnkAk5jqbKA6BjT9KcAVyypfxDKvCeXKdjDcL6ISOBSm6cQBh8D
|
|
|
2804ca |
+HxsFzMy9PF6kKNeiNiEsVPnKYvhvs1hTBtp+IAgJ6KZnCDKplZFxo/mBAlV2KyCT
|
|
|
2804ca |
+x+Mhmme3fXdLJkvxlVJAoAhwgXvomVCVTGI3JhcQIqVgxPIKYpqlHVFC7JjG+yQX
|
|
|
2804ca |
+tvzCPtr9G9+Ofrm6zXjlDD7zNyl/KfFtEWhO2ePHkQlCEuKJnsnRIf/wQ0viG0yY
|
|
|
2804ca |
+MH31Z/84o2pKLBKY5fq8+eYuYoP9Rk4W2LpjGMvdkKhEHL26kZofeFyqD+JcaxHc
|
|
|
2804ca |
+kQh7/SbWAsREGb9Jp7I2q1mo749mse1oSFIQa5gN3jB0mgHZd6edRYeW2Up+rqEK
|
|
|
2804ca |
+k6Xd6uqs7bZd5W9sP7Cf6yJOFEjqFVLQEVEXWSchgeta/JNrjGr3UzLFN2S+vhvX
|
|
|
2804ca |
+XgDa41y2UdXHRqj2s864u0ZDPyGXYZnVbvQn/8xHQ7rvxHowpTn+XXUEf0AQnk3j
|
|
|
2804ca |
+9h++3McwP8GuVxkwc6o9TfOL+ell5jup7F3SekwEiE3hqY8x87g6X2zD5VSnfCy3
|
|
|
2804ca |
+0t0LmPGI1b3LABeYjA1WEdhoTlHrNLkwOR4gsudrJ5nxIzfGy+IHaloXLJy4YKfX
|
|
|
2804ca |
+pJ+qyGRUR42YD9IhiEmmmO1VoJgVEYfBiz50Jg8emddku6eKdmv9IKjiSb2pTbDS
|
|
|
2804ca |
+4oUYKg109OOn+krk67dNXofAXrBa8v7QusC0yz9N25H05Xyou1iqpGk+uBrTqEO6
|
|
|
2804ca |
+lW9lWQo57BQU9og40xMKH/xQgIxfQRktUKsPizj8mKil4izo5KgjPSqBeEbj+Q3c
|
|
|
2804ca |
+0FKlrpTXQlXfX5Z5esqMuCSiwQEzoJR+V+SUaSVcg1av0k/CJMin4Cr8roai+OjK
|
|
|
2804ca |
+lhaQIvx35Bzd02yERYsfpDjmQCXmIeiDm8JtB6znbQPUJ4d8kzWR+5ACOZW/dUss
|
|
|
2804ca |
+YhWJRkZpkIwTY+/sDU4mnP2R37MNo+OH4CwZyUDHjlkRPGW+6JBEpnnlI9a/1Vb1
|
|
|
2804ca |
+pjAGpi/8u/luvZGTzCzxQG2dZc5YQR869U+wFsFbLRiD0aP2SpdOH0QxxPOcdR8+
|
|
|
2804ca |
+HWyL01BJBKyK/wZWJhe+63zlk1L5CA0XYpoNkYpMlPNZkcqR7QzUOATfuBgI2aPM
|
|
|
2804ca |
+AXaweaAWhpPCDsc2RypIs9DhTiCCkt8tq8Au15hVUKAoshLeewPtv0t75MEC0hVB
|
|
|
2804ca |
+z6FVnNlqq0cqqcSVqvUG6JUGtFOGgG3ifEMXggq5k12+wGzY63DLR8dFPNpOL6/1
|
|
|
2804ca |
+nocOayHJIU9M8PP817PzhAUAePRRUKRg8kkbKKeZnCJxoF7O15AFVEJnl9Vyokkz
|
|
|
2804ca |
+bULYhzYVx3xh8THMi+5jsnKWPJyMeYHbHH3C658SIw6Ff9fgEWscv5ZkGYdKMg+l
|
|
|
2804ca |
+8hBn+++SoqIO+F3lOGco+s8qlYox106lUwJEtORXcBxmkaHSo/X2AVO8Owt4vYli
|
|
|
2804ca |
+mjWnY6V9vooBgOuCMcY780pcoj2lSf9JPHDYK0j8t5VumDUSLyLt+tCj0yv/vl5L
|
|
|
2804ca |
+9L++vbu2akZRC9ChijYpfhTvXoG36ePhoT7AGGnhpFjjw1VqG80GY4XSODKzH86w
|
|
|
2804ca |
+kUcZoErb8swUPYOtsybtuPb+6c/YofQ8GfpVosPZgSRD4+U7v+zA3/z8xF2B0xt6
|
|
|
2804ca |
+uV8hXbropuni8KmbFuKrPZK3p2v2aZ8F0+GITwS75/hbT6D7ruUSr5q4V0VKeE8G
|
|
|
2804ca |
+k3QSI0s6+74stPv3S/ByCxu8q51ffYqVw00wzPpEc4SmHEa0R7IczJKXupmDdZZM
|
|
|
2804ca |
+1rASSBNzS5TZDBXP6S7npYQ8nHhgXTdCFO7eM3bp24B/i2o0s7+gkKrz0DkEbv9I
|
|
|
2804ca |
+UrCJjTL8OIIP4qSLMILzZ8pB28c+zyM482ZqFY/2b7j6WlTiqa9P1adrD1gLxTQ0
|
|
|
2804ca |
+Sw9xY+sY3PAJqcnPA5NjDZL/h5plgHhCqDa9pEtdBVG2Mxcl9bXbphwD1MIzj4gr
|
|
|
2804ca |
+xtlW1HUJ/iOhFcXldOJ1MCt++Bm5av4mL5adQ/oUnL5Q0oZZFwqT09k7xe7lZ98N
|
|
|
2804ca |
+uj2Lfl8NN7N3ama9KatgbX5g6IALuk/rJN/4KEiiu24m+lR7c5L0pg/cG6LIFjmk
|
|
|
2804ca |
+HlTsc0ANCgeZBhDJ8kvjcXDhFOqoYE/+D2VO6ZEHRsDibQ+kjpaH+DiD01/gh0N0
|
|
|
2804ca |
+HM6GGtm3GbOyZUhw5OFz04xzcyFYo2xaqzgaZieAOcrt2s6XyPVf1gww08/HtTMR
|
|
|
2804ca |
+gLg14MUQvRXV6kPJfdu4OLZ//b6J0KnzVyLDRdOrWIj2raLWmKwQN9qv05/yskcD
|
|
|
2804ca |
+Y6x7wq3v6iZpFjDc53sslhwp2XRsoWT9X5alVspz8WvP/kqgkTdzpPFdp1vIovOQ
|
|
|
2804ca |
+kRXdzzKICDGDJUIcTL8cJ3Dv4XqNR/sVyuB4dfndzQQApbdYTDNpwX0VJDBjMkQy
|
|
|
2804ca |
+Up6aiUknxa6Cbp7b1ZfUQY8yNBAIZL+R8dmobT3nAHW61DaASHSxn+elCD2Ja/6b
|
|
|
2804ca |
+EiWikskyN6crMAv35ILr5ySsZK97ttNNmRoGFbt8bTjRd83Ie+UfH445kCKsY83x
|
|
|
2804ca |
+aDCvWm+bbV6M9rSgjhJ3bWOudiw+EBMGvSamSnS7CYnRmwq4t+4bM2sh2nYKY0qw
|
|
|
2804ca |
+-----END RSA PRIVATE KEY-----
|
|
|
2804ca |
diff --git a/libnm-core/tests/test-crypto.c b/libnm-core/tests/test-crypto.c
|
|
|
2804ca |
index fb99ffea7..5fb26c1fc 100644
|
|
|
2804ca |
--- a/libnm-core/tests/test-crypto.c
|
|
|
2804ca |
+++ b/libnm-core/tests/test-crypto.c
|
|
|
2804ca |
@@ -476,8 +476,11 @@ main (int argc, char **argv)
|
|
|
2804ca |
g_test_add_data_func ("/libnm/crypto/key/padding-8",
|
|
|
2804ca |
"test2_key_and_cert.pem, 12345testing",
|
|
|
2804ca |
test_key);
|
|
|
2804ca |
- g_test_add_data_func ("/libnm/crypto/key/aes",
|
|
|
2804ca |
- "test-aes-key.pem, test-aes-password",
|
|
|
2804ca |
+ g_test_add_data_func ("/libnm/crypto/key/aes-128",
|
|
|
2804ca |
+ "test-aes-128-key.pem, test-aes-password",
|
|
|
2804ca |
+ test_key);
|
|
|
2804ca |
+ g_test_add_data_func ("/libnm/crypto/key/aes-256",
|
|
|
2804ca |
+ "test-aes-256-key.pem, test-aes-password",
|
|
|
2804ca |
test_key);
|
|
|
2804ca |
g_test_add_data_func ("/libnm/crypto/key/decrypted",
|
|
|
2804ca |
"test-key-only-decrypted.pem",
|
|
|
2804ca |
diff --git a/libnm-util/tests/test-crypto.c b/libnm-util/tests/test-crypto.c
|
|
|
2804ca |
index 61bd97745..af6028a52 100644
|
|
|
2804ca |
--- a/libnm-util/tests/test-crypto.c
|
|
|
2804ca |
+++ b/libnm-util/tests/test-crypto.c
|
|
|
2804ca |
@@ -383,8 +383,8 @@ main (int argc, char **argv)
|
|
|
2804ca |
g_test_add_data_func ("/libnm/crypto/key/padding-8",
|
|
|
2804ca |
"test2_key_and_cert.pem, 12345testing",
|
|
|
2804ca |
test_key);
|
|
|
2804ca |
- g_test_add_data_func ("/libnm/crypto/key/aes",
|
|
|
2804ca |
- "test-aes-key.pem, test-aes-password",
|
|
|
2804ca |
+ g_test_add_data_func ("/libnm/crypto/key/aes-128",
|
|
|
2804ca |
+ "test-aes-128-key.pem, test-aes-password",
|
|
|
2804ca |
test_key);
|
|
|
2804ca |
|
|
|
2804ca |
g_test_add_data_func ("/libnm/crypto/PKCS#12/1",
|
|
|
2804ca |
--
|
|
|
2804ca |
2.17.1
|
|
|
2804ca |
|