Add scrypt OID from draft-josefsson-scrypt-kdf-03
authorDr. Stephen Henson <steve@openssl.org>
Fri, 30 Jan 2015 16:08:18 +0000 (16:08 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Thu, 21 May 2015 11:48:02 +0000 (12:48 +0100)
commit96b96d6c456befe49d5845a029e2bb0a4addc58d
treebb29f26b1389e532df11949d90a2392d67a42c3a
parent3e8e688f867a1ec1e554da67f111fa58a6ee1138
Add scrypt OID from draft-josefsson-scrypt-kdf-03

Reviewed-by: Rich Salz <rsalz@openssl.org>
crypto/objects/obj_dat.h
crypto/objects/obj_mac.num
crypto/objects/objects.txt
include/openssl/obj_mac.h