diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-11-09 09:53:58 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-11-09 09:53:58 +0100 |
| commit | ed42404dded81e6261a0fcd707c22e4bee4df059 (patch) | |
| tree | b74342f81e15613e689a3e78a5e222d3d7b516c5 /lib | |
| parent | 992c594106ca23cd4120249cd904f6ffa7bdd13e (diff) | |
| parent | 12e1c70c90ad1ba53ae5221717c7ae53dc73fd5a (diff) | |
| download | otp-ed42404dded81e6261a0fcd707c22e4bee4df059.tar.gz otp-ed42404dded81e6261a0fcd707c22e4bee4df059.tar.bz2 otp-ed42404dded81e6261a0fcd707c22e4bee4df059.zip | |
Merge branch 'ingela/ssl/ECC-faulty-workaround' into maint
* ingela/ssl/ECC-faulty-workaround:
ssl: Remove faulty workaround
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/test/ssl_ECC_SUITE.erl | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/lib/ssl/test/ssl_ECC_SUITE.erl b/lib/ssl/test/ssl_ECC_SUITE.erl index bd0c630d41..76999185b6 100644 --- a/lib/ssl/test/ssl_ECC_SUITE.erl +++ b/lib/ssl/test/ssl_ECC_SUITE.erl @@ -566,17 +566,8 @@ new_openssl_ca(FileName, CA, OwnCa) -> E1 = public_key:pem_decode(P1), {ok, P2} = file:read_file(OwnCa), E2 = public_key:pem_decode(P2), - case os:cmd("openssl version") of - "OpenSSL 1.0.1p-freebsd" ++ _ -> - Pem = public_key:pem_encode(E1 ++E2), - file:write_file(FileName, Pem); - "LibreSSL" ++ _ -> - Pem = public_key:pem_encode(E1 ++E2), - file:write_file(FileName, Pem); - _ -> - Pem = public_key:pem_encode(E2 ++E1), - file:write_file(FileName, Pem) - end, + Pem = public_key:pem_encode(E2 ++E1), + file:write_file(FileName, Pem), FileName. supported_eccs(Opts) -> |