diff options
| author | Kurt Roeckx <kurt@roeckx.be> | 2016-03-10 00:49:55 +0100 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-11 10:39:10 -0500 |
| commit | 208527a75dd9584e2715c0eebcfad8c730d0dfae (patch) | |
| tree | a5f56cd5debd4bb9fbe29f0a1f0df8075b236753 /include | |
| parent | 2d0b44126763f989a4cbffbffe9d0c7518158bb7 (diff) | |
Review comments
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 | 18 | ||||
| -rw-r--r-- | include/openssl/objects.h | 10 |
3 files changed, 11 insertions, 21 deletions
diff --git a/include/openssl/evp.h b/include/openssl/evp.h index c5598133e3..af05e66481 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -701,8 +701,8 @@ 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); +const EVP_MD *EVP_blake2b512(void); +const EVP_MD *EVP_blake2s256(void); # endif const EVP_MD *EVP_sha1(void); const EVP_MD *EVP_sha224(void); diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h index 28d9637735..5d7adc758b 100644 --- a/include/openssl/obj_mac.h +++ b/include/openssl/obj_mac.h @@ -2078,15 +2078,15 @@ #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_blake2b512 "BLAKE2b512" +#define LN_blake2b512 "blake2b512" +#define NID_blake2b512 1056 +#define OBJ_blake2b512 1L,3L,6L,1L,4L,1L,1722L,12L,2L,1L,16L + +#define SN_blake2s256 "BLAKE2s256" +#define LN_blake2s256 "blake2s256" +#define NID_blake2s256 1057 +#define OBJ_blake2s256 1L,3L,6L,1L,4L,1L,1722L,12L,2L,2L,8L #define SN_sxnet "SXNetID" #define LN_sxnet "Strong Extranet ID" diff --git a/include/openssl/objects.h b/include/openssl/objects.h index 7766f3a32f..05bc9b0248 100644 --- a/include/openssl/objects.h +++ b/include/openssl/objects.h @@ -642,16 +642,6 @@ # 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 { |