when importing a certificate, keep the DER data

1 files changed, 14 insertions, 7 deletions

diff --git a/lib/x509/common.c b/lib/x509/common.c
index f31f0cfdd7..cbe96ff28b 100644
--- a/lib/x509/common.c
+++ b/lib/x509/common.c
@@ -1513,16 +1513,22 @@ _gnutls_x509_get_pk_algorithm(ASN1_TYPE src, const char *src_name,
  * returns them into signed_data.
  */
 int
-_gnutls_x509_get_signed_data(ASN1_TYPE src, const char *src_name,
+_gnutls_x509_get_signed_data(ASN1_TYPE src,  const gnutls_datum *_der,
+			     const char *src_name,
 			     gnutls_datum_t * signed_data)
 {
-	gnutls_datum_t der;
 	int start, end, result;
+	gnutls_datum_t der;
 
-	result = _gnutls_x509_der_encode(src, "", &der, 0);
-	if (result < 0) {
-		gnutls_assert();
-		return result;
+	if (_der == NULL) {
+		result = _gnutls_x509_der_encode(src, "", &der, 0);
+		if (result < 0) {
+			gnutls_assert();
+			return result;
+		}
+	} else {
+		der.data = _der->data;
+		der.size = _der->size;
 	}
 
 	/* Get the signed data
@@ -1547,7 +1553,8 @@ _gnutls_x509_get_signed_data(ASN1_TYPE src, const char *src_name,
 	result = 0;
 
       cleanup:
-	_gnutls_free_datum(&der);
+	if (_der == NULL)
+		_gnutls_free_datum(&der);
 
 	return result;
 }