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

Move PKCS#9 attribute lists to pkcs7 plugin, as we currently use it there only

Browse Source
This commit is contained in:
Martin Willi
2012-12-19 10:32:08 +01:00
parent 804ba5bb50
commit 03ba8f9e8c
6 changed files with 48 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/crypto/pkcs9.c
-270
View File
@@ -1,270 +0,0 @@
/*
* Copyright (C) 2012 Tobias Brunner
* Copyright (C) 2008 Andreas Steffen
* Hochschule fuer Technik Rapperswil, Switzerland
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
#include <library.h>
#include <utils/debug.h>
#include <asn1/oid.h>
#include <asn1/asn1.h>
#include <asn1/asn1_parser.h>
#include <collections/linked_list.h>
#include "pkcs9.h"
typedef struct private_pkcs9_t private_pkcs9_t;
typedef struct attribute_t attribute_t;
/**
* Private data of a pkcs9_t attribute list.
*/
struct private_pkcs9_t {
/**
* Public interface
*/
pkcs9_t public;
/**
* DER encoding of PKCS#9 attributes
*/
chunk_t encoding;
/**
* Linked list of PKCS#9 attributes
*/
linked_list_t *attributes;
};
/**
* Definition of an attribute_t object.
*/
struct attribute_t {
/**
* Object Identifier (OID)
*/
int oid;
/**
* Attribute value
*/
chunk_t value;
/**
* ASN.1 encoding
*/
chunk_t encoding;
};
/**
* Destroy an attribute_t object.
*/
static void attribute_destroy(attribute_t *this)
{
free(this->value.ptr);
free(this);
}
/**
* Create an attribute_t object.
*/
static attribute_t *attribute_create(int oid, chunk_t value)
{
attribute_t *this;
INIT(this,
.oid = oid,
.value = chunk_clone(value),
);
return this;
}
/**
* Build encoding of the attribute list
*/
static void build_encoding(private_pkcs9_t *this)
{
enumerator_t *enumerator;
attribute_t *attribute;
u_int len = 0, count, i = 0;
chunk_t *chunks;
u_char *pos;
count = this->attributes->get_count(this->attributes);
chunks = malloc(sizeof(chunk_t) * count);
enumerator = this->attributes->create_enumerator(this->attributes);
while (enumerator->enumerate(enumerator, &attribute))
{
chunks[i] = asn1_wrap(ASN1_SEQUENCE, "mm",
asn1_build_known_oid(attribute->oid),
asn1_wrap(ASN1_SET, "c", attribute->value));
len += chunks[i].len;
i++;
}
enumerator->destroy(enumerator);
pos = asn1_build_object(&this->encoding, ASN1_SET, len);
for (i = 0; i < count; i++)
{
memcpy(pos, chunks[i].ptr, chunks[i].len);
pos += chunks[i].len;
free(chunks[i].ptr);
}
free(chunks);
}
METHOD(pkcs9_t, get_encoding, chunk_t,
private_pkcs9_t *this)
{
if (!this->encoding.len)
{
build_encoding(this);
}
return this->encoding;
}
METHOD(pkcs9_t, get_attribute, chunk_t,
private_pkcs9_t *this, int oid)
{
enumerator_t *enumerator;
chunk_t value = chunk_empty;
attribute_t *attribute;
enumerator = this->attributes->create_enumerator(this->attributes);
while (enumerator->enumerate(enumerator, &attribute))
{
if (attribute->oid == oid)
{
value = attribute->value;
break;
}
}
enumerator->destroy(enumerator);
if (value.len && asn1_unwrap(&value, &value) != ASN1_INVALID)
{
return value;
}
return chunk_empty;
}
METHOD(pkcs9_t, add_attribute, void,
private_pkcs9_t *this, int oid, chunk_t value)
{
this->attributes->insert_last(this->attributes,
attribute_create(oid, value));
chunk_free(&value);
/* rebuild encoding when adding attributes */
chunk_free(&this->encoding);
}
METHOD(pkcs9_t, destroy, void,
private_pkcs9_t *this)
{
this->attributes->destroy_function(this->attributes,
(void*)attribute_destroy);
free(this->encoding.ptr);
free(this);
}
/*
* Described in header.
*/
pkcs9_t *pkcs9_create(void)
{
private_pkcs9_t *this;
INIT(this,
.public = {
.get_encoding = _get_encoding,
.get_attribute = _get_attribute,
.add_attribute = _add_attribute,
.destroy = _destroy,
},
.attributes = linked_list_create(),
);
return &this->public;
}
/**
* ASN.1 definition of the X.501 atttribute type
*/
static const asn1Object_t attributesObjects[] = {
{ 0, "attributes", ASN1_SET, ASN1_LOOP }, /* 0 */
{ 1, "attribute", ASN1_SEQUENCE, ASN1_NONE }, /* 1 */
{ 2, "type", ASN1_OID, ASN1_BODY }, /* 2 */
{ 2, "values", ASN1_SET, ASN1_LOOP }, /* 3 */
{ 3, "value", ASN1_EOC, ASN1_RAW }, /* 4 */
{ 2, "end loop", ASN1_EOC, ASN1_END }, /* 5 */
{ 0, "end loop", ASN1_EOC, ASN1_END }, /* 6 */
{ 0, "exit", ASN1_EOC, ASN1_EXIT }
};
#define ATTRIBUTE_OBJ_TYPE 2
#define ATTRIBUTE_OBJ_VALUE 4
/**
* Parse a PKCS#9 attribute list
*/
static bool parse_attributes(chunk_t chunk, int level0, private_pkcs9_t* this)
{
asn1_parser_t *parser;
chunk_t object;
int objectID;
int oid = OID_UNKNOWN;
bool success = FALSE;
parser = asn1_parser_create(attributesObjects, chunk);
parser->set_top_level(parser, level0);
while (parser->iterate(parser, &objectID, &object))
{
switch (objectID)
{
case ATTRIBUTE_OBJ_TYPE:
oid = asn1_known_oid(object);
break;
case ATTRIBUTE_OBJ_VALUE:
if (oid != OID_UNKNOWN)
{
this->attributes->insert_last(this->attributes,
attribute_create(oid, object));
}
break;
}
}
success = parser->success(parser);
parser->destroy(parser);
return success;
}
/*
* Described in header.
*/
pkcs9_t *pkcs9_create_from_chunk(chunk_t chunk, u_int level)
{
private_pkcs9_t *this = (private_pkcs9_t*)pkcs9_create();
this->encoding = chunk_clone(chunk);
if (!parse_attributes(chunk, level, this))
{
destroy(this);
return NULL;
}
return &this->public;
}
src/libstrongswan/crypto/pkcs9.h
-79
View File
@@ -1,79 +0,0 @@
/*
* Copyright (C) 2012 Tobias Brunner
* Copyright (C) 2008 Andreas Steffen
* Hochschule fuer Technik Rapperswil, Switzerland
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
/**
* @defgroup pkcs9 pkcs9
* @{ @ingroup crypto
*/
#ifndef PKCS9_H_
#define PKCS9_H_
typedef struct pkcs9_t pkcs9_t;
#include <library.h>
/**
* PKCS#9 attribute lists.
*/
struct pkcs9_t {
/**
* Gets ASN.1 encoding of PKCS#9 attribute list.
*
* @return ASN.1 encoded PKCSI#9 list
*/
chunk_t (*get_encoding) (pkcs9_t *this);
/**
* Gets a PKCS#9 attribute from the list.
*
* @param oid OID of the attribute
* @return value of the attribute (internal data)
*/
chunk_t (*get_attribute) (pkcs9_t *this, int oid);
/**
* Adds a PKCS#9 attribute.
*
* @param oid OID of the attribute
* @param value value of the attribute, with ASN1 type (gets owned)
*/
void (*add_attribute) (pkcs9_t *this, int oid, chunk_t value);
/**
* Destroys the PKCS#9 attribute list.
*/
void (*destroy) (pkcs9_t *this);
};
/**
* Read a PKCS#9 attribute list from a DER encoded chunk.
*
* @param chunk chunk containing DER encoded data
* @param level ASN.1 parsing start level
* @return created pkcs9 attribute list, or NULL if invalid.
*/
pkcs9_t *pkcs9_create_from_chunk(chunk_t chunk, u_int level);
/**
* Create an empty PKCS#9 attribute list
*
* @return created pkcs9 attribute list.
*/
pkcs9_t *pkcs9_create(void);
#endif /** PKCS9_H_ @}*/