aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-03-02 20:48:10 +0000
committerlloyd <[email protected]>2010-03-02 20:48:10 +0000
commite04cd85725b712c747ef5dbed2e94b7a7207ef22 (patch)
treea729ef8cac3392a681897c01332801280b765063 /src
parenta4578ff53ffa39b71032765cd02ebdd5ea6cb6eb (diff)
Modify the ECDSA signature OIDs. Previously the ones using the BSI
scheme, which is supposed to use the IEEE 1363-style concatenation format, was identified with the X9.62 OIDs, which are documented to use the DER sequence format. Switch the BSI ones to use the OIDs allocated for this purpose by BSI, and add the X9.62 ECDSA/SHA-1 OID since that was missing. Correct an ECDSA test that assumed the cert was identified with the BSI OID, even though in fact the cert in question uses an X9.62-style format.
Diffstat (limited to 'src')
-rw-r--r--src/libstate/policy.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/libstate/policy.cpp b/src/libstate/policy.cpp
index 456b4948e..c0dc64ec6 100644
--- a/src/libstate/policy.cpp
+++ b/src/libstate/policy.cpp
@@ -93,12 +93,14 @@ void set_default_oids(Library_State& config)
add_oid(config, "2.16.840.1.101.3.4.3.1", "DSA/EMSA1(SHA-224)");
add_oid(config, "2.16.840.1.101.3.4.3.2", "DSA/EMSA1(SHA-256)");
- add_oid(config, "1.2.840.10045.4.1", "ECDSA/EMSA1_BSI(SHA-160)");
- add_oid(config, "1.2.840.10045.4.3.1", "ECDSA/EMSA1_BSI(SHA-224)");
- add_oid(config, "1.2.840.10045.4.3.2", "ECDSA/EMSA1_BSI(SHA-256)");
- add_oid(config, "1.2.840.10045.4.3.3", "ECDSA/EMSA1_BSI(SHA-384)");
- add_oid(config, "1.2.840.10045.4.3.4", "ECDSA/EMSA1_BSI(SHA-512)");
-
+ add_oid(config, "0.4.0.127.0.7.1.1.4.1.1", "ECDSA/EMSA1_BSI(SHA-160)");
+ add_oid(config, "0.4.0.127.0.7.1.1.4.1.2", "ECDSA/EMSA1_BSI(SHA-224)");
+ add_oid(config, "0.4.0.127.0.7.1.1.4.1.3", "ECDSA/EMSA1_BSI(SHA-256)");
+ add_oid(config, "0.4.0.127.0.7.1.1.4.1.4", "ECDSA/EMSA1_BSI(SHA-384)");
+ add_oid(config, "0.4.0.127.0.7.1.1.4.1.5", "ECDSA/EMSA1_BSI(SHA-512)");
+ add_oid(config, "0.4.0.127.0.7.1.1.4.1.6", "ECDSA/EMSA1_BSI(RIPEMD-160)");
+
+ add_oid(config, "1.2.840.10045.4.1", "ECDSA/EMSA1(SHA-160)");
add_oid(config, "1.2.840.10045.4.3.1", "ECDSA/EMSA1(SHA-224)");
add_oid(config, "1.2.840.10045.4.3.2", "ECDSA/EMSA1(SHA-256)");
add_oid(config, "1.2.840.10045.4.3.3", "ECDSA/EMSA1(SHA-384)");