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

Migrated crypto/pkcs7 to INIT/METHOD macros

Browse Source
This commit is contained in:
Andreas Steffen
2011-10-02 11:11:46 +02:00
parent 58a8309c21
commit ae84beff76
1 changed files with 49 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/crypto/pkcs7.c
+49 -84
View File
@@ -121,26 +121,20 @@ static const chunk_t ASN1_des_cbc_oid = chunk_from_chars(
0x2B, 0x0E, 0x03, 0x02, 0x07 0x2B, 0x0E, 0x03, 0x02, 0x07
); );
/** METHOD(pkcs7_t, is_data, bool,
* Implements pkcs7_t.is_data. private_pkcs7_t *this)
*/
static bool is_data(private_pkcs7_t *this)
{ {
return this->type == OID_PKCS7_DATA; return this->type == OID_PKCS7_DATA;
} }
/** METHOD(pkcs7_t, is_signedData, bool,
* Implements pkcs7_t.is_signedData. private_pkcs7_t *this)
*/
static bool is_signedData(private_pkcs7_t *this)
{ {
return this->type == OID_PKCS7_SIGNED_DATA; return this->type == OID_PKCS7_SIGNED_DATA;
} }
/** METHOD(pkcs7_t, is_envelopedData, bool,
* Implements pkcs7_t.is_envelopedData. private_pkcs7_t *this)
*/
static bool is_envelopedData(private_pkcs7_t *this)
{ {
return this->type == OID_PKCS7_ENVELOPED_DATA; return this->type == OID_PKCS7_ENVELOPED_DATA;
} }
@@ -165,10 +159,8 @@ static bool abort_parsing(private_pkcs7_t *this, int type)
return FALSE; return FALSE;
} }
/** METHOD(pkcs7_t, parse_data, bool,
* Implements pkcs7_t.parse_data. private_pkcs7_t *this)
*/
static bool parse_data(private_pkcs7_t *this)
{ {
chunk_t data = this->content; chunk_t data = this->content;
@@ -238,10 +230,8 @@ static const asn1Object_t signedDataObjects[] = {
#define PKCS7_DIGEST_ENC_ALGORITHM 21 #define PKCS7_DIGEST_ENC_ALGORITHM 21
#define PKCS7_ENCRYPTED_DIGEST 22 #define PKCS7_ENCRYPTED_DIGEST 22
/** METHOD(pkcs7_t, parse_signedData, bool,
* Implements pkcs7_t.parse_signedData. private_pkcs7_t *this, x509_t *cacert)
*/
static bool parse_signedData(private_pkcs7_t *this, x509_t *cacert)
{ {
asn1_parser_t *parser; asn1_parser_t *parser;
chunk_t object; chunk_t object;
@@ -448,11 +438,8 @@ static const asn1Object_t envelopedDataObjects[] = {
#define PKCS7_CONTENT_ENC_ALGORITHM 13 #define PKCS7_CONTENT_ENC_ALGORITHM 13
#define PKCS7_ENCRYPTED_CONTENT 14 #define PKCS7_ENCRYPTED_CONTENT 14
/** METHOD(parse_envelopedData, bool,
* Parse PKCS#7 envelopedData content private_pkcs7_t *this, chunk_t serialNumber, rsa_private_key_t *key)
*/
static bool parse_envelopedData(private_pkcs7_t *this, chunk_t serialNumber,
rsa_private_key_t *key)
{ {
asn1_parser_t *parser; asn1_parser_t *parser;
chunk_t object; chunk_t object;
@@ -618,18 +605,14 @@ failed:
return FALSE; return FALSE;
} }
/** METHOD(pkcs7_t, get_data, chunk_t,
* Implements pkcs7_t.get_data. private_pkcs7_t *this)
*/
static chunk_t get_data(private_pkcs7_t *this)
{ {
return this->data; return this->data;
} }
/** METHOD(pkcs7_t, get_contentInfo, chunk_t,
* Implements pkcs7_t.get_contentInfo. private_pkcs7_t *this)
*/
static chunk_t get_contentInfo(private_pkcs7_t *this)
{ {
chunk_t content_type; chunk_t content_type;
@@ -668,18 +651,14 @@ static chunk_t get_contentInfo(private_pkcs7_t *this)
); );
} }
/** METHOD(pkcs7_t, create_certificate_enumerator, enumerator_t*,
* Implements pkcs7_t.create_certificate_enumerator private_pkcs7_t *this)
*/
static enumerator_t *create_certificate_enumerator(const private_pkcs7_t *this)
{ {
return this->certs->create_enumerator(this->certs); return this->certs->create_enumerator(this->certs);
} }
/** METHOD(pkcs7_t, set_certificate, void,
* Implements pkcs7_t.set_certificate private_pkcs7_t *this, x509_t *cert)
*/
static void set_certificate(private_pkcs7_t *this, x509_t *cert)
{ {
if (cert) if (cert)
{ {
@@ -688,10 +667,8 @@ static void set_certificate(private_pkcs7_t *this, x509_t *cert)
} }
} }
/** METHOD(pkcs7_t, set_attributes, void,
* Implements pkcs7_t.set_attributes private_pkcs7_t *this, pkcs9_t *attributes)
*/
static void set_attributes(private_pkcs7_t *this, pkcs9_t *attributes)
{ {
this->attributes = attributes; this->attributes = attributes;
} }
@@ -708,11 +685,8 @@ chunk_t pkcs7_build_issuerAndSerialNumber(x509_t *cert)
asn1_simple_object(ASN1_INTEGER, cert->get_serialNumber(cert))); asn1_simple_object(ASN1_INTEGER, cert->get_serialNumber(cert)));
} }
/** METHOD(pkcs7_t, build_envelopedData, bool,
* Implements pkcs7_t.build_envelopedData. private_pkcs7_t *this, x509_t *cert, encryption_algorithm_t alg)
*/
bool build_envelopedData(private_pkcs7_t *this, x509_t *cert,
encryption_algorithm_t alg)
{ {
chunk_t iv, symmetricKey, in, out, alg_oid; chunk_t iv, symmetricKey, in, out, alg_oid;
crypter_t *crypter; crypter_t *crypter;
@@ -819,11 +793,8 @@ bool build_envelopedData(private_pkcs7_t *this, x509_t *cert,
return TRUE; return TRUE;
} }
/** METHOD(pkcs7_t, build_signedData, bool,
* Implements pkcs7_t.build_signedData. private_pkcs7_t *this, rsa_private_key_t *private_key, hash_algorithm_t alg)
*/
bool build_signedData(private_pkcs7_t *this, rsa_private_key_t *private_key,
hash_algorithm_t alg)
{ {
int signature_oid = hasher_signature_algorithm_to_oid(alg, int signature_oid = hasher_signature_algorithm_to_oid(alg,
private_key->get_type(private_key)); private_key->get_type(private_key));
@@ -916,10 +887,8 @@ bool build_signedData(private_pkcs7_t *this, rsa_private_key_t *private_key,
return TRUE; return TRUE;
} }
/** METHOD(pkcs7_t, destroy, void,
* Implements pkcs7_t.destroy private_pkcs7_t *this)
*/
static void destroy(private_pkcs7_t *this)
{ {
DESTROY_IF(this->attributes); DESTROY_IF(this->attributes);
this->certs->destroy_offset(this->certs, offsetof(x509_t, destroy)); this->certs->destroy_offset(this->certs, offsetof(x509_t, destroy));
@@ -984,32 +953,28 @@ end:
*/ */
static private_pkcs7_t *pkcs7_create_empty(void) static private_pkcs7_t *pkcs7_create_empty(void)
{ {
private_pkcs7_t *this = malloc_thing(private_pkcs7_t); private_pkcs7_t *this;
/* initialize */ INIT(this,
this->type = OID_UNKNOWN; .public = {
this->content = chunk_empty; .is_data = _is_data,
this->parsed = FALSE; .is_signedData = _is_signedData,
this->level = 0; .is_envelopedData = _is_envelopedData,
this->data = chunk_empty; .parse_data = _parse_data,
this->attributes = NULL; .parse_signedData = _parse_signedData,
this->certs = linked_list_create(); .parse_envelopedData = _parse_envelopedData,
.get_data = _get_data,
/*public functions */ .get_contentInfo = _get_contentInfo,
this->public.is_data = (bool (*) (pkcs7_t*))is_data; .create_certificate_enumerator = _create_certificate_enumerator,
this->public.is_signedData = (bool (*) (pkcs7_t*))is_signedData; .set_certificate = _set_certificate,
this->public.is_envelopedData = (bool (*) (pkcs7_t*))is_envelopedData; .set_attributes = _set_attributes,
this->public.parse_data = (bool (*) (pkcs7_t*))parse_data; .build_envelopedData = _build_envelopedData,
this->public.parse_signedData = (bool (*) (pkcs7_t*,x509_t*))parse_signedData; .build_signedData = _build_signedData,
this->public.parse_envelopedData = (bool (*) (pkcs7_t*,chunk_t,rsa_private_key_t*))parse_envelopedData; .destroy = _destroy,
this->public.get_data = (chunk_t (*) (pkcs7_t*))get_data; },
this->public.get_contentInfo = (chunk_t (*) (pkcs7_t*))get_contentInfo; .type = OID_UNKNOWN,
this->public.create_certificate_enumerator = (enumerator_t* (*) (pkcs7_t*))create_certificate_enumerator; .certs = linked_list_create(),
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;
this->public.build_signedData = (bool (*) (pkcs7_t*,rsa_private_key_t*,hash_algorithm_t))build_signedData;
this->public.destroy = (void (*) (pkcs7_t*))destroy;
return this; return this;
} }