pkcs11-tool: harmonize supported ECC curves
pkcs15-pubkey.c holds a struct containing supported ECC curves. The contents of this struct are being harmonized with pkcs11-tool supported curves.
This commit is contained in:
parent
f3573ede0d
commit
4b51b99748
|
@ -1404,6 +1404,7 @@ static struct ec_curve_info {
|
||||||
{"brainpoolP224r1", "1.3.36.3.3.2.8.1.1.5", "06092B2403030208010105", 224},
|
{"brainpoolP224r1", "1.3.36.3.3.2.8.1.1.5", "06092B2403030208010105", 224},
|
||||||
{"brainpoolP256r1", "1.3.36.3.3.2.8.1.1.7", "06092B2403030208010107", 256},
|
{"brainpoolP256r1", "1.3.36.3.3.2.8.1.1.7", "06092B2403030208010107", 256},
|
||||||
{"brainpoolP320r1", "1.3.36.3.3.2.8.1.1.9", "06092B2403030208010109", 320},
|
{"brainpoolP320r1", "1.3.36.3.3.2.8.1.1.9", "06092B2403030208010109", 320},
|
||||||
|
|
||||||
{"secp192k1", "1.3.132.0.31", "06052B8104001F", 192},
|
{"secp192k1", "1.3.132.0.31", "06052B8104001F", 192},
|
||||||
{"secp256k1", "1.3.132.0.10", "06052B8104000A", 256},
|
{"secp256k1", "1.3.132.0.10", "06052B8104000A", 256},
|
||||||
{NULL, NULL, NULL, 0},
|
{NULL, NULL, NULL, 0},
|
||||||
|
|
|
@ -64,19 +64,29 @@ static struct ec_curve_info {
|
||||||
size_t size;
|
size_t size;
|
||||||
} ec_curve_infos[] = {
|
} ec_curve_infos[] = {
|
||||||
{"secp192r1", "1.2.840.10045.3.1.1", "06082A8648CE3D030101", 192},
|
{"secp192r1", "1.2.840.10045.3.1.1", "06082A8648CE3D030101", 192},
|
||||||
{"prime192r1", "1.2.840.10045.3.1.1", "06082A8648CE3D030101", 192},
|
|
||||||
{"prime192v1", "1.2.840.10045.3.1.1", "06082A8648CE3D030101", 192},
|
{"prime192v1", "1.2.840.10045.3.1.1", "06082A8648CE3D030101", 192},
|
||||||
|
{"nistp192", "1.2.840.10045.3.1.1", "06082A8648CE3D030101", 192},
|
||||||
{"ansiX9p192r1", "1.2.840.10045.3.1.1", "06082A8648CE3D030101", 192},
|
{"ansiX9p192r1", "1.2.840.10045.3.1.1", "06082A8648CE3D030101", 192},
|
||||||
|
|
||||||
|
{"secp224r1", "1.3.132.0.33", "06052b81040021", 224},
|
||||||
|
{"nistp224", "1.3.132.0.33", "06052b81040021", 224},
|
||||||
|
|
||||||
{"prime256v1", "1.2.840.10045.3.1.7", "06082A8648CE3D030107", 256},
|
{"prime256v1", "1.2.840.10045.3.1.7", "06082A8648CE3D030107", 256},
|
||||||
{"secp256r1", "1.2.840.10045.3.1.7", "06082A8648CE3D030107", 256},
|
{"secp256r1", "1.2.840.10045.3.1.7", "06082A8648CE3D030107", 256},
|
||||||
{"ansiX9p256r1", "1.2.840.10045.3.1.7", "06082A8648CE3D030107", 256},
|
{"ansiX9p256r1", "1.2.840.10045.3.1.7", "06082A8648CE3D030107", 256},
|
||||||
|
|
||||||
{"secp384r1", "1.3.132.0.34", "06052B81040022", 384},
|
{"secp384r1", "1.3.132.0.34", "06052B81040022", 384},
|
||||||
{"prime384v1", "1.3.132.0.34", "06052B81040022", 384},
|
{"prime384v1", "1.3.132.0.34", "06052B81040022", 384},
|
||||||
{"ansiX9p384r1", "1.3.132.0.34", "06052B81040022", 384},
|
{"ansiX9p384r1", "1.3.132.0.34", "06052B81040022", 384},
|
||||||
|
|
||||||
|
{"secp521r1", "1.3.132.0.35", "06052B81040023", 521},
|
||||||
|
{"nistp521", "1.3.132.0.35", "06052B81040023", 521},
|
||||||
|
|
||||||
{"brainpoolP192r1", "1.3.36.3.3.2.8.1.1.3", "06092B2403030208010103", 192},
|
{"brainpoolP192r1", "1.3.36.3.3.2.8.1.1.3", "06092B2403030208010103", 192},
|
||||||
{"brainpoolP224r1", "1.3.36.3.3.2.8.1.1.5", "06092B2403030208010105", 224},
|
{"brainpoolP224r1", "1.3.36.3.3.2.8.1.1.5", "06092B2403030208010105", 224},
|
||||||
{"brainpoolP256r1", "1.3.36.3.3.2.8.1.1.7", "06092B2403030208010107", 256},
|
{"brainpoolP256r1", "1.3.36.3.3.2.8.1.1.7", "06092B2403030208010107", 256},
|
||||||
{"brainpoolP320r1", "1.3.36.3.3.2.8.1.1.9", "06092B2403030208010109", 320},
|
{"brainpoolP320r1", "1.3.36.3.3.2.8.1.1.9", "06092B2403030208010109", 320},
|
||||||
|
|
||||||
{"secp192k1", "1.3.132.0.31", "06052B8104001F", 192},
|
{"secp192k1", "1.3.132.0.31", "06052B8104001F", 192},
|
||||||
{"secp256k1", "1.3.132.0.10", "06052B8104000A", 256},
|
{"secp256k1", "1.3.132.0.10", "06052B8104000A", 256},
|
||||||
{NULL, NULL, NULL, 0},
|
{NULL, NULL, NULL, 0},
|
||||||
|
|
Loading…
Reference in New Issue