summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2018-08-16 08:54:35 +1000
committerPauli <paul.dale@oracle.com>2018-09-04 08:09:12 +1000
commite0810e3502bbf14ee274033e7eeabb551ce38510 (patch)
treebda457dbc208227d39c25cd684f84925568cb304 /include
parentbdd58bd249f1b6d4c7ccdd9c54fd33db874e0084 (diff)
Fix HMAC SHA3-224 and HMAC SHA3-256.
Added NIST test cases for these two as well. Additionally deprecate the public definiton of HMAC_MAX_MD_CBLOCK in 1.2.0. Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/6972)
Diffstat (limited to 'include')
-rw-r--r--include/openssl/hmac.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/openssl/hmac.h b/include/openssl/hmac.h
index 9f06896059..458efc1d51 100644
--- a/include/openssl/hmac.h
+++ b/include/openssl/hmac.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -14,7 +14,9 @@
# include <openssl/evp.h>
-# define HMAC_MAX_MD_CBLOCK 128/* largest known is SHA512 */
+# if OPENSSL_API_COMPAT < 0x10200000L
+# define HMAC_MAX_MD_CBLOCK 128 /* Deprecated */
+# endif
#ifdef __cplusplus
extern "C" {