aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2016-06-13 13:21:22 +0200
committerErlang/OTP <[email protected]>2016-06-13 13:21:22 +0200
commit60b02048d3b51e4e59d324f52d482dcb338b3c47 (patch)
treeb9d04bd7d034e15cd45b1a4c1bd9e8a8dc149e9d /lib/public_key
parentd76ad05a499556d3b82e10ab08c4aa0d819d598f (diff)
parent7001063d331e5702ba21bfec3b3d84c06a31fefb (diff)
downloadotp-60b02048d3b51e4e59d324f52d482dcb338b3c47.tar.gz
otp-60b02048d3b51e4e59d324f52d482dcb338b3c47.tar.bz2
otp-60b02048d3b51e4e59d324f52d482dcb338b3c47.zip
Merge branch 'kennethlakin/maint/tls-use-negotiated-prf/PR-1042/OTP-13546' into maint-18
* kennethlakin/maint/tls-use-negotiated-prf/PR-1042/OTP-13546: ssl: Use cipher suite's PRF in prf/5
Diffstat (limited to 'lib/public_key')
0 files changed, 0 insertions, 0 deletions