denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced pkcs7_t.create_certificate_iterator with enumerator.

Browse Source 
The method is currently not used.
This commit is contained in:
Tobias Brunner
2011-07-06 09:43:45 +02:00
parent e26304348c
commit 4f9c691adb
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/crypto/pkcs7.c
+4 -4
View File
@@ -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.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_data = (chunk_t (*) (pkcs7_t*))get_data;
this->public.get_contentInfo = (chunk_t (*) (pkcs7_t*))get_contentInfo; 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_certificate = (void (*) (pkcs7_t*,x509_t*))set_certificate;
this->public.set_attributes = (void (*) (pkcs7_t*,pkcs9_t*))set_attributes; 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; this->public.build_envelopedData = (bool (*) (pkcs7_t*,x509_t*,encryption_algorithm_t))build_envelopedData;
src/libstrongswan/crypto/pkcs7.h
+4 -4
View File
@@ -30,7 +30,7 @@ typedef struct pkcs7_t pkcs7_t;
#include <credentials/keys/private_key.h> #include <credentials/keys/private_key.h>
#include <crypto/pkcs9.h> #include <crypto/pkcs9.h>
#include <crypto/crypters/crypter.h> #include <crypto/crypters/crypter.h>
#include <utils/iterator.h> #include <utils/enumerator.h>
/** /**
* PKCS#7 contentInfo object. * PKCS#7 contentInfo object.
@@ -96,11 +96,11 @@ struct pkcs7_t {
chunk_t (*get_contentInfo) (pkcs7_t *this); 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. * Add a certificate.