summaryrefslogtreecommitdiff
path: root/lib/pubkey.c
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2017-08-03 15:37:18 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2017-08-04 11:08:51 +0200
commita18ff66e757c7b140e0e370634a62759d86c5bd1 (patch)
tree1372fc6e764576ca198d7a0df0fd2c6ea8057b68 /lib/pubkey.c
parenta89a1604a5bdb8d009295bedd0967fa38aaea937 (diff)
downloadgnutls-a18ff66e757c7b140e0e370634a62759d86c5bd1.tar.gz
gnutls_pubkey_import_x509: propagate errors from gnutls_x509_crt_get_pk_algorithm
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
Diffstat (limited to 'lib/pubkey.c')
-rw-r--r--lib/pubkey.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/pubkey.c b/lib/pubkey.c
index 53d88fb1ab..0fb9b92f4f 100644
--- a/lib/pubkey.c
+++ b/lib/pubkey.c
@@ -168,7 +168,11 @@ gnutls_pubkey_import_x509(gnutls_pubkey_t key, gnutls_x509_crt_t crt,
gnutls_pk_params_release(&key->params);
/* params initialized in _gnutls_x509_crt_get_mpis */
- key->params.algo = gnutls_x509_crt_get_pk_algorithm(crt, &key->bits);
+ ret = gnutls_x509_crt_get_pk_algorithm(crt, &key->bits);
+ if (ret < 0)
+ return gnutls_assert_val(ret);
+
+ key->params.algo = ret;
ret = gnutls_x509_crt_get_key_usage(crt, &key->key_usage, NULL);
if (ret < 0)