diff options
author | Hans Nilsson <[email protected]> | 2015-11-06 10:25:24 +0100 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2015-11-06 10:25:24 +0100 |
commit | 98ce5c34a27b3fd95febba5c44d87bfdbd40a822 (patch) | |
tree | 464119590e616987173862960dfe5d7d85413b2e /lib/ssh/test/ssh_protocol_SUITE_data | |
parent | 2204a4b614447551e4d70c47f885d8c9901f7cb0 (diff) | |
parent | a3bc0687a34623824bf980c9ed19eb204dcccf66 (diff) | |
download | otp-98ce5c34a27b3fd95febba5c44d87bfdbd40a822.tar.gz otp-98ce5c34a27b3fd95febba5c44d87bfdbd40a822.tar.bz2 otp-98ce5c34a27b3fd95febba5c44d87bfdbd40a822.zip |
Merge branch 'maint'
* maint:
ssh: correct a bad doc xref
public_key: renamed priv/ssh_moduli -> priv/moduli
ssh, public_key: updates after doc review
ssh: changes after doc review
ssh: extend 'dh_gex_limits' to server side
ssh: option dh_gex_groups with tag ssh_moduli_file
ssh, public_key: random selection of diffie-hellman moduli
Diffstat (limited to 'lib/ssh/test/ssh_protocol_SUITE_data')
-rw-r--r-- | lib/ssh/test/ssh_protocol_SUITE_data/dh_group_test.moduli | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/ssh/test/ssh_protocol_SUITE_data/dh_group_test.moduli b/lib/ssh/test/ssh_protocol_SUITE_data/dh_group_test.moduli new file mode 100644 index 0000000000..f6995ba4c9 --- /dev/null +++ b/lib/ssh/test/ssh_protocol_SUITE_data/dh_group_test.moduli @@ -0,0 +1,3 @@ +20151021104105 2 6 100 2222 5 B7 +20151021104106 2 6 100 1111 5 4F + |