diff options
author | Pauli <paul.dale@oracle.com> | 2019-06-28 00:02:00 +1000 |
---|---|---|
committer | Pauli <paul.dale@oracle.com> | 2019-07-01 17:41:31 +1000 |
commit | 3f1679b26101561ae6974e450b0c8876ece152c6 (patch) | |
tree | 05a96223b8c5dc4a61063d8f6865e3b76f1919fc /crypto/objects/objects.txt | |
parent | e955edcda6a567369e55ac5e33fb90a2d4ad39b0 (diff) |
Add OIDs for kmac128, kmac256 and blake2.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9277)
Diffstat (limited to 'crypto/objects/objects.txt')
-rw-r--r-- | crypto/objects/objects.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index 566438948f..dcdfa903c5 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -14,12 +14,6 @@ iso 3 : identified-organization # GMAC OID iso 0 9797 3 4 : GMAC : gmac -# There are no OIDs for these yet... - : KMAC128 : kmac128 - : KMAC256 : kmac256 - : BLAKE2BMAC : blake2bmac - : BLAKE2SMAC : blake2smac - # HMAC OIDs identified-organization 6 1 5 5 8 1 1 : HMAC-MD5 : hmac-md5 identified-organization 6 1 5 5 8 1 2 : HMAC-SHA1 : hmac-sha1 @@ -709,8 +703,10 @@ algorithm 29 : RSA-SHA1-2 : sha1WithRSA 1 3 36 3 2 1 : RIPEMD160 : ripemd160 1 3 36 3 3 1 2 : RSA-RIPEMD160 : ripemd160WithRSA -1 3 6 1 4 1 1722 12 2 1 16 : BLAKE2b512 : blake2b512 -1 3 6 1 4 1 1722 12 2 2 8 : BLAKE2s256 : blake2s256 +1 3 6 1 4 1 1722 12 2 1 : BLAKE2BMAC : blake2bmac +1 3 6 1 4 1 1722 12 2 2 : BLAKE2SMAC : blake2smac +blake2bmac 16 : BLAKE2b512 : blake2b512 +blake2smac 8 : BLAKE2s256 : blake2s256 !Cname sxnet 1 3 101 1 4 1 : SXNetID : Strong Extranet ID @@ -987,6 +983,10 @@ nist_hashalgs 16 : id-hmacWithSHA3-512 : hmac-sha3-512 # how to handle them... # nist_hashalgs 17 : id-shake128-len : shake128-len # nist_hashalgs 18 : id-shake256-len : shake256-len +nist_hashalgs 19 : KMAC128 : kmac128 +nist_hashalgs 20 : KMAC256 : kmac256 +# nist_hashalgs 21 : KMAC128-XOF : kmac128-xof +# nist_hashalgs 22 : KMAC256-XOF : kmac256-xof # OIDs for dsa-with-sha224 and dsa-with-sha256 !Alias dsa_with_sha2 nistAlgorithms 3 |