From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Thu, 3 Aug 2017 13:08:43 +0000 (+0200)
Subject: gnutls_x509_privkey_import: immediately exit on GNUTLS_E_PK_INVALID_PRIVKEY
X-Git-Tag: gnutls_3_6_0~164
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8152bbd3039851bc8963c926fffa25a7fb42386a;p=thirdparty%2Fgnutls.git

gnutls_x509_privkey_import: immediately exit on GNUTLS_E_PK_INVALID_PRIVKEY

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

diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index 7b8423c47e..b7c5038db0 100644
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -585,6 +585,7 @@ gnutls_x509_privkey_import(gnutls_x509_privkey_t key,
 		if (result < 0) {
 			gnutls_assert();
 			key->key = NULL;
+			goto cleanup;
 		}
 	} else if (key->params.algo == GNUTLS_PK_RSA) {
 		key->key =
@@ -624,6 +625,8 @@ gnutls_x509_privkey_import(gnutls_x509_privkey_t key,
 					if (result < 0) {
 						gnutls_assert();
 						key->key = NULL;
+						if (result == GNUTLS_E_PK_INVALID_PRIVKEY)
+							goto cleanup;
 					}
 				}