Add an enumerator for PKCS#7 contained certificates

diff --git a/src/libstrongswan/credentials/containers/pkcs7.h b/src/libstrongswan/credentials/containers/pkcs7.h
index 68125cdc0dbc511cff9d0b64ef28ba485fe24d4c..d79650e7453f009b03b0a842a29b32eeda906ff3 100644 (file)
--- a/src/libstrongswan/credentials/containers/pkcs7.h
+++ b/src/libstrongswan/credentials/containers/pkcs7.h
@@ -48,6 +48,13 @@ struct pkcs7_t {
         */
        bool (*get_attribute)(pkcs7_t *this, int oid, enumerator_t *enumerator,
                                                  chunk_t *value);
+
+       /**
+        * Create an enumerator over attached certificates.
+        *
+        * @return                              enumerator over certificate_t
+        */
+       enumerator_t* (*create_cert_enumerator)(pkcs7_t *this);
 };
 
 #endif /** PKCS7_H_ @}*/

diff --git a/src/libstrongswan/plugins/pkcs7/pkcs7_data.c b/src/libstrongswan/plugins/pkcs7/pkcs7_data.c
index d0e7e1c759b27180f60bf34712197cb77764220f..06816095c81225088482e93b0a39ed88445f2c88 100644 (file)
--- a/src/libstrongswan/plugins/pkcs7/pkcs7_data.c
+++ b/src/libstrongswan/plugins/pkcs7/pkcs7_data.c
@@ -99,6 +99,7 @@ static private_pkcs7_data_t* create_empty()
                                .destroy = _destroy,
                        },
                        .get_attribute = (void*)return_false,
+                       .create_cert_enumerator = (void*)enumerator_create_empty,
                },
        );
 

diff --git a/src/libstrongswan/plugins/pkcs7/pkcs7_enveloped_data.c b/src/libstrongswan/plugins/pkcs7/pkcs7_enveloped_data.c
index d9bff41e559bfb44af1c517451e28f668d6d6306..6c57ca71e8a273b2d0ff9e5c137021719ffd6bd3 100644 (file)
--- a/src/libstrongswan/plugins/pkcs7/pkcs7_enveloped_data.c
+++ b/src/libstrongswan/plugins/pkcs7/pkcs7_enveloped_data.c
@@ -380,6 +380,7 @@ static private_pkcs7_enveloped_data_t* create_empty()
                                .get_encoding = _get_encoding,
                                .destroy = _destroy,
                        },
+                       .create_cert_enumerator = (void*)enumerator_create_empty,
                        .get_attribute = (void*)return_false,
                },
        );

diff --git a/src/libstrongswan/plugins/pkcs7/pkcs7_signed_data.c b/src/libstrongswan/plugins/pkcs7/pkcs7_signed_data.c
index 5ec5684f423fd2f4b9fa1e76fc792f8f27b67fe4..1fffdc3a5368a4c22b6a42f180b71a09287594d3 100644 (file)
--- a/src/libstrongswan/plugins/pkcs7/pkcs7_signed_data.c
+++ b/src/libstrongswan/plugins/pkcs7/pkcs7_signed_data.c
@@ -330,6 +330,13 @@ METHOD(pkcs7_t, get_attribute, bool,
        return FALSE;
 }
 
+METHOD(pkcs7_t, create_cert_enumerator, enumerator_t*,
+       private_pkcs7_signed_data_t *this)
+{
+       return this->creds->set.create_cert_enumerator(&this->creds->set,
+                                                                                       CERT_ANY, KEY_ANY, NULL, FALSE);
+}
+
 METHOD(container_t, get_data, bool,
        private_pkcs7_signed_data_t *this, chunk_t *data)
 {
@@ -375,6 +382,7 @@ static private_pkcs7_signed_data_t* create_empty()
                                .destroy = _destroy,
                        },
                        .get_attribute = _get_attribute,
+                       .create_cert_enumerator = _create_cert_enumerator,
                },
                .creds = mem_cred_create(),
                .signerinfos = linked_list_create(),