diff options
| author | Marcus Arendt <[email protected]> | 2014-09-04 10:29:47 +0200 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-09-04 10:29:47 +0200 |
| commit | b3d60c0696395bee97e6a7244f16eda771b3ca39 (patch) | |
| tree | e99b80667251727dd71bf87124128e73d6e8b4cc /erts | |
| parent | b1e31df9dc737df798cfd67a5e3aa7541410a295 (diff) | |
| parent | 7603a4029514a644c8323028b06acdc33e45b286 (diff) | |
| download | otp-b3d60c0696395bee97e6a7244f16eda771b3ca39.tar.gz otp-b3d60c0696395bee97e6a7244f16eda771b3ca39.tar.bz2 otp-b3d60c0696395bee97e6a7244f16eda771b3ca39.zip | |
Merge branch 'RoadRunnr/ssl/add-aes-gcm-cipher'
* RoadRunnr/ssl/add-aes-gcm-cipher:
ssl: add draft-agl-tls-chacha20poly1305-04 Chacha20/Poly1305 Suites
crypto: add support for ChaCha20/Policy1305 AEAD cipher
ssl: fix OpenSSL name filter in ssl tests
ssl: add PSK-GCM suites
ssl: implement AES128-GCM suites
crypto: add AES128-GCM cipher support
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions