if(algorithm <= 10)
throw runtime_error("Creating an algorithm " +std::to_string(algorithm)+" ("+algorithm2name(algorithm)+") key requires the size (in bits) to be passed");
else {
- if(algorithm == 12 || algorithm == 13 || algorithm == 250) // GOST, ECDSAP256SHA256, ED25519SHA512
+ if(algorithm == 12 || algorithm == 13 || algorithm == 15) // GOST, ECDSAP256SHA256, ED25519
bits = 256;
else if(algorithm == 14) // ECDSAP384SHA384
bits = 384;
unsigned int bits;
if(algo <= 10)
bits=1024;
- else if(algo == 12 || algo == 13 || algo == 250) // ECC-GOST or ECDSAP256SHA256 or ED25519SHA512
+ else if(algo == 12 || algo == 13 || algo == 15) // ECC-GOST or ECDSAP256SHA256 or ED25519
bits=256;
else if(algo == 14) // ECDSAP384SHA384
bits = 384;
ECCGOST=12,
ECDSA256=13,
ECDSA384=14,
- EXPERIMENTALED25519=250
+ ED25519=15
};
struct KeyMetaData
if (!algorithm.compare("gost")) return ECCGOST;
if (!algorithm.compare("ecdsa256")) return ECDSA256;
if (!algorithm.compare("ecdsa384")) return ECDSA384;
- if (!algorithm.compare("experimental-ed25519")) return EXPERIMENTALED25519;
+ if (!algorithm.compare("ed25519")) return ED25519;
return -1;
}
return "ECDSAP256SHA256";
case ECDSA384:
return "ECDSAP384SHA384";
- case EXPERIMENTALED25519:
- return "ED25519SHA512";
+ case ED25519:
+ return "ED25519";
case 252:
return "INDIRECT";
case 253:
cout<<"add-zone-key ZONE {zsk|ksk} [BITS] [active|inactive]"<<endl;
cout<<" [rsasha1|rsasha256|rsasha512|gost|ecdsa256|ecdsa384";
#ifdef HAVE_LIBSODIUM
- cout<<"|experimental-ed25519";
+ cout<<"|ed25519";
#endif
cout<<"]"<<endl;
cout<<" Add a ZSK or KSK to zone and specify algo&bits"<<endl;
if(algorithm <= 10)
bits = keyOrZone ? 2048 : 1024;
else {
- if(algorithm == 12 || algorithm == 13 || algorithm == 250) // ECDSA, GOST, ED25519
+ if(algorithm == 12 || algorithm == 13 || algorithm == 15) // ECDSA, GOST, ED25519
bits = 256;
else if(algorithm == 14)
bits = 384;
{
/*
Private-key-format: v1.2
- Algorithm: 250 (ED25519SHA512)
+ Algorithm: 15 (ED25519)
PrivateKey: GU6SnQ/Ou+xC5RumuIUIuJZteXT2z0O/ok1s38Et6mQ=
*/
storvector_t storvector;
- string algorithm = "250 (ED25519SHA512)";
+ string algorithm = "15 (ED25519)";
storvector.push_back(make_pair("Algorithm", algorithm));
{
/*
Private-key-format: v1.2
- Algorithm: 250 (ED25519SHA512)
+ Algorithm: 15 (ED25519)
PrivateKey: GU6SnQ/Ou+xC5RumuIUIuJZteXT2z0O/ok1s38Et6mQ=
*/
{
LoaderSodiumStruct()
{
- DNSCryptoKeyEngine::report(250, &SodiumED25519DNSCryptoKeyEngine::maker);
+ DNSCryptoKeyEngine::report(15, &SodiumED25519DNSCryptoKeyEngine::maker);
}
} loadersodium;
}