diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-07-11 11:25:02 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-07-11 11:25:02 +0200 |
| commit | 78893ee80c9f8c8b0e127d913adb012f585c81fb (patch) | |
| tree | 6b6373e2e3a02d9f01389e8279f33b4bdf661701 /erts | |
| parent | 0da48905b544052287c42ced84b4a2274ae56d84 (diff) | |
| parent | 4c0fd1f5d056b49a321f579d90c79f176e74fcc1 (diff) | |
| download | otp-78893ee80c9f8c8b0e127d913adb012f585c81fb.tar.gz otp-78893ee80c9f8c8b0e127d913adb012f585c81fb.tar.bz2 otp-78893ee80c9f8c8b0e127d913adb012f585c81fb.zip | |
Merge branch 'ingela/backport/merge' into maint
* ingela/backport/merge:
ssl: Prepare for release
ssl: Fix test case to only check relevant info for the test
ssl: Correct connection_information on ECC-curves
ssl: No cipher suite sign restriction in TLS-1.2
ssl: Add psk as anonymous key exchange in ssl_handshake:select_hashsign/5
ssl: anon test should use dh or ecdh anon keyexchange
ssl: Correct key_usage check
ssl: Fix ECDSA key decode clause
ssl: Avoid hardcoding of cipher suites and fix ECDH suite handling
ssl: Run all test case combinations
ssl: Correct ECC suite and DTLS ECC handling
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions