diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2009-10-06 23:19:46 +0200 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2009-10-06 23:19:46 +0200 |
| commit | 20afe5e9f5ca79fcc2fe1dc44cd2d42e695a76b3 (patch) | |
| tree | 69ec50c809548ee856c0bb96995a386bedbdf7c8 /src | |
| parent | ce2f2461e02aaa0eec6da2b7fbc06c3e40c3154f (diff) | |
| download | strongswan-20afe5e9f5ca79fcc2fe1dc44cd2d42e695a76b3.tar.bz2 strongswan-20afe5e9f5ca79fcc2fe1dc44cd2d42e695a76b3.tar.xz | |
some ipsec listall finetuning
Diffstat (limited to 'src')
| -rw-r--r-- | src/pluto/fetch.c | 2 | ||||
| -rw-r--r-- | src/pluto/keys.c | 16 | ||||
| -rw-r--r-- | src/pluto/ocsp.c | 1 |
3 files changed, 9 insertions, 10 deletions
diff --git a/src/pluto/fetch.c b/src/pluto/fetch.c index 59c27d979..9e630e081 100644 --- a/src/pluto/fetch.c +++ b/src/pluto/fetch.c @@ -721,7 +721,7 @@ void list_crl_fetch_requests(bool utc) whack_log(RC_COMMENT, " trials: %d", req->trials); dntoa(buf, BUF_LEN, req->issuer); - whack_log(RC_COMMENT, " issuer: '%s'", buf); + whack_log(RC_COMMENT, " issuer: \"%s\"", buf); if (req->authKeyID.ptr != NULL) { datatot(req->authKeyID.ptr, req->authKeyID.len, ':' diff --git a/src/pluto/keys.c b/src/pluto/keys.c index e102364b3..292406563 100644 --- a/src/pluto/keys.c +++ b/src/pluto/keys.c @@ -1441,26 +1441,24 @@ void list_public_keys(bool utc) whack_log(RC_COMMENT, " "); idtoa(&key->id, buf, BUF_LEN); - whack_log(RC_COMMENT, " owner: '%s'", buf); - whack_log(RC_COMMENT, " pubkey: %N %4d bits, until %T %s", + whack_log(RC_COMMENT, " identity: '%s'", buf); + whack_log(RC_COMMENT, " pubkey: %N %4d bits, until %T %s", key_type_names, public->get_type(public), public->get_keysize(public) * BITS_PER_BYTE, &key->until_time, utc, check_expiry(key->until_time, PUBKEY_WARNING_INTERVAL, TRUE)); if (public->get_fingerprint(public, KEY_ID_PUBKEY_INFO_SHA1, &keyid)) { - whack_log(RC_COMMENT," keyid: %#B", &keyid); + whack_log(RC_COMMENT," keyid: %#B", &keyid); } - if (key->issuer.len > 0) + if (key->issuer.len) { dntoa(buf, BUF_LEN, key->issuer); - whack_log(RC_COMMENT," issuer: \"%s\"", buf); + whack_log(RC_COMMENT," issuer: \"%s\"", buf); } - if (key->serial.len > 0) + if (key->serial.len) { - datatot(key->serial.ptr, key->serial.len, ':' - , buf, BUF_LEN); - whack_log(RC_COMMENT," serial: %s", buf); + whack_log(RC_COMMENT," serial: %#B", &key->serial); } p = p->next; } diff --git a/src/pluto/ocsp.c b/src/pluto/ocsp.c index dd26fca3d..642cf770a 100644 --- a/src/pluto/ocsp.c +++ b/src/pluto/ocsp.c @@ -1378,6 +1378,7 @@ void add_certinfo(ocsp_location_t *loc, ocsp_certinfo_t *info, cnew->serialNumber = chunk_clone(info->serialNumber); cnew->next = certinfo; + cnew->trials = 0; *certinfop = cnew; certinfo = cnew; } |