Added get_attributes() method to pkcs7_t.

diff --git a/src/libstrongswan/crypto/pkcs7.c b/src/libstrongswan/crypto/pkcs7.c
index a69242ca764081998bad0cce92ac57e4a6567edb..b8ee8ce7a44620dd1a0f0e3647ae85ece5800f77 100644 (file)
--- 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 107f2729fec33af6f003bc4f61601083b5264a0c..531acb373ee1d6c556e34f24afed34e7912cc25a 100644 (file)
--- 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
         *