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:41:48 -04:00
parent 0ea81aed2e
commit 115227928d
No known key found for this signature in database
GPG key ID: AB950234D6EA286B
1 changed files with 50 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
famtool.cpp
View file

@ -19,7 +19,7 @@ using namespace i2p::data;
static void usage(const std::string & name) static void usage(const std::string & name)
{ {
std::cout << "usage: " << name << " [-h] [-v] [-g -n family -c family.crt -k family.pem] [-s -n family -k family.pem -i router.info] [-V -c family.crt -i router.info]" << std::endl; std::cout << "usage: " << name << " [-h] [-v] [-g -n family -c family.crt -k family.pem] [-s -n family -k family.pem -i router.keys -f router.info] [-V -c family.crt -f router.info]" << std::endl;
} }
static void printhelp(const std::string & name) static void printhelp(const std::string & name)
@ -29,9 +29,9 @@ static void printhelp(const std::string & name)
std::cout << "generate a new family signing key for family called ``i2pfam''" << std::endl; std::cout << "generate a new family signing key for family called ``i2pfam''" << std::endl;
std::cout << name << " -g -n i2pfam -c myfam.crt -k myfam.pem" << std::endl << std::endl; std::cout << name << " -g -n i2pfam -c myfam.crt -k myfam.pem" << std::endl << std::endl;
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.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 -i router.info" << std::endl << std::endl; std::cout << name << " -V -c myfam.pem -f router.info" << std::endl << std::endl;
} }
@ -155,8 +155,10 @@ int main(int argc, char * argv[])
std::string fam; std::string fam;
std::string privkey; std::string privkey;
std::string certfile; std::string certfile;
std::string infoFile; std::string infile;
while((opt = getopt(argc, argv, "vVhgsn:i:c:k:")) != -1) { std::string infofile;
std::string outfile;
while((opt = getopt(argc, argv, "vVhgsn:i:c:k:o:f:")) != -1) {
switch(opt) { switch(opt) {
case 'v': case 'v':
verbose = true; verbose = true;
@ -174,9 +176,14 @@ int main(int argc, char * argv[])
return 1; return 1;
} }
break; break;
case 'i': case 'f':
infoFile = std::string(argv[optind-1]); infofile = std::string(argv[optind-1]);
break; break;
case 'i':
infile = std::string(argv[optind-1]);
break;
case 'o':
outfile = std::string(argv[optind-1]);
case 'c': case 'c':
certfile = std::string(argv[optind-1]); certfile = std::string(argv[optind-1]);
break; break;
@ -284,9 +291,9 @@ int main(int argc, char * argv[])
if (sign) { if (sign) {
// sign // sign
if (!infoFile.size()) { if (!infile.size()) {
// no router info specififed // no router info specififed
std::cerr << "no routerinfo file specified" << std::endl; std::cerr << "no router keys file specified" << std::endl;
return 1; return 1;
} }
if (!privkey.size()) { if (!privkey.size()) {
@ -297,17 +304,38 @@ int main(int argc, char * argv[])
{ {
std::ifstream i; std::ifstream i;
i.open(infoFile); i.open(infofile);
if(!i.is_open()) { if(!i.is_open()) {
std::cout << "cannot open " << infoFile << std::endl; std::cout << "cannot open " << infofile << std::endl;
return 1; return 1;
} }
} }
if (verbose) std::cout << "load " << infoFile << std::endl; if (verbose) std::cout << "load " << infofile << std::endl;
RouterInfo ri(infoFile); PrivateKeys keys;
{
std::ifstream fi(infile, std::ifstream::in | std::ifstream::binary);
if(!fi.is_open()) {
std::cout << "cannot open " << infile << std::endl;
return 1;
}
fi.seekg (0, std::ios::end);
size_t len = fi.tellg();
fi.seekg (0, std::ios::beg);
uint8_t * k = new uint8_t[len];
fi.read((char*)k, len);
if(!keys.FromBuffer(k, len)) {
std::cout << "invalid key file " << infile << std::endl;
return 1;
}
delete [] k;
}
RouterInfo ri(infofile);
ri.CreateBuffer(keys);
auto ident = ri.GetIdentHash(); auto ident = ri.GetIdentHash();
@ -317,15 +345,16 @@ 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;
std::ofstream f(infoFile); if(!ri.SaveToFile(infofile)) {
ri.WriteToStream(f); 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;
} }
} }
if(verify) { if(verify) {
if(!infoFile.size()) { if(!infofile.size()) {
std::cout << "no router info file specified" << std::endl; std::cout << "no router info file specified" << std::endl;
return 1; return 1;
} }
@ -341,19 +370,19 @@ int main(int argc, char * argv[])
{ {
std::ifstream i; std::ifstream i;
i.open(infoFile); i.open(infofile);
if(!i.is_open()) { if(!i.is_open()) {
std::cout << "cannot open " << infoFile << std::endl; std::cout << "cannot open " << infofile << std::endl;
return 1; return 1;
} }
} }
if (verbose) std::cout << "load " << infoFile << std::endl; if (verbose) std::cout << "load " << infofile << std::endl;
RouterInfo ri(infoFile); RouterInfo ri(infofile);
auto sig = ri.GetProperty(ROUTER_INFO_PROPERTY_FAMILY_SIG); auto sig = ri.GetProperty(ROUTER_INFO_PROPERTY_FAMILY_SIG);
if (ri.GetProperty(ROUTER_INFO_PROPERTY_FAMILY) != fam) { if (ri.GetProperty(ROUTER_INFO_PROPERTY_FAMILY) != fam) {
std::cout << infoFile << " does not belong to " << fam << std::endl; std::cout << infofile << " does not belong to " << fam << std::endl;
return 1; return 1;
} }
auto ident = ri.GetIdentHash(); auto ident = ri.GetIdentHash();