diff options
| author | Jack Lloyd <[email protected]> | 2016-11-18 15:18:13 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2016-11-18 15:18:13 -0500 |
| commit | 7c522b481ac2adc441335812062cd1e06daa42af (patch) | |
| tree | b89a50dff9011de26fe74e4ad3d2578c8358de94 /src/lib/asn1 | |
| parent | eb59bf8c33ed4dbb3990351954bfb7112e6cf273 (diff) | |
Add key_constraints_to_string, GOST-34.10 cert handling
Add some try/catch blocks to the X.509 tests, and use create_private_key API
Diffstat (limited to 'src/lib/asn1')
| -rw-r--r-- | src/lib/asn1/oids.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/asn1/oids.cpp b/src/lib/asn1/oids.cpp index 88752bc4d..2f7597981 100644 --- a/src/lib/asn1/oids.cpp +++ b/src/lib/asn1/oids.cpp @@ -1,7 +1,7 @@ /* * OID maps * -* This file was automatically generated by ./src/scripts/oids.py on 2016-11-17 +* This file was automatically generated by ./src/scripts/oids.py on 2016-11-18 * * Botan is released under the Simplified BSD License (see license.txt) */ @@ -99,6 +99,7 @@ std::string lookup(const OID& oid) if(oid_str == "1.3.6.1.4.1.25258.1.3") return "McEliece"; if(oid_str == "1.3.6.1.4.1.25258.1.4") return "Curve25519"; if(oid_str == "1.3.6.1.4.1.25258.1.5") return "XMSS"; + if(oid_str == "1.3.6.1.4.1.25258.1.6.1") return "GOST-34.10/EMSA1(SHA-256)"; if(oid_str == "1.3.6.1.4.1.25258.3.1") return "Serpent/CBC"; if(oid_str == "1.3.6.1.4.1.25258.3.101") return "Serpent/GCM"; if(oid_str == "1.3.6.1.4.1.25258.3.102") return "Twofish/GCM"; @@ -257,6 +258,7 @@ OID lookup(const std::string& name) if(name == "ElGamal") return OID("1.3.6.1.4.1.3029.1.2.1"); if(name == "GOST-34.10") return OID("1.2.643.2.2.19"); if(name == "GOST-34.10/EMSA1(GOST-R-34.11-94)") return OID("1.2.643.2.2.3"); + if(name == "GOST-34.10/EMSA1(SHA-256)") return OID("1.3.6.1.4.1.25258.1.6.1"); if(name == "HMAC(SHA-160)") return OID("1.2.840.113549.2.7"); if(name == "HMAC(SHA-224)") return OID("1.2.840.113549.2.8"); if(name == "HMAC(SHA-256)") return OID("1.2.840.113549.2.9"); |