diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-05-11 20:31:19 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-06-11 17:09:19 +0200 |
| commit | c6a2aa49b4893c9de71fb68f4b822a4abdfc46d4 (patch) | |
| tree | 39f27b9cf504029d9497f4e76a0f5ff3801fe581 /src/scepclient/scep.h | |
| parent | ea92d4f305964f6f533fb7540467361ee3e33c4a (diff) | |
| download | strongswan-c6a2aa49b4893c9de71fb68f4b822a4abdfc46d4.tar.bz2 strongswan-c6a2aa49b4893c9de71fb68f4b822a4abdfc46d4.tar.xz | |
scepclient: Use pkcs7_t and pkcs9_t, remove all dependencies to pluto/libfreeswan.
Diffstat (limited to 'src/scepclient/scep.h')
| -rw-r--r-- | src/scepclient/scep.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/scepclient/scep.h b/src/scepclient/scep.h index 76bf21033..6227faba4 100644 --- a/src/scepclient/scep.h +++ b/src/scepclient/scep.h @@ -1,4 +1,5 @@ /* + * Copyright (C) 2012 Tobias Brunner * Copyright (C) 2005 Jan Hutter, Martin Willi * Hochschule fuer Technik Rapperswil * @@ -16,11 +17,9 @@ #ifndef _SCEP_H #define _SCEP_H +#include <crypto/pkcs7.h> #include <credentials/certificates/certificate.h> -#include "../pluto/defs.h" -#include "../pluto/pkcs7.h" - /* supported SCEP operation types */ typedef enum { SCEP_PKI_OPERATION, @@ -76,13 +75,13 @@ chunk_t scep_transId_attribute(chunk_t transaction_id); chunk_t scep_messageType_attribute(scep_msg_t m); chunk_t scep_senderNonce_attribute(void); chunk_t scep_build_request(chunk_t data, chunk_t transID, scep_msg_t msg, - certificate_t *enc_cert, int enc_alg, - certificate_t *signer_cert, int digest_alg, - private_key_t *private_key); + certificate_t *enc_cert, encryption_algorithm_t enc_alg, + size_t key_size, certificate_t *signer_cert, + hash_algorithm_t digest_alg, private_key_t *private_key); bool scep_http_request(const char *url, chunk_t pkcs7, scep_op_t op, - bool http_get_request, chunk_t *response); + bool http_get_request, chunk_t *response); err_t scep_parse_response(chunk_t response, chunk_t transID, - contentInfo_t *data, scep_attributes_t *attrs, + pkcs7_t **data, scep_attributes_t *attrs, certificate_t *signer_cert); #endif /* _SCEP_H */ |