exa/codecrypt
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

actions: pubkey listing, common output code

Browse source
This commit is contained in:
Mirek Kratochvil 2013-04-21 11:05:20 +02:00
parent 86d3afc213
commit a6d0a590fc
1 changed files with 51 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
src/actions.cpp
View file

@ -139,9 +139,55 @@ int action_decrypt_verify (bool armor, keyring&KR, algorithm_suite&AS)
* keyring stuff * keyring stuff
*/ */
static void output_key (bool fp,
const std::string& ident, const std::string&longid,
const std::string&alg, const std::string&keyid,
const std::string&name)
{
if (!fp)
out (ident << '\t' << alg << '\t'
<< '@' << keyid.substr (0, 22) << "...\t"
<< "\"" << name << "\"");
else {
out ( longid << " with algorithm " << alg
<< ", name `" << name << "'");
std::cout << " fingerprint ";
for (size_t j = 0; j < keyid.length(); ++j) {
std::cout << keyid[j];
if (! ( (j + 1) % 4) &&
j < keyid.length() - 1)
std::cout << ':';
}
std::cout << std::endl << std::endl;
}
}
int action_list (bool nice_fingerprint, const std::string&filter, int action_list (bool nice_fingerprint, const std::string&filter,
keyring&KR) keyring&KR)
{ {
for (keyring::keypair_storage::iterator
i = KR.pairs.begin(), e = KR.pairs.end();
i != e; ++i) {
if (keyspec_matches (filter, i->second.pub.name, i->first) )
output_key (nice_fingerprint,
"pubkey", "public key in keypair",
i->second.pub.alg, i->first,
i->second.pub.name);
}
for (keyring::pubkey_storage::iterator
i = KR.pubs.begin(), e = KR.pubs.end();
i != e; ++i) {
if (keyspec_matches (filter, i->second.name, i->first) )
output_key (nice_fingerprint,
"pubkey", "public key",
i->second.alg, i->first,
i->second.name);
}
return 0; return 0;
} }
@ -184,27 +230,11 @@ int action_list_sec (bool nice_fingerprint, const std::string&filter,
i = KR.pairs.begin(), e = KR.pairs.end(); i = KR.pairs.begin(), e = KR.pairs.end();
i != e; ++i) { i != e; ++i) {
if (!keyspec_matches (filter, i->second.pub.name, i->first) ) if (keyspec_matches (filter, i->second.pub.name, i->first) )
continue; output_key (nice_fingerprint,
"keypair", "key pair",
if (!nice_fingerprint) i->second.pub.alg, i->first,
out ("keypair\t" i->second.pub.name);
<< i->second.pub.alg << '\t'
<< '@' << i->first.substr (0, 22) << "...\t"
<< "\"" << i->second.pub.name << "\"");
else {
out ("key pair with algorithm " << i->second.pub.alg
<< ", name `" << i->second.pub.name << "'");
std::cout << " fingerprint ";
for (size_t j = 0; j < i->first.length(); ++j) {
std::cout << i->first[j];
if (! ( (j + 1) % 4) &&
j < i->first.length() - 1)
std::cout << ':';
}
std::cout << std::endl << std::endl;
}
} }
return 0; return 0;
} }