aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-08-04 10:56:26 +0200
committerHans Nilsson <[email protected]>2015-08-04 10:56:26 +0200
commite05f0b617f85547cc3c537dda3678d9c9a0e80c1 (patch)
treef985063dcc7d3572873906a78239c3fc33215f72 /erts/emulator
parent98647fcc1632f60871adee20031e294e5d5b6eb0 (diff)
parent481eb2c445eeb350cd370aa4880e7c72c5173cfc (diff)
downloadotp-e05f0b617f85547cc3c537dda3678d9c9a0e80c1.tar.gz
otp-e05f0b617f85547cc3c537dda3678d9c9a0e80c1.tar.bz2
otp-e05f0b617f85547cc3c537dda3678d9c9a0e80c1.zip
Merge branch 'hans/ssh/diffie-hellman-group-exchange-shaN/OTP-12672' into maint
* hans/ssh/diffie-hellman-group-exchange-shaN/OTP-12672: ssh: added more groups for gex ssh: rm ssh_math and use crypto:compute_key instead ssh: filter algs unknown to crypto (except pk) ssh: add test group ssh: Add experimental 'diffie-hellman-group-exchange-sha256 support ssh: Repair/add experimental diffie-hellman-group-exchange-sha1 support
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions