x509/output: print error on invalid public key parameters on certificate

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

1 files changed, 15 insertions, 5 deletions

diff --git a/lib/x509/output.c b/lib/x509/output.c
index 21373ddb6f..ead49f7552 100644
--- a/lib/x509/output.c
+++ b/lib/x509/output.c
@@ -1438,27 +1438,37 @@ static int
 print_crt_pubkey(gnutls_buffer_st * str, gnutls_x509_crt_t crt,
 		 gnutls_certificate_print_formats_t format)
 {
-	gnutls_pubkey_t pubkey;
+	gnutls_pubkey_t pubkey = NULL;
 	gnutls_x509_spki_st params;
-	int ret;
+	int ret, pk;
 
 	ret = _gnutls_x509_crt_read_spki_params(crt, &params);
 	if (ret < 0)
 		return ret;
 
+	pk = gnutls_x509_crt_get_pk_algorithm(crt, NULL);
+	if (pk < 0)
+		pk = GNUTLS_PK_UNKNOWN;
+
+	if (pk == GNUTLS_PK_UNKNOWN)
+		goto cleanup; /* print basic info only */
+
 	ret = gnutls_pubkey_init(&pubkey);
 	if (ret < 0)
 		return ret;
 
 	ret = gnutls_pubkey_import_x509(pubkey, crt, 0);
-	if (ret < 0)
+	if (ret < 0) {
+		addf(str, "error importing public key: %s\n", gnutls_strerror(ret));
 		goto cleanup;
+	}
 
 	print_pubkey(str, _("Subject "), pubkey, &params, format);
 	ret = 0;
 
-      cleanup:
-	gnutls_pubkey_deinit(pubkey);
+ cleanup:
+	if (pubkey)
+		gnutls_pubkey_deinit(pubkey);
 
 	if (ret < 0) { /* print only name */
 		const char *p;