]> granicus.if.org Git - openssl/commit
Add new OIDs from RFC5753
authorDr. Stephen Henson <steve@openssl.org>
Wed, 17 Jul 2013 13:54:00 +0000 (14:54 +0100)
committerDr. Stephen Henson <steve@openssl.org>
Tue, 1 Oct 2013 13:01:17 +0000 (14:01 +0100)
commiteebd5e5dd7dff58297ea52e1c21df8fccd593965
tree98799682cef3c526be3f5963b229c8796eee01d9
parent868b266451266b51bd8c2f2b47be187b58f576aa
Add new OIDs from RFC5753

Add OIDs for KDF schemes from RFC5753 and add cross references for
each type and the appropriate digest to use.
(cherry picked from commit 6af440ced43d766e418c2eb0cda1525eecd3e62b)

Conflicts:

crypto/objects/obj_dat.h
crypto/objects/obj_mac.num
crypto/objects/obj_dat.h
crypto/objects/obj_mac.h
crypto/objects/obj_mac.num
crypto/objects/obj_xref.h
crypto/objects/obj_xref.txt
crypto/objects/objects.txt