diff options
| author | Hans Nilsson <[email protected]> | 2018-08-23 14:32:34 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-08-23 14:32:34 +0200 |
| commit | c30530b3b3512668d9851cd8b88a7d4ad6aeafc3 (patch) | |
| tree | 6402fc45a8be56e338e0f0fc59636d1ba5389707 /lib/crypto/src/crypto.erl | |
| parent | a1a72225ec74dfcbc07506af216151ce34765e82 (diff) | |
| parent | 74b745494dfa7ef091c0b59dee284606f3d23ce3 (diff) | |
| download | otp-c30530b3b3512668d9851cd8b88a7d4ad6aeafc3.tar.gz otp-c30530b3b3512668d9851cd8b88a7d4ad6aeafc3.tar.bz2 otp-c30530b3b3512668d9851cd8b88a7d4ad6aeafc3.zip | |
Merge branch 'maint'
* maint:
crypto: doc x25519 & x448
crypto: Test vectors for ecdh x25519 and x448
crypto: Remove the term 'eddh'
crypto: Enable EDDH all OpenSSL cryptolib over beta version 1.1.1-pre8
ssh: Doc updates
ssh: spec curve25519 & curve448
ssh: Fix non-conforming key generation in kex for x25519 and x448
ssh: Enable curve448-sha512 and curve25519-sha256
ssh: Remove the term 'eddh'
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/crypto.erl')
| -rw-r--r-- | lib/crypto/src/crypto.erl | 3 |
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)). |