aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2015-01-30 16:08:18 +0000
committerDr. Stephen Henson <steve@openssl.org>2015-05-21 12:48:02 +0100
commit96b96d6c456befe49d5845a029e2bb0a4addc58d (patch)
treebb29f26b1389e532df11949d90a2392d67a42c3a /include
parent3e8e688f867a1ec1e554da67f111fa58a6ee1138 (diff)
downloadopenssl-96b96d6c456befe49d5845a029e2bb0a4addc58d.tar.gz
Add scrypt OID from draft-josefsson-scrypt-kdf-03
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'include')
-rw-r--r--include/openssl/obj_mac.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h
index 475a9dc34d..0e6a99ee20 100644
--- a/include/openssl/obj_mac.h
+++ b/include/openssl/obj_mac.h
@@ -4264,3 +4264,7 @@
#define LN_jurisdictionCountryName "jurisdictionCountryName"
#define NID_jurisdictionCountryName 957
#define OBJ_jurisdictionCountryName 1L,3L,6L,1L,4L,1L,311L,60L,2L,1L,3L
+
+#define SN_id_scrypt "id-scrypt"
+#define NID_id_scrypt 973
+#define OBJ_id_scrypt 1L,3L,6L,1L,4L,1L,11591L,4L,11L