diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2015-11-06 14:55:10 +0100 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2015-11-06 14:55:31 +0100 |
| commit | a88d958933ef0a03c67d97da5352bff398a45a59 (patch) | |
| tree | 3c88380df7cb1cfa3eed7dbc28db0aca0794e8f9 /src/libstrongswan/crypto/hashers/hasher.c | |
| parent | 6590298dadaf754315e0d1096466f5499dd3d86e (diff) | |
| download | strongswan-a88d958933ef0a03c67d97da5352bff398a45a59.tar.bz2 strongswan-a88d958933ef0a03c67d97da5352bff398a45a59.tar.xz | |
Explicitly mention SHA2 algorithm in BLISS OIDs and signature schemes
Diffstat (limited to 'src/libstrongswan/crypto/hashers/hasher.c')
| -rw-r--r-- | src/libstrongswan/crypto/hashers/hasher.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libstrongswan/crypto/hashers/hasher.c b/src/libstrongswan/crypto/hashers/hasher.c index d936e126b..8e3b7de0a 100644 --- a/src/libstrongswan/crypto/hashers/hasher.c +++ b/src/libstrongswan/crypto/hashers/hasher.c @@ -387,11 +387,11 @@ int hasher_signature_algorithm_to_oid(hash_algorithm_t alg, key_type_t key) switch (alg) { case HASH_SHA256: - return OID_BLISS_WITH_SHA256; + return OID_BLISS_WITH_SHA2_256; case HASH_SHA384: - return OID_BLISS_WITH_SHA384; + return OID_BLISS_WITH_SHA2_384; case HASH_SHA512: - return OID_BLISS_WITH_SHA512; + return OID_BLISS_WITH_SHA2_512; case HASH_SHA3_256: return OID_BLISS_WITH_SHA3_256; case HASH_SHA3_384: @@ -427,19 +427,19 @@ hash_algorithm_t hasher_from_signature_scheme(signature_scheme_t scheme) case SIGN_RSA_EMSA_PKCS1_SHA256: case SIGN_ECDSA_WITH_SHA256_DER: case SIGN_ECDSA_256: - case SIGN_BLISS_WITH_SHA256: + case SIGN_BLISS_WITH_SHA2_256: case SIGN_BLISS_WITH_SHA3_256: return HASH_SHA256; case SIGN_RSA_EMSA_PKCS1_SHA384: case SIGN_ECDSA_WITH_SHA384_DER: case SIGN_ECDSA_384: - case SIGN_BLISS_WITH_SHA384: + case SIGN_BLISS_WITH_SHA2_384: case SIGN_BLISS_WITH_SHA3_384: return HASH_SHA384; case SIGN_RSA_EMSA_PKCS1_SHA512: case SIGN_ECDSA_WITH_SHA512_DER: case SIGN_ECDSA_521: - case SIGN_BLISS_WITH_SHA512: + case SIGN_BLISS_WITH_SHA2_512: case SIGN_BLISS_WITH_SHA3_512: return HASH_SHA512; } |