aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto/src
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-08-23 14:28:37 +0200
committerHans Nilsson <[email protected]>2018-08-23 14:28:37 +0200
commit3ce7755593390478c13c78b683aabc915853b1bf (patch)
treec2aaca13cbe60a33229c189c6c99a5e422bba9df /lib/crypto/src
parentd3e7e665d8b687094c0857dd086654350bec9055 (diff)
parent99818214c45ebbe9e7a20f739ab1f9e801d61d98 (diff)
downloadotp-3ce7755593390478c13c78b683aabc915853b1bf.tar.gz
otp-3ce7755593390478c13c78b683aabc915853b1bf.tar.bz2
otp-3ce7755593390478c13c78b683aabc915853b1bf.zip
Merge branch 'hans/crypto/SHA3/OTP-15153' into maint
* hans/crypto/SHA3/OTP-15153: crypto: Disable non-working SHA3_224 and SHA3_256 crypto: doc SHA3 (hash & hmac) crypto: Tests for SHA3 crypto: SHA3 hash on OpenSSL-1.1.1
Diffstat (limited to 'lib/crypto/src')
-rw-r--r--lib/crypto/src/crypto.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index f6a785303b..a9d933f5d7 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -143,7 +143,8 @@ hash(Hash, Data0) ->
hash(Hash, Data, erlang:byte_size(Data), MaxBytes).
-spec hash_init('md5'|'md4'|'ripemd160'|
- 'sha'|'sha224'|'sha256'|'sha384'|'sha512') -> any().
+ 'sha'|'sha224'|'sha256'|'sha384'|'sha512'|
+ 'sha3_224' | 'sha3_256' | 'sha3_384' | 'sha3_512') -> any().
hash_init(Hash) ->
notsup_to_error(hash_init_nif(Hash)).