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

Merge pull request #10 from majestrate/master

Browse source 
fix gost and case sensative compile bug by updating git submodule
This commit is contained in:
Jeff 2017-05-01 08:51:44 -04:00 committed by GitHub
parent 3121e8912b 155d63a195
commit 528ff0d8f8
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
common/key.hpp
View file

@ -27,8 +27,8 @@ std::string SigTypeToName(uint16_t keytype)
return "RSA-4096-SHA512"; return "RSA-4096-SHA512";
case i2p::data::SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519: case i2p::data::SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519:
return "ED25519-SHA512"; return "ED25519-SHA512";
case i2p::data::SIGNING_KEY_TYPE_GOSTR3410_A_GOSTR3411: case i2p::data::SIGNING_KEY_TYPE_GOSTR3410_CRYPTO_PRO_A_GOSTR3411_256:
return "GOSTR3410-A-GOSTR3411"; return "GOSTR3410-A-GOSTR3411-SHA256";
default: default:
std::stringstream ss; std::stringstream ss;
ss << "unknown: " << keytype; ss << "unknown: " << keytype;
@ -47,7 +47,7 @@ static void ToUpper(std::string & str)
uint16_t NameToSigType(const std::string & keyname) uint16_t NameToSigType(const std::string & keyname)
{ {
if(keyname.size() == 1) return atoi(keyname.c_str()); if(keyname.size() == 1) return atoi(keyname.c_str());
std::string name = keyname; std::string name = keyname;
ToUpper(name); ToUpper(name);
auto npos = std::string::npos; auto npos = std::string::npos;
@ -56,16 +56,16 @@ uint16_t NameToSigType(const std::string & keyname)
if(name.find("P256") != npos) return i2p::data::SIGNING_KEY_TYPE_ECDSA_SHA256_P256; if(name.find("P256") != npos) return i2p::data::SIGNING_KEY_TYPE_ECDSA_SHA256_P256;
if(name.find("P384") != npos) return i2p::data::SIGNING_KEY_TYPE_ECDSA_SHA384_P384; if(name.find("P384") != npos) return i2p::data::SIGNING_KEY_TYPE_ECDSA_SHA384_P384;
if(name.find("RSA-SHA265") != npos) return i2p::data::SIGNING_KEY_TYPE_RSA_SHA256_2048; if(name.find("RSA-SHA265") != npos) return i2p::data::SIGNING_KEY_TYPE_RSA_SHA256_2048;
if(name.find("RSA-SHA384") != npos) return i2p::data::SIGNING_KEY_TYPE_RSA_SHA384_3072; if(name.find("RSA-SHA384") != npos) return i2p::data::SIGNING_KEY_TYPE_RSA_SHA384_3072;
if(name.find("RSA-SHA512") != npos) return i2p::data::SIGNING_KEY_TYPE_RSA_SHA512_4096; if(name.find("RSA-SHA512") != npos) return i2p::data::SIGNING_KEY_TYPE_RSA_SHA512_4096;
if(name.find("ED25519") != npos) return i2p::data::SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519; if(name.find("ED25519") != npos) return i2p::data::SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519;
if(name.find("GOSTR3410") != npos) return i2p::data::SIGNING_KEY_TYPE_GOSTR3410_A_GOSTR3411; if(name.find("GOSTR3410-SHA256") != npos) return i2p::data::SIGNING_KEY_TYPE_GOSTR3410_CRYPTO_PRO_A_GOSTR3411_256;
return -1; return -1;
} }

2
i2pd

@ -1 +1 @@
Subproject commit a8196d1f33d15b0bc4c992e4ea1dab1aef4c84a7 Subproject commit cfd3c3628e92a3cf258e650d16ed9d282fe29dcb