gfwleak/zhangyang-zerotierone
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a second arg to idtool generate to make generating both secret and public easier, add new supernode identities after generating them, fix known good and bad IDs in selftest.

Browse Source
This commit is contained in:
Adam Ierymenko
2013-10-07 09:36:20 -04:00
parent 5fa7a92048
commit 0c8614b9c6
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
idtool.cpp
View File

@@ -41,7 +41,7 @@ static void printHelp(char *pn)
{
std::cout << "Usage: " << pn << " <command> [<args>]" << std::endl << std::endl;
std::cout << "Commands:" << std::endl;
std::cout << "\tgenerate [<identity.secret>]" << std::endl;
std::cout << "\tgenerate [<identity.secret>] [<identity.public>]" << std::endl;
std::cout << "\tvalidate <identity.secret/public>" << std::endl;
std::cout << "\tgetpublic <identity.secret>" << std::endl;
std::cout << "\tsign <identity.secret> <file>" << std::endl;
@@ -80,6 +80,13 @@ int main(int argc,char **argv)
std::cerr << "Error writing to " << argv[2] << std::endl;
return -1;
} else std::cout << argv[2] << " written" << std::endl;
if (argc >= 4) {
idser = id.toString(false);
if (!Utils::writeFile(argv[3],idser)) {
std::cerr << "Error writing to " << argv[3] << std::endl;
return -1;
} else std::cout << argv[3] << " written" << std::endl;
}
} else std::cout << idser;
} else if (!strcmp(argv[1],"validate")) {
if (argc < 3) {