diff options
| author | lloyd <[email protected]> | 2010-02-24 02:18:55 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-02-24 02:18:55 +0000 |
| commit | 6e50979c8d2a0635599228a2ae1a20d59b24a0c6 (patch) | |
| tree | 587aaf6c20d45a6fa81ee180ca0aa533f51403d1 /src/libstate/policy.cpp | |
| parent | 888fc3d0f2f6f1dc5e9764e83e9b7fd64da916d8 (diff) | |
| parent | 8c951ef2f1e54e1134e8db683662ec881df89c88 (diff) | |
propagate from branch 'net.randombit.botan' (head 84baf58b29f3aaaee34e2b873d0040be5a6c4368)
to branch 'net.randombit.botan.gost_3410' (head 63cbe3e357c071d7960bfedc31101eff35895285)
Diffstat (limited to 'src/libstate/policy.cpp')
| -rw-r--r-- | src/libstate/policy.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/libstate/policy.cpp b/src/libstate/policy.cpp index 45c99e674..3e9c8e122 100644 --- a/src/libstate/policy.cpp +++ b/src/libstate/policy.cpp @@ -48,6 +48,8 @@ void set_default_oids(Library_State& config) add_oid(config, "2.16.840.1.101.3.4.1.2", "AES-128/CBC"); add_oid(config, "2.16.840.1.101.3.4.1.22", "AES-192/CBC"); add_oid(config, "2.16.840.1.101.3.4.1.42", "AES-256/CBC"); + add_oid(config, "1.2.410.200004.1.4", "SEED/CBC"); // RFC 4010 + add_oid(config, "1.3.6.1.4.1.25258.3.1", "Serpent/CBC"); /* Hash Functions */ add_oid(config, "1.2.840.113549.2.5", "MD5"); @@ -59,6 +61,13 @@ void set_default_oids(Library_State& config) add_oid(config, "2.16.840.1.101.3.4.2.2", "SHA-384"); add_oid(config, "2.16.840.1.101.3.4.2.3", "SHA-512"); + /* MACs */ + add_oid(config, "1.2.840.113549.2.7", "HMAC(SHA-1)"); + add_oid(config, "1.2.840.113549.2.8", "HMAC(SHA-224)"); + add_oid(config, "1.2.840.113549.2.9", "HMAC(SHA-256)"); + add_oid(config, "1.2.840.113549.2.10", "HMAC(SHA-384)"); + add_oid(config, "1.2.840.113549.2.11", "HMAC(SHA-512)"); + /* Key Wrap */ add_oid(config, "1.2.840.113549.1.9.16.3.6", "KeyWrap.TripleDES"); add_oid(config, "1.2.840.113549.1.9.16.3.7", "KeyWrap.RC2"); |