diff options
| author | Adrian-Ken Rueegsegger <ken@codelabs.ch> | 2012-09-25 17:13:19 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-03-19 15:23:48 +0100 |
| commit | 464eb54ba4c425ff6aa61fb5944583a2e1f12c3a (patch) | |
| tree | 87e9c4a8a9d1e1f250e9faaf88c422fd062c2bbd | |
| parent | 0f0165c81f1b33279ad2d10e3b9a8a955d2bf55b (diff) | |
| download | strongswan-464eb54ba4c425ff6aa61fb5944583a2e1f12c3a.tar.bz2 strongswan-464eb54ba4c425ff6aa61fb5944583a2e1f12c3a.tar.xz | |
Add TKM_CTX_CC (Certificate chain context id)
| -rw-r--r-- | src/charon-tkm/src/tkm/tkm.c | 2 | ||||
| -rw-r--r-- | src/charon-tkm/src/tkm/tkm_id_manager.c | 1 | ||||
| -rw-r--r-- | src/charon-tkm/src/tkm/tkm_id_manager.h | 2 | ||||
| -rw-r--r-- | src/charon-tkm/tests/id_manager_tests.c | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/src/charon-tkm/src/tkm/tkm.c b/src/charon-tkm/src/tkm/tkm.c index 6e27586ed..ce4cedcbc 100644 --- a/src/charon-tkm/src/tkm/tkm.c +++ b/src/charon-tkm/src/tkm/tkm.c @@ -91,7 +91,7 @@ bool tkm_init() return FALSE; } - const tkm_limits_t limits = {nc, dh, isa, ae, esa}; + const tkm_limits_t limits = {nc, dh, cc, isa, ae, esa}; INIT(this, .public = { diff --git a/src/charon-tkm/src/tkm/tkm_id_manager.c b/src/charon-tkm/src/tkm/tkm_id_manager.c index 24513ebf1..63377e65d 100644 --- a/src/charon-tkm/src/tkm/tkm_id_manager.c +++ b/src/charon-tkm/src/tkm/tkm_id_manager.c @@ -25,6 +25,7 @@ ENUM_BEGIN(tkm_context_kind_names, TKM_CTX_NONCE, TKM_CTX_ESA, "NONCE_CONTEXT", "DH_CONTEXT", + "CC_CONTEXT" "ISA_CONTEXT", "AE_CONTEXT", "ESA_CONTEXT"); diff --git a/src/charon-tkm/src/tkm/tkm_id_manager.h b/src/charon-tkm/src/tkm/tkm_id_manager.h index 716e91d79..b1c1160a0 100644 --- a/src/charon-tkm/src/tkm/tkm_id_manager.h +++ b/src/charon-tkm/src/tkm/tkm_id_manager.h @@ -30,6 +30,8 @@ enum tkm_context_kind_t { TKM_CTX_NONCE, /** Diffie-Hellman context */ TKM_CTX_DH, + /** Certificate chain context */ + TKM_CTX_CC, /** IKE SA context */ TKM_CTX_ISA, /** Authenticated Endpoint context */ diff --git a/src/charon-tkm/tests/id_manager_tests.c b/src/charon-tkm/tests/id_manager_tests.c index fd34bf91f..15522f118 100644 --- a/src/charon-tkm/tests/id_manager_tests.c +++ b/src/charon-tkm/tests/id_manager_tests.c @@ -18,7 +18,7 @@ #include "tkm_id_manager.h" -static const tkm_limits_t limits = {125, 100, 30, 200, 42}; +static const tkm_limits_t limits = {125, 100, 55, 30, 200, 42}; START_TEST(test_id_mgr_creation) { |