From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Tue, 2 Jun 2015 09:13:41 +0000 (+0200)
Subject: Added gnutls_pkcs7_get_crl_raw2
X-Git-Tag: gnutls_3_4_2~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=508a3fca52a7cc8eb9facdba68bf5898af9869ff;p=thirdparty%2Fgnutls.git

Added gnutls_pkcs7_get_crl_raw2
---

diff --git a/lib/includes/gnutls/pkcs7.h b/lib/includes/gnutls/pkcs7.h
index 7955dd601a..fdf61df26a 100644
--- a/lib/includes/gnutls/pkcs7.h
+++ b/lib/includes/gnutls/pkcs7.h
@@ -94,6 +94,9 @@ int gnutls_pkcs7_verify(gnutls_pkcs7_t pkcs7, gnutls_x509_trust_list_t tl,
 int
 gnutls_pkcs7_get_crt_raw2(gnutls_pkcs7_t pkcs7,
 			 int indx, gnutls_datum_t *cert);
+int
+gnutls_pkcs7_get_crl_raw2(gnutls_pkcs7_t pkcs7,
+			  int indx, gnutls_datum_t *crl);
 
 
 /* *INDENT-OFF* */
diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 2c5a645ad2..6f8d97ffca 100644
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -1032,6 +1032,7 @@ GNUTLS_3_4
 	gnutls_pkcs7_get_signature_info;
 	gnutls_pkcs7_verify_direct;
 	gnutls_pkcs7_verify;
+	gnutls_pkcs7_get_crl_raw2;
  local:
 	*;
 };
diff --git a/lib/x509/pkcs7.c b/lib/x509/pkcs7.c
index 781d21b350..a25a4c649b 100644
--- a/lib/x509/pkcs7.c
+++ b/lib/x509/pkcs7.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2003-2012 Free Software Foundation, Inc.
+ * Copyright (C) 2003-2015 Free Software Foundation, Inc.
+ * Copyright (C) 2015 Red Hat, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -1346,23 +1347,20 @@ int gnutls_pkcs7_delete_crt(gnutls_pkcs7_t pkcs7, int indx)
  */
 
 /**
- * gnutls_pkcs7_get_crl_raw:
+ * gnutls_pkcs7_get_crl_raw2:
  * @pkcs7: The pkcs7 type
  * @indx: contains the index of the crl to extract
- * @crl: the contents of the crl will be copied there (may be null)
- * @crl_size: should hold the size of the crl
+ * @crl: will contain the contents of the CRL in an allocated buffer
  *
- * This function will return a crl of the PKCS7 or RFC2630 crl set.
+ * This function will return a DER encoded CRL of the PKCS7 or RFC2630 crl set.
  *
  * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
- *   negative error value.  If the provided buffer is not long enough,
- *   then @crl_size is updated and %GNUTLS_E_SHORT_MEMORY_BUFFER is
- *   returned.  After the last crl has been read
+ *   negative error value.  After the last crl has been read
  *   %GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE will be returned.
  **/
 int
-gnutls_pkcs7_get_crl_raw(gnutls_pkcs7_t pkcs7,
-			 int indx, void *crl, size_t * crl_size)
+gnutls_pkcs7_get_crl_raw2(gnutls_pkcs7_t pkcs7,
+			  int indx, gnutls_datum_t *crl)
 {
 	int result;
 	char root2[ASN1_MAX_NAME_SIZE];
@@ -1396,22 +1394,52 @@ gnutls_pkcs7_get_crl_raw(gnutls_pkcs7_t pkcs7,
 
 	end = end - start + 1;
 
-	if ((unsigned) end > *crl_size) {
-		*crl_size = end;
-		result = GNUTLS_E_SHORT_MEMORY_BUFFER;
+	result = _gnutls_set_datum(crl, &tmp.data[start], end);
+
+      cleanup:
+	_gnutls_free_datum(&tmp);
+	return result;
+}
+
+/**
+ * gnutls_pkcs7_get_crl_raw:
+ * @pkcs7: The pkcs7 type
+ * @indx: contains the index of the crl to extract
+ * @crl: the contents of the crl will be copied there (may be null)
+ * @crl_size: should hold the size of the crl
+ *
+ * This function will return a crl of the PKCS7 or RFC2630 crl set.
+ *
+ * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
+ *   negative error value.  If the provided buffer is not long enough,
+ *   then @crl_size is updated and %GNUTLS_E_SHORT_MEMORY_BUFFER is
+ *   returned.  After the last crl has been read
+ *   %GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE will be returned.
+ **/
+int
+gnutls_pkcs7_get_crl_raw(gnutls_pkcs7_t pkcs7,
+			 int indx, void *crl, size_t * crl_size)
+{
+	int ret;
+	gnutls_datum_t tmp = {NULL, 0};
+
+	ret = gnutls_pkcs7_get_crl_raw2(pkcs7, indx, &tmp);
+	if (ret < 0)
+		return gnutls_assert_val(ret);
+
+	if ((unsigned) tmp.size > *crl_size) {
+		*crl_size = tmp.size;
+		ret = GNUTLS_E_SHORT_MEMORY_BUFFER;
 		goto cleanup;
 	}
 
+	*crl_size = tmp.size;
 	if (crl)
-		memcpy(crl, &tmp.data[start], end);
-
-	*crl_size = end;
-
-	result = 0;
+		memcpy(crl, tmp.data, tmp.size);
 
       cleanup:
 	_gnutls_free_datum(&tmp);
-	return result;
+	return ret;
 }
 
 /**