diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-03-16 12:56:50 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-03-16 12:56:50 +0100 |
| commit | bce42f4c31bf552269eb787c61a979b3fb34c87e (patch) | |
| tree | c5cff90caf1c399659ad0249c8141795476fab60 /lib/ssl/src | |
| parent | 1cbc44aa05d4abf958e4bf7d5014668df3d98e90 (diff) | |
| parent | 6b91fe9f46381c65f2786d014626a0df81fc802f (diff) | |
| download | otp-bce42f4c31bf552269eb787c61a979b3fb34c87e.tar.gz otp-bce42f4c31bf552269eb787c61a979b3fb34c87e.tar.bz2 otp-bce42f4c31bf552269eb787c61a979b3fb34c87e.zip | |
Merge branch 'ingela/ssl/dtls-test'
* ingela/ssl/dtls-test:
dtls: Correct version check
dtls: Test case fixes
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index ed04c7e67b..45fc29723f 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -1118,7 +1118,7 @@ validate_versions([Version | Rest], Versions) when Version == 'tlsv1.2'; Version == sslv3 -> tls_validate_versions(Rest, Versions); validate_versions([Version | Rest], Versions) when Version == 'dtlsv1'; - Version == 'dtlsv2'-> + Version == 'dtlsv1.2'-> dtls_validate_versions(Rest, Versions); validate_versions([Ver| _], Versions) -> throw({error, {options, {Ver, {versions, Versions}}}}). @@ -1136,7 +1136,7 @@ tls_validate_versions([Ver| _], Versions) -> dtls_validate_versions([], Versions) -> Versions; dtls_validate_versions([Version | Rest], Versions) when Version == 'dtlsv1'; - Version == 'dtlsv2'-> + Version == 'dtlsv1.2'-> dtls_validate_versions(Rest, Versions); dtls_validate_versions([Ver| _], Versions) -> throw({error, {options, {Ver, {versions, Versions}}}}). |