diff options
| author | Bill Cox <waywardgeek@google.com> | 2016-03-09 23:08:31 +0100 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-11 10:39:10 -0500 |
| commit | 2d0b44126763f989a4cbffbffe9d0c7518158bb7 (patch) | |
| tree | 241855d2b5a9b91688f969bf849037f6a0343594 /include | |
| parent | 40f43f8a2e7c75f032672d198604e4fbd6a60fd8 (diff) | |
Add blake2 support.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/evp.h | 4 | ||||
| -rw-r--r-- | include/openssl/obj_mac.h | 10 | ||||
| -rw-r--r-- | include/openssl/objects.h | 10 |
3 files changed, 24 insertions, 0 deletions
diff --git a/include/openssl/evp.h b/include/openssl/evp.h index 4516db130e..c5598133e3 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -700,6 +700,10 @@ const EVP_MD *EVP_md4(void); const EVP_MD *EVP_md5(void); const EVP_MD *EVP_md5_sha1(void); # endif +# ifndef OPENSSL_NO_BLAKE2 +const EVP_MD *EVP_blake2b(void); +const EVP_MD *EVP_blake2s(void); +# endif const EVP_MD *EVP_sha1(void); const EVP_MD *EVP_sha224(void); const EVP_MD *EVP_sha256(void); diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h index 4725a6c574..28d9637735 100644 --- a/include/openssl/obj_mac.h +++ b/include/openssl/obj_mac.h @@ -2078,6 +2078,16 @@ #define NID_ripemd160WithRSA 119 #define OBJ_ripemd160WithRSA 1L,3L,36L,3L,3L,1L,2L +#define SN_blake2b "BLAKE2b" +#define LN_blake2b "blake2b" +#define NID_blake2b 1056 +#define OBJ_blake2b 1L,3L,6L,1L,4L,1L,1722L,12L,2L,1L,16L + +#define SN_blake2s "BLAKE2s" +#define LN_blake2s "blake2s" +#define NID_blake2s 1057 +#define OBJ_blake2s 1L,3L,6L,1L,4L,1L,1722L,12L,2L,2L,8L + #define SN_sxnet "SXNetID" #define LN_sxnet "Strong Extranet ID" #define NID_sxnet 143 diff --git a/include/openssl/objects.h b/include/openssl/objects.h index 05bc9b0248..7766f3a32f 100644 --- a/include/openssl/objects.h +++ b/include/openssl/objects.h @@ -642,6 +642,16 @@ # define NID_ripemd160WithRSA 119 # define OBJ_ripemd160WithRSA 1L,3L,36L,3L,3L,1L,2L +# define SN_blake2b "BLAKE2b" +# define LN_blake2b "blake2b" +# define NID_blake2b 1022 +# define OBJ_blake2b 1,3,6,1,4,1,1722,12,2,1,16 + +# define SN_blake2s "BLAKE2s" +# define LN_blake2s "blake2" +# define NID_blake2s 1023 +# define OBJ_blake2s 1,3,6,1,4,1,1722,12,2,2,8 + /*- * Taken from rfc2040 * RC5_CBC_Parameters ::= SEQUENCE { |