diff options
| author | Martin Willi <martin@strongswan.org> | 2009-08-27 17:36:17 +0200 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2009-08-27 17:37:42 +0200 |
| commit | 472cb4ce77295feebc6deff49d863ea1917576cb (patch) | |
| tree | 177a006d5652b3eee048500d83ba2526041886e7 /src/libstrongswan/credentials/keys/public_key.c | |
| parent | 78aa4ebd6296d8447914cdd0b9e53cc1f4343806 (diff) | |
| download | strongswan-472cb4ce77295feebc6deff49d863ea1917576cb.tar.bz2 strongswan-472cb4ce77295feebc6deff49d863ea1917576cb.tar.xz | |
distinguish between RFC 4754 (concatenated) and RFC 3279 (DER encoded) ECDSA signatures
Diffstat (limited to 'src/libstrongswan/credentials/keys/public_key.c')
| -rw-r--r-- | src/libstrongswan/credentials/keys/public_key.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/libstrongswan/credentials/keys/public_key.c b/src/libstrongswan/credentials/keys/public_key.c index 4abaf4010..8958a3576 100644 --- a/src/libstrongswan/credentials/keys/public_key.c +++ b/src/libstrongswan/credentials/keys/public_key.c @@ -32,8 +32,11 @@ ENUM(signature_scheme_names, SIGN_UNKNOWN, SIGN_ECDSA_521, "RSA_EMSA_PKCS1_SHA256", "RSA_EMSA_PKCS1_SHA384", "RSA_EMSA_PKCS1_SHA512", + "ECDSA_WITH_SHA1_DER", + "ECDSA_WITH_SHA256_DER", + "ECDSA_WITH_SHA384_DER", + "ECDSA_WITH_SHA512_DER", "ECDSA_WITH_NULL", - "ECDSA_WITH_SHA1", "ECDSA-256", "ECDSA-384", "ECDSA-521", @@ -90,13 +93,13 @@ signature_scheme_t signature_scheme_from_oid(int oid) return SIGN_RSA_EMSA_PKCS1_SHA512; case OID_ECDSA_WITH_SHA1: case OID_EC_PUBLICKEY: - return SIGN_ECDSA_WITH_SHA1; + return SIGN_ECDSA_WITH_SHA1_DER; case OID_ECDSA_WITH_SHA256: - return SIGN_ECDSA_256; + return SIGN_ECDSA_WITH_SHA256_DER; case OID_ECDSA_WITH_SHA384: - return SIGN_ECDSA_384; + return SIGN_ECDSA_WITH_SHA384_DER; case OID_ECDSA_WITH_SHA512: - return SIGN_ECDSA_521; + return SIGN_ECDSA_WITH_SHA512_DER; default: return SIGN_UNKNOWN; } |