diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2011-05-19 16:30:43 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2011-07-06 09:43:45 +0200 |
| commit | 4f9c691adbb0763d59b3f58f5bbd3dbb36748a76 (patch) | |
| tree | 0cacf2dd44197384a1392ec5e4673a7d063c8563 | |
| parent | e26304348c80697ae299081567bddf1acbf022e2 (diff) | |
| download | strongswan-4f9c691adbb0763d59b3f58f5bbd3dbb36748a76.tar.bz2 strongswan-4f9c691adbb0763d59b3f58f5bbd3dbb36748a76.tar.xz | |
Replaced pkcs7_t.create_certificate_iterator with enumerator.
The method is currently not used.
| -rw-r--r-- | src/libstrongswan/crypto/pkcs7.c | 8 | ||||
| -rw-r--r-- | src/libstrongswan/crypto/pkcs7.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/libstrongswan/crypto/pkcs7.c b/src/libstrongswan/crypto/pkcs7.c index a4e0b952c..57b25496a 100644 --- a/src/libstrongswan/crypto/pkcs7.c +++ b/src/libstrongswan/crypto/pkcs7.c @@ -669,11 +669,11 @@ static chunk_t get_contentInfo(private_pkcs7_t *this) } /** - * Implements pkcs7_t.create_certificate_iterator + * Implements pkcs7_t.create_certificate_enumerator */ -static iterator_t *create_certificate_iterator(const private_pkcs7_t *this) +static enumerator_t *create_certificate_enumerator(const private_pkcs7_t *this) { - return this->certs->create_iterator(this->certs, TRUE); + return this->certs->create_enumerator(this->certs); } /** @@ -1004,7 +1004,7 @@ static private_pkcs7_t *pkcs7_create_empty(void) this->public.parse_envelopedData = (bool (*) (pkcs7_t*,chunk_t,rsa_private_key_t*))parse_envelopedData; this->public.get_data = (chunk_t (*) (pkcs7_t*))get_data; this->public.get_contentInfo = (chunk_t (*) (pkcs7_t*))get_contentInfo; - this->public.create_certificate_iterator = (iterator_t* (*) (pkcs7_t*))create_certificate_iterator; + this->public.create_certificate_enumerator = (enumerator_t* (*) (pkcs7_t*))create_certificate_enumerator; this->public.set_certificate = (void (*) (pkcs7_t*,x509_t*))set_certificate; this->public.set_attributes = (void (*) (pkcs7_t*,pkcs9_t*))set_attributes; this->public.build_envelopedData = (bool (*) (pkcs7_t*,x509_t*,encryption_algorithm_t))build_envelopedData; diff --git a/src/libstrongswan/crypto/pkcs7.h b/src/libstrongswan/crypto/pkcs7.h index c4d452286..16c53feda 100644 --- a/src/libstrongswan/crypto/pkcs7.h +++ b/src/libstrongswan/crypto/pkcs7.h @@ -30,7 +30,7 @@ typedef struct pkcs7_t pkcs7_t; #include <credentials/keys/private_key.h> #include <crypto/pkcs9.h> #include <crypto/crypters/crypter.h> -#include <utils/iterator.h> +#include <utils/enumerator.h> /** * PKCS#7 contentInfo object. @@ -96,11 +96,11 @@ struct pkcs7_t { chunk_t (*get_contentInfo) (pkcs7_t *this); /** - * Create an iterator for the certificates. + * Create an enumerator for the certificates. * - * @return iterator for the certificates + * @return enumerator for the certificates */ - iterator_t *(*create_certificate_iterator) (pkcs7_t *this); + enumerator_t *(*create_certificate_enumerator) (pkcs7_t *this); /** * Add a certificate. |