Mirrors/i2pd-tools
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd-tools.git synced 2025-01-22 13:27:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

update famtool

Browse source
This commit is contained in:
Jeff Becker 2016-10-24 13:47:19 -04:00
parent 115227928d
commit e84606c560
No known key found for this signature in database
GPG key ID: AB950234D6EA286B
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
famtool.cpp
View file

@ -31,7 +31,7 @@ static void printhelp(const std::string & name)
std::cout << "sign a router info with family signing key" << std::endl; std::cout << "sign a router info with family signing key" << std::endl;
std::cout << name << " -s -n i2pfam -k myfam.pem -i router.keys -f router.info" << std::endl << std::endl; std::cout << name << " -s -n i2pfam -k myfam.pem -i router.keys -f router.info" << std::endl << std::endl;
std::cout << "verify signed router.info" << std::endl; std::cout << "verify signed router.info" << std::endl;
std::cout << name << " -V -c myfam.pem -f router.info" << std::endl << std::endl; std::cout << name << " -V -n i2pfam -c myfam.pem -f router.info" << std::endl << std::endl;
} }
@ -216,7 +216,6 @@ int main(int argc, char * argv[])
} }
// generate family key code // generate family key code
if(gen) { if(gen) {
std::cout << "generate key for router family " << fam << "..." << std::endl;
if(!privkey.size()) privkey = fam + ".pem"; if(!privkey.size()) privkey = fam + ".pem";
if(!certfile.size()) certfile = fam + ".crt"; if(!certfile.size()) certfile = fam + ".crt";
@ -285,8 +284,8 @@ int main(int argc, char * argv[])
fclose(certf); fclose(certf);
EVP_PKEY_free(ev_k); EVP_PKEY_free(ev_k);
EC_KEY_free(k_priv);
X509_free(x); X509_free(x);
std::cout << "family " << fam << "made" << std::endl;
} }
if (sign) { if (sign) {
@ -335,7 +334,6 @@ int main(int argc, char * argv[])
} }
RouterInfo ri(infofile); RouterInfo ri(infofile);
ri.CreateBuffer(keys);
auto ident = ri.GetIdentHash(); auto ident = ri.GetIdentHash();
@ -345,12 +343,14 @@ int main(int argc, char * argv[])
ri.SetProperty(ROUTER_INFO_PROPERTY_FAMILY, fam); ri.SetProperty(ROUTER_INFO_PROPERTY_FAMILY, fam);
ri.SetProperty(ROUTER_INFO_PROPERTY_FAMILY_SIG, sig); ri.SetProperty(ROUTER_INFO_PROPERTY_FAMILY_SIG, sig);
if (verbose) std::cout << "signed " << sig << std::endl; if (verbose) std::cout << "signed " << sig << std::endl;
ri.CreateBuffer(keys);
if(!ri.SaveToFile(infofile)) { if(!ri.SaveToFile(infofile)) {
std::cout << "failed to save to " << infofile << std::endl; std::cout << "failed to save to " << infofile << std::endl;
} }
} else { } else {
std::cout << "failed to sign router info" << std::endl; std::cout << "failed to sign router info" << std::endl;
} }
std::cout << "signed" << std::endl;
} }
if(verify) { if(verify) {
@ -398,6 +398,7 @@ int main(int argc, char * argv[])
std::cout << "invalid signature" << std::endl; std::cout << "invalid signature" << std::endl;
return 1; return 1;
} }
std::cout << "verified" << std::endl;
} }
return 0; return 0;
} }