aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2018-08-01 15:49:54 -0400
committerJack Lloyd <[email protected]>2018-08-01 15:49:54 -0400
commit347ec79d2488e15b7fe5f5fba3d7038a034338d2 (patch)
tree1fe37a85891975d880fdcd05d93d50f4fe3e02f8
parent9ed3fce1e6d3e17d384fa837c5451e3e3573619d (diff)
Add OID for HMAC with SHA-512/256
-rw-r--r--src/build-data/oids.txt1
-rw-r--r--src/lib/asn1/oid_maps.cpp4
2 files changed, 4 insertions, 1 deletions
diff --git a/src/build-data/oids.txt b/src/build-data/oids.txt
index 4f9affadf..a918436cd 100644
--- a/src/build-data/oids.txt
+++ b/src/build-data/oids.txt
@@ -114,6 +114,7 @@
1.2.840.113549.2.9 = HMAC(SHA-256)
1.2.840.113549.2.10 = HMAC(SHA-384)
1.2.840.113549.2.11 = HMAC(SHA-512)
+1.2.840.113549.2.13 = HMAC(SHA-512-256)
[keywrap]
# Keywrap algorithms
diff --git a/src/lib/asn1/oid_maps.cpp b/src/lib/asn1/oid_maps.cpp
index c69b3a08a..e9c55706e 100644
--- a/src/lib/asn1/oid_maps.cpp
+++ b/src/lib/asn1/oid_maps.cpp
@@ -1,7 +1,7 @@
/*
* OID maps
*
-* This file was automatically generated by ./src/scripts/oids.py on 2018-07-24
+* This file was automatically generated by ./src/scripts/oids.py on 2018-08-01
*
* All manual edits to this file will be lost. Edit the script
* then regenerate this source file.
@@ -86,6 +86,7 @@ std::unordered_map<std::string, std::string> OIDS::load_oid2str_map()
{ "1.2.840.113549.1.9.7", "PKCS9.ChallengePassword" },
{ "1.2.840.113549.2.10", "HMAC(SHA-384)" },
{ "1.2.840.113549.2.11", "HMAC(SHA-512)" },
+ { "1.2.840.113549.2.13", "HMAC(SHA-512-256)" },
{ "1.2.840.113549.2.5", "MD5" },
{ "1.2.840.113549.2.7", "HMAC(SHA-160)" },
{ "1.2.840.113549.2.8", "HMAC(SHA-224)" },
@@ -301,6 +302,7 @@ std::unordered_map<std::string, OID> OIDS::load_str2oid_map()
{ "HMAC(SHA-256)", OID({1,2,840,113549,2,9}) },
{ "HMAC(SHA-384)", OID({1,2,840,113549,2,10}) },
{ "HMAC(SHA-512)", OID({1,2,840,113549,2,11}) },
+ { "HMAC(SHA-512-256)", OID({1,2,840,113549,2,13}) },
{ "KeyWrap.AES-128", OID({2,16,840,1,101,3,4,1,5}) },
{ "KeyWrap.AES-192", OID({2,16,840,1,101,3,4,1,25}) },
{ "KeyWrap.AES-256", OID({2,16,840,1,101,3,4,1,45}) },