diff options
| author | Hans Nilsson <[email protected]> | 2015-10-13 15:26:14 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-10-13 15:26:14 +0200 |
| commit | 11229947bed829ee0691d9669a4858fd8cf6cbb7 (patch) | |
| tree | a7b20c66a103222093d24d29a9c563c7a596eaef /lib/ssh/src | |
| parent | c0178877c9d404b90d71f52e6324d5c40ceae905 (diff) | |
| parent | 3c787f47ffc660d77eba3528b10eba570529fb9e (diff) | |
| download | otp-11229947bed829ee0691d9669a4858fd8cf6cbb7.tar.gz otp-11229947bed829ee0691d9669a4858fd8cf6cbb7.tar.bz2 otp-11229947bed829ee0691d9669a4858fd8cf6cbb7.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssh/src')
| -rw-r--r-- | lib/ssh/src/ssh.erl | 6 | ||||
| -rw-r--r-- | lib/ssh/src/ssh_transport.hrl | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl index 132de71aed..15591fb4a7 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -117,9 +117,9 @@ channel_info(ConnectionRef, ChannelId, Options) -> ssh_connection_handler:channel_info(ConnectionRef, ChannelId, Options). %%-------------------------------------------------------------------- --spec daemon(integer()) -> {ok, pid()}. --spec daemon(integer(), proplists:proplist()) -> {ok, pid()}. --spec daemon(any | inet:ip_address(), integer(), proplists:proplist()) -> {ok, pid()}. +-spec daemon(integer()) -> {ok, pid()} | {error, term()}. +-spec daemon(integer(), proplists:proplist()) -> {ok, pid()} | {error, term()}. +-spec daemon(any | inet:ip_address(), integer(), proplists:proplist()) -> {ok, pid()} | {error, term()}. %% Description: Starts a server listening for SSH connections %% on the given port. diff --git a/lib/ssh/src/ssh_transport.hrl b/lib/ssh/src/ssh_transport.hrl index 96ab1bb668..17a0daebe3 100644 --- a/lib/ssh/src/ssh_transport.hrl +++ b/lib/ssh/src/ssh_transport.hrl @@ -33,7 +33,7 @@ -define(MAX_NUM_ALGORITHMS, 200). -define(DEFAULT_DH_GROUP_MIN, 1024). --define(DEFAULT_DH_GROUP_NBITS, 6144). +-define(DEFAULT_DH_GROUP_NBITS, 2048). -define(DEFAULT_DH_GROUP_MAX, 8192). %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% |