diff options
author | Marcus Arendt <[email protected]> | 2014-09-03 10:14:56 +0200 |
---|---|---|
committer | Marcus Arendt <[email protected]> | 2014-09-03 10:14:56 +0200 |
commit | 8ad5bd0ef8143f5ac32bd2df11d59a20e7eb0527 (patch) | |
tree | d01f65439f9074afc57818f1c1aacfc323d91b04 /lib/public_key/asn1/OTP-PKIX.asn1 | |
parent | ab526c6500c61d03e632fefcac9f46c08c150556 (diff) | |
parent | e3a947d06915bde9d11e80b9d6f4e31460a3cf51 (diff) | |
download | otp-8ad5bd0ef8143f5ac32bd2df11d59a20e7eb0527.tar.gz otp-8ad5bd0ef8143f5ac32bd2df11d59a20e7eb0527.tar.bz2 otp-8ad5bd0ef8143f5ac32bd2df11d59a20e7eb0527.zip |
Merge branch 'arekinath/ssh/aes-ctr' into maint
* arekinath/ssh/aes-ctr:
ssh: check if ssh client supports newer cipher- and MAC-algorithms
SSH: only enable ciphers/MACs when they are available in crypto
SSH: add ssh_to_openssh test for ciphers and macs
SSH: documentation update for new algos
SSH: add support for aes128-ctr and hmac-sha2-256
Diffstat (limited to 'lib/public_key/asn1/OTP-PKIX.asn1')
0 files changed, 0 insertions, 0 deletions