some ipsec listall finetuning

diff --git a/src/pluto/fetch.c b/src/pluto/fetch.c
index 59c27d979c326a4d7cd8c69e8dc7c6cf714e1c38..9e630e081e41819860762df8ae5453ff08c4a08e 100644 (file)
--- 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 e102364b3d06f6a5d84698df53920d91fe6a192f..292406563abe3a933c57e378055788641a91f1ed 100644 (file)
--- 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 dd26fca3d5165e54e57bec0bf127cee5e6bb8132..642cf770af9a64151faac90dfbbc48513b5084a8 100644 (file)
--- 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;
        }