diff options
| author | Martin Willi <martin@strongswan.org> | 2008-10-28 16:07:06 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2008-10-28 16:07:06 +0000 |
| commit | 6a4ff35cc4db8128e2f7e5244ed1586a6712906e (patch) | |
| tree | aace6ecf9ef885b01db64a5ab0755b3f3199d3b2 /src/charon/plugins/stroke | |
| parent | 3c8234d408cc81899576dd73f0a83d6211af17e8 (diff) | |
| download | strongswan-6a4ff35cc4db8128e2f7e5244ed1586a6712906e.tar.bz2 strongswan-6a4ff35cc4db8128e2f7e5244ed1586a6712906e.tar.xz | |
moved key derivation and management into keymat object
allows secured implementation of key management (e.g. in kernel or HW)
only IKE keys for now
Diffstat (limited to 'src/charon/plugins/stroke')
| -rw-r--r-- | src/charon/plugins/stroke/stroke_list.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/charon/plugins/stroke/stroke_list.c b/src/charon/plugins/stroke/stroke_list.c index 555239fb5..b4963a7ad 100644 --- a/src/charon/plugins/stroke/stroke_list.c +++ b/src/charon/plugins/stroke/stroke_list.c @@ -79,14 +79,18 @@ static void log_ike_sa(FILE *out, ike_sa_t *ike_sa, bool all) if (all) { - proposal_t *ike_proposal = ike_sa->get_proposal(ike_sa); - + keymat_t *keymat; + proposal_t *ike_proposal; + + keymat = ike_sa->get_keymat(ike_sa); + ike_proposal = keymat->get_proposal(keymat); + fprintf(out, "%12s[%d]: IKE SPIs: %.16llx_i%s %.16llx_r%s", ike_sa->get_name(ike_sa), ike_sa->get_unique_id(ike_sa), id->get_initiator_spi(id), id->is_initiator(id) ? "*" : "", id->get_responder_spi(id), id->is_initiator(id) ? "" : "*"); - - + + if (ike_sa->get_state(ike_sa) == IKE_ESTABLISHED) { u_int32_t rekey, reauth, now; @@ -112,7 +116,7 @@ static void log_ike_sa(FILE *out, ike_sa_t *ike_sa, bool all) } } fprintf(out, "\n"); - + if (ike_proposal) { char buf[BUF_LEN]; @@ -121,7 +125,7 @@ static void log_ike_sa(FILE *out, ike_sa_t *ike_sa, bool all) fprintf(out, "%12s[%d]: IKE proposal: %s\n", ike_sa->get_name(ike_sa), ike_sa->get_unique_id(ike_sa), buf+4); - } + } } } |