diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2009-06-05 21:14:31 +0200 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2009-06-09 11:03:32 +0200 |
| commit | 8b799d55ce5b0cf48b6d1dd0c3ca6a1474234ed6 (patch) | |
| tree | 6933a085f303dd3e232683cbdb9a25b99078b187 /src/pluto/pkcs7.h | |
| parent | b00fbdb55a1054b35270051722cdcd8c059a337a (diff) | |
| download | strongswan-8b799d55ce5b0cf48b6d1dd0c3ca6a1474234ed6.tar.bz2 strongswan-8b799d55ce5b0cf48b6d1dd0c3ca6a1474234ed6.tar.xz | |
pluto and scepclient use private and public key plugins of libstrongswan
Diffstat (limited to 'src/pluto/pkcs7.h')
| -rw-r--r-- | src/pluto/pkcs7.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pluto/pkcs7.h b/src/pluto/pkcs7.h index 09ffd65d5..028822dfe 100644 --- a/src/pluto/pkcs7.h +++ b/src/pluto/pkcs7.h @@ -1,6 +1,7 @@ /* Support of PKCS#7 data structures * Copyright (C) 2005 Jan Hutter, Martin Willi - * Copyright (C) 2002-2005 Andreas Steffen + * Copyright (C) 2002-2009 Andreas Steffen + * * Hochschule fuer Technik Rapperswil, Switzerland * * This program is free software; you can redistribute it and/or modify it @@ -18,9 +19,8 @@ #define _PKCS7_H #include <crypto/crypters/crypter.h> - +#include <credentials/keys/private_key.h> #include "defs.h" -#include "pkcs1.h" #include "x509.h" /* Access structure for a PKCS#7 ContentInfo object */ @@ -39,12 +39,12 @@ extern bool pkcs7_parse_contentInfo(chunk_t blob, u_int level0, extern bool pkcs7_parse_signedData(chunk_t blob, contentInfo_t *data, x509cert_t **cert, chunk_t *attributes, const x509cert_t *cacert); extern bool pkcs7_parse_envelopedData(chunk_t blob, chunk_t *data, - chunk_t serialNumber, const RSA_private_key_t *key); + chunk_t serialNumber, private_key_t *key); extern chunk_t pkcs7_contentType_attribute(void); extern chunk_t pkcs7_messageDigest_attribute(chunk_t content, int digest_alg); extern chunk_t pkcs7_build_issuerAndSerialNumber(const x509cert_t *cert); extern chunk_t pkcs7_build_signedData(chunk_t data, chunk_t attributes, - const x509cert_t *cert, int digest_alg, const RSA_private_key_t *key); + const x509cert_t *cert, int digest_alg, private_key_t *key); extern chunk_t pkcs7_build_envelopedData(chunk_t data, const x509cert_t *cert, int enc_alg); |