From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 4 May 2012 17:29:59 +0000 (+0200)
Subject: Added get_attributes() method to pkcs7_t.
X-Git-Tag: 5.0.0~164
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea92d4f305964f6f533fb7540467361ee3e33c4a;p=thirdparty%2Fstrongswan.git

Added get_attributes() method to pkcs7_t.
---

diff --git a/src/libstrongswan/crypto/pkcs7.c b/src/libstrongswan/crypto/pkcs7.c
index a69242ca76..b8ee8ce7a4 100644
--- a/src/libstrongswan/crypto/pkcs7.c
+++ b/src/libstrongswan/crypto/pkcs7.c
@@ -681,6 +681,12 @@ METHOD(pkcs7_t, set_attributes, void,
 	this->attributes = attributes;
 }
 
+METHOD(pkcs7_t, get_attributes, pkcs9_t*,
+	private_pkcs7_t *this)
+{
+	return this->attributes;
+}
+
 /**
  * build a DER-encoded issuerAndSerialNumber object
  */
@@ -990,6 +996,7 @@ static private_pkcs7_t *pkcs7_create_empty(void)
 			.create_certificate_enumerator = _create_certificate_enumerator,
 			.set_certificate = _set_certificate,
 			.set_attributes = _set_attributes,
+			.get_attributes = _get_attributes,
 			.build_envelopedData = _build_envelopedData,
 			.build_signedData = _build_signedData,
 			.destroy = _destroy,
diff --git a/src/libstrongswan/crypto/pkcs7.h b/src/libstrongswan/crypto/pkcs7.h
index 107f2729fe..531acb373e 100644
--- a/src/libstrongswan/crypto/pkcs7.h
+++ b/src/libstrongswan/crypto/pkcs7.h
@@ -112,10 +112,17 @@ struct pkcs7_t {
 	/**
 	 * Add authenticated attributes.
 	 *
-	 * @param attributes	attributes to be included
+	 * @param attributes	attributes to be included (gets adopted)
 	 */
 	void (*set_attributes) (pkcs7_t *this, pkcs9_t *attributes);
 
+	/**
+	 * Get attributes.
+	 *
+	 * @reutrn				attributes (internal data)
+	 */
+	pkcs9_t *(*get_attributes) (pkcs7_t *this);
+
 	/**
 	 * Build a data object
 	 *