summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2012-07-02 13:35:12 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2012-07-02 19:43:28 +0200
commit1fc1614eed1f0cfc1aeda1f41ee7ad6e705c0b78 (patch)
tree4406d435b6878de0cfdc0145c1bd633bcc079854
parenta29d5a9c792440d48fd00171ac10264e32241a18 (diff)
downloadgnutls-1fc1614eed1f0cfc1aeda1f41ee7ad6e705c0b78.tar.gz
Handle EC DER keys.
-rw-r--r--lib/x509/privkey.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index 51981eeb9b..8c68ef2284 100644
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -524,7 +524,12 @@ gnutls_x509_privkey_import (gnutls_x509_privkey_t key,
key->pk_algorithm = GNUTLS_PK_DSA;
key->key = decode_dsa_key (&_data, key);
if (key->key == NULL)
- gnutls_assert ();
+ {
+ key->pk_algorithm = GNUTLS_PK_EC;
+ key->key = _gnutls_privkey_decode_ecc_key (&_data, key);
+ if (key->key == NULL)
+ gnutls_assert ();
+ }
}
}