The unified diff between revisions [2df88abf..] and [818e3621..] is displayed below. It can also be downloaded as a raw diff.
This diff has been restricted to the following files: 'cmd_list.cc'
#
#
# patch "cmd_list.cc"
# from [3924979965585fb4c0c07fc921586ea3a2f49a0b]
# to [5085055f50653ebc2fee62b2584923400dcaea4a]
#
============================================================
--- cmd_list.cc 3924979965585fb4c0c07fc921586ea3a2f49a0b
+++ cmd_list.cc 5085055f50653ebc2fee62b2584923400dcaea4a
@@ -109,8 +109,7 @@ CMD(certs, "certs", "", CMD_REF(list), "
for (size_t i = 0; i < certs.size(); ++i)
{
cert_status status = check_cert(db, idx(certs, i));
- cert_value tv;
- decode_base64(idx(certs, i).value, tv);
+ cert_value tv = idx(certs, i).value;
string washed;
if (guess_binary(tv()))
{
@@ -197,7 +196,7 @@ CMD(keys, "keys", "", CMD_REF(list), "[P
else if (db.database_specified())
{
// we've found a key that should have both a public and a private version
- base64<rsa_pub_key> pub_key;
+ rsa_pub_key pub_key;
keypair priv_key;
db.get_key(*i, pub_key);
keys.get_key_pair(*i, priv_key);
@@ -212,7 +211,7 @@ CMD(keys, "keys", "", CMD_REF(list), "[P
for (map<rsa_keypair_id, bool>::iterator i = pubkeys.begin();
i != pubkeys.end(); i++)
{
- base64<rsa_pub_key> pub_encoded;
+ rsa_pub_key pub_encoded;
id hash_code;
rsa_keypair_id keyid = i->first;
bool indb = i->second;
@@ -602,7 +601,7 @@ CMD_AUTOMATE(keys, "",
for (vector<rsa_keypair_id>::iterator i = dbkeys.begin();
i != dbkeys.end(); i++)
{
- base64<rsa_pub_key> pub_encoded;
+ rsa_pub_key pub_encoded;
id hash_code;
db.get_key(*i, pub_encoded);
key_hash_code(*i, pub_encoded, hash_code);
@@ -721,12 +720,10 @@ CMD_AUTOMATE(certs, N_("REV"),
{
basic_io::stanza st;
cert_status status = check_cert(db, idx(certs, i));
- cert_value tv;
+ cert_value tv = idx(certs, i).value;
cert_name name = idx(certs, i).name;
set<rsa_keypair_id> signers;
- decode_base64(idx(certs, i).value, tv);
-
rsa_keypair_id keyid = idx(certs, i).key;
signers.insert(keyid);