merged the modularization branch (credentials) back to trunk

This commit is contained in:
Martin Willi
2008-03-13 14:14:44 +00:00
parent 2df655134c
commit 552cc11b1f
495 changed files with 30378 additions and 23843 deletions
+32 -61
View File
@@ -1,10 +1,3 @@
/**
* @file pkcs7.h
*
* @brief Interface of pkcs7_t.
*
*/
/*
* Copyright (C) 2005 Jan Hutter, Martin Willi
* Copyright (C) 2002-2008 Andreas Steffen
@@ -21,11 +14,16 @@
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* RCSID $Id$
* $Id$
*/
/**
* @defgroup pkcs7 pkcs7
* @{ @ingroup crypto
*/
#ifndef _PKCS7_H
#define _PKCS7_H
#ifndef _PKCS7_H_
#define _PKCS7_H_
typedef struct pkcs7_t pkcs7_t;
@@ -37,60 +35,48 @@ typedef struct pkcs7_t pkcs7_t;
#include <utils/iterator.h>
/**
* @brief PKCS#7 contentInfo object.
*
* @b Constructors:
* -pkcs7_create_from_chunk()
* -pkcs7_create_from_data()
*
* @ingroup crypto
* PKCS#7 contentInfo object.
*/
struct pkcs7_t {
/**
* @brief Check if the PKCS#7 contentType is data
* Check if the PKCS#7 contentType is data
*
* @param this calling object
* @return TRUE if the contentType is data
*/
bool (*is_data) (pkcs7_t *this);
/**
* @brief Check if the PKCS#7 contentType is signedData
* Check if the PKCS#7 contentType is signedData
*
* @param this calling object
* @return TRUE if the contentType is signedData
*/
bool (*is_signedData) (pkcs7_t *this);
/**
* @brief Check if the PKCS#7 contentType is envelopedData
* Check if the PKCS#7 contentType is envelopedData
*
* @param this calling object
* @return TRUE if the contentType is envelopedData
*/
bool (*is_envelopedData) (pkcs7_t *this);
/**
* @brief Parse a PKCS#7 data content.
* Parse a PKCS#7 data content.
*
* @param this calling object
* @return TRUE if parsing was successful
*/
bool (*parse_data) (pkcs7_t *this);
/**
* @brief Parse a PKCS#7 signedData content.
* Parse a PKCS#7 signedData content.
*
* @param this calling object
* @param cacert cacert used to verify the signature
* @return TRUE if parsing was successful
*/
bool (*parse_signedData) (pkcs7_t *this, x509_t *cacert);
/**
* @brief Parse a PKCS#7 envelopedData content.
* Parse a PKCS#7 envelopedData content.
*
* @param this calling object
* @param serialNumber serialNumber of the request
* @param key RSA private key used to decrypt the symmetric key
* @return TRUE if parsing was successful
@@ -98,112 +84,97 @@ struct pkcs7_t {
bool (*parse_envelopedData) (pkcs7_t *this, chunk_t serialNumber, rsa_private_key_t *key);
/**
* @brief Returns the parsed data object
* Returns the parsed data object
*
* @param this calling object
* @return chunk containing the data object
*/
chunk_t (*get_data) (pkcs7_t *this);
/**
* @brief Returns the a DER-encoded contentInfo object
* Returns the a DER-encoded contentInfo object
*
* @param this calling object
* @return chunk containing the contentInfo object
*/
chunk_t (*get_contentInfo) (pkcs7_t *this);
/**
* @brief Create an iterator for the certificates.
* Create an iterator for the certificates.
*
* @param this calling object
* @return iterator for the certificates
*/
iterator_t *(*create_certificate_iterator) (pkcs7_t *this);
/**
* @brief Add a certificate.
* Add a certificate.
*
* @param this calling object
* @param cert certificate to be included
*/
void (*set_certificate) (pkcs7_t *this, x509_t *cert);
/**
* @brief Add authenticated attributes.
* Add authenticated attributes.
*
* @param this calling object
* @param attributes attributes to be included
*/
void (*set_attributes) (pkcs7_t *this, pkcs9_t *attributes);
/**
* @brief Build a data object
* Build a data object
*
* @param this PKCS#7 data to be built
* @return TRUE if build was successful
*/
bool (*build_data) (pkcs7_t *this);
/**
* @brief Build an envelopedData object
* Build an envelopedData object
*
* @param this PKCS#7 data object to envelop
* @param cert receivers's certificate
* @param alg encryption algorithm
* @return TRUE if build was successful
*/
bool (*build_envelopedData) (pkcs7_t *this, x509_t *cert, encryption_algorithm_t alg);
bool (*build_envelopedData) (pkcs7_t *this, x509_t *cert,
encryption_algorithm_t alg);
/**
* @brief Build an signedData object
* Build an signedData object
*
* @param this PKCS#7 data object to sign
* @param key signer's RSA private key
* @param alg digest algorithm used for signature
* @return TRUE if build was successful
*/
bool (*build_signedData) (pkcs7_t *this, rsa_private_key_t *key, hash_algorithm_t alg);
bool (*build_signedData) (pkcs7_t *this, rsa_private_key_t *key,
hash_algorithm_t alg);
/**
* @brief Destroys the contentInfo object.
*
* @param this PKCS#7 contentInfo object to destroy
* Destroys the contentInfo object.
*/
void (*destroy) (pkcs7_t *this);
};
/**
* @brief Read a PKCS#7 contentInfo object from a DER encoded chunk.
* Read a PKCS#7 contentInfo object from a DER encoded chunk.
*
* @param chunk chunk containing DER encoded data
* @param level ASN.1 parsing start level
* @return created pkcs7_contentInfo object, or NULL if invalid.
*
* @ingroup crypto
*/
pkcs7_t *pkcs7_create_from_chunk(chunk_t chunk, u_int level);
/**
* @brief Create a PKCS#7 contentInfo object
* Create a PKCS#7 contentInfo object
*
* @param chunk chunk containing data
* @return created pkcs7_contentInfo object.
*
* @ingroup crypto
*/
pkcs7_t *pkcs7_create_from_data(chunk_t data);
/**
* @brief Read a X.509 certificate from a DER encoded file.
* Read a X.509 certificate from a DER encoded file.
*
* @param filename file containing DER encoded data
* @param label label describing kind of PKCS#7 file
* @return created pkcs7_t object, or NULL if invalid.
*
* @ingroup crypto
*/
pkcs7_t *pkcs7_create_from_file(const char *filename, const char *label);
#endif /* _PKCS7_H */
#endif /* _PKCS7_H_ @} */