mirror of
https://github.com/PurpleI2P/i2pd-tools.git
synced 2025-01-22 21:37:18 +01:00
fix
This commit is contained in:
parent
e84606c560
commit
2b9ed854c7
12
famtool.cpp
12
famtool.cpp
|
@ -34,7 +34,6 @@ static void printhelp(const std::string & name)
|
||||||
std::cout << name << " -V -n i2pfam -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static std::shared_ptr<Verifier> LoadCertificate (const std::string& filename)
|
static std::shared_ptr<Verifier> LoadCertificate (const std::string& filename)
|
||||||
{
|
{
|
||||||
std::shared_ptr<Verifier> verifier;
|
std::shared_ptr<Verifier> verifier;
|
||||||
|
@ -205,10 +204,9 @@ int main(int argc, char * argv[])
|
||||||
printhelp(argv[0]);
|
printhelp(argv[0]);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
InitCrypto(false);
|
InitCrypto(false);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(!fam.size()) {
|
if(!fam.size()) {
|
||||||
// no family name
|
// no family name
|
||||||
std::cout << "no family name specified" << std::endl;
|
std::cout << "no family name specified" << std::endl;
|
||||||
|
@ -216,7 +214,7 @@ int main(int argc, char * argv[])
|
||||||
}
|
}
|
||||||
// generate family key code
|
// generate family key code
|
||||||
if(gen) {
|
if(gen) {
|
||||||
if(!privkey.size()) privkey = fam + ".pem";
|
if(!privkey.size()) privkey = fam + ".key";
|
||||||
if(!certfile.size()) certfile = fam + ".crt";
|
if(!certfile.size()) certfile = fam + ".crt";
|
||||||
|
|
||||||
std::string cn = fam + ".family.i2p.net";
|
std::string cn = fam + ".family.i2p.net";
|
||||||
|
@ -251,10 +249,6 @@ int main(int argc, char * argv[])
|
||||||
assert(ev_k);
|
assert(ev_k);
|
||||||
assert(EVP_PKEY_assign_EC_KEY(ev_k, k_priv) == 1);
|
assert(EVP_PKEY_assign_EC_KEY(ev_k, k_priv) == 1);
|
||||||
|
|
||||||
|
|
||||||
// TODO: password protection
|
|
||||||
PEM_write_ECPrivateKey(privf, k_priv, nullptr, nullptr, 0, nullptr, nullptr);
|
|
||||||
|
|
||||||
X509 * x = X509_new();
|
X509 * x = X509_new();
|
||||||
assert(x);
|
assert(x);
|
||||||
|
|
||||||
|
@ -285,7 +279,7 @@ int main(int argc, char * argv[])
|
||||||
|
|
||||||
EVP_PKEY_free(ev_k);
|
EVP_PKEY_free(ev_k);
|
||||||
X509_free(x);
|
X509_free(x);
|
||||||
std::cout << "family " << fam << "made" << std::endl;
|
std::cout << "family " << fam << " made" << std::endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (sign) {
|
if (sign) {
|
||||||
|
|
Loading…
Reference in a new issue