diff options
| author | Hans Nilsson <[email protected]> | 2018-09-13 12:16:18 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-09-13 12:16:18 +0200 |
| commit | cd0b40c28547f88d1bca1a85fba407bfead9b4d9 (patch) | |
| tree | ab0144280990027d2b6c51648e5b3df9bc71e4f7 /lib/ssh | |
| parent | d1ff3b3bec26a5f6bc354581d3056ee6277d39eb (diff) | |
| parent | 9df71f46b41e34b0be5cd561533e2b3d3948dc57 (diff) | |
| download | otp-cd0b40c28547f88d1bca1a85fba407bfead9b4d9.tar.gz otp-cd0b40c28547f88d1bca1a85fba407bfead9b4d9.tar.bz2 otp-cd0b40c28547f88d1bca1a85fba407bfead9b4d9.zip | |
Merge branch 'maint'
* maint:
ssh: Use exported crypto types
public_key: Generate refman from types and specs
public_key: Rework -type and -spec Check existing specs with code and documentation and adjust. Prepare for doc generation
public_key: Setup for doc generation
public_key: Remove special type signature for one test
crypto: Add missing documentation for enable_fips_mode/1
crypto: Generate refman from types and specs and fix links in engine chapter for generated crypto module refman
crypto: Rework -type and -spec Check code and documentation and write -type/-spec or adjust existing. Prepare for doc generation
crypto: Setup for doc generation
crypto: A user's guide chapter on algorithm details Such as keylengths, blocksizes and IV lengths are hard to find otherwise
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/src/ssh.hrl | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl index 66dbf0b144..94b9f3a196 100644 --- a/lib/ssh/src/ssh.hrl +++ b/lib/ssh/src/ssh.hrl @@ -260,13 +260,7 @@ | accept_callback() | {HashAlgoSpec::fp_digest_alg(), accept_callback()}. --type fp_digest_alg() :: 'md5' | - 'sha' | - 'sha224' | - 'sha256' | - 'sha384' | - 'sha512' - . +-type fp_digest_alg() :: 'md5' | crypto:sha1() | crypto:sha2() . -type accept_callback() :: fun((PeerName::string(), fingerprint() ) -> boolean()) . -type fingerprint() :: string() | [string()]. |