diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-11-23 17:07:08 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-11-23 17:07:08 +0100 |
| commit | 6a51514556328dcc56de8f2b75eae01b18b96637 (patch) | |
| tree | e22dac4c9e289a29646838b1406d144d915ea31a /lib/ssl/src/ssl_handshake.erl | |
| parent | 754afa1d10e32d2e50d0a8b5ddf316037ba9d6fc (diff) | |
| parent | a453532fe31eecd8c39b5035702ee20b402fd687 (diff) | |
| download | otp-6a51514556328dcc56de8f2b75eae01b18b96637.tar.gz otp-6a51514556328dcc56de8f2b75eae01b18b96637.tar.bz2 otp-6a51514556328dcc56de8f2b75eae01b18b96637.zip | |
Merge branch 'maint'
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/ssl/src/ssl_handshake.erl')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index 1560340ccf..24f3a97b9b 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -1224,7 +1224,6 @@ certificate_authorities_from_db(_CertDbHandle, {extracted, CertDbData}) -> [], CertDbData). %%-------------Handle handshake messages -------------------------------- - validation_fun_and_state({Fun, UserState0}, Role, CertDbHandle, CertDbRef, ServerNameIndication, CRLCheck, CRLDbHandle, CertPath) -> {fun(OtpCert, {extension, _} = Extension, {SslState, UserState}) -> |