diff options
| author | Michael Biebl <biebl@debian.org> | 2022-08-12 19:27:49 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2022-08-12 19:27:49 +0200 |
| commit | 3237c6678bee0411e44b2d2055fb16c2f86da218 (patch) | |
| tree | e3d8a0dab846c99fa6132c945ec3bbd59b1cc170 /src/libnm-crypto/nm-crypto.c | |
| parent | b020a0dc29267ec099f631e93f214a0d3549ba40 (diff) | |
| parent | 6accbd3ec0e42d8633bbde4d47ed7bfe854e7e0b (diff) | |
Update upstream source from tag 'upstream/1.38.4'
Update to upstream version '1.38.4' with Debian dir 24b65b102e62687c29d90ce76c47d939b35b96ad
Diffstat (limited to 'src/libnm-crypto/nm-crypto.c')
| -rw-r--r-- | src/libnm-crypto/nm-crypto.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/libnm-crypto/nm-crypto.c b/src/libnm-crypto/nm-crypto.c index 69d2b53f..8cf66336 100644 --- a/src/libnm-crypto/nm-crypto.c +++ b/src/libnm-crypto/nm-crypto.c @@ -25,6 +25,9 @@ #define PEM_DSA_KEY_BEGIN "-----BEGIN DSA PRIVATE KEY-----" #define PEM_DSA_KEY_END "-----END DSA PRIVATE KEY-----" +#define PEM_EC_KEY_BEGIN "-----BEGIN EC PRIVATE KEY-----" +#define PEM_EC_KEY_END "-----END EC PRIVATE KEY-----" + #define PEM_CERT_BEGIN "-----BEGIN CERTIFICATE-----" #define PEM_CERT_END "-----END CERTIFICATE-----" @@ -201,6 +204,10 @@ parse_old_openssl_key_file(const guint8 *data, key_type = NM_CRYPTO_KEY_TYPE_DSA; start_tag = PEM_DSA_KEY_BEGIN; end_tag = PEM_DSA_KEY_END; + } else if (find_tag(PEM_EC_KEY_BEGIN, data, data_len, 0, &start)) { + key_type = NM_CRYPTO_KEY_TYPE_EC; + start_tag = PEM_EC_KEY_BEGIN; + end_tag = PEM_EC_KEY_END; } else { g_set_error(error, _NM_CRYPTO_ERROR, |