aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-11-08 18:22:34 +0100
committerIngela Anderton Andin <[email protected]>2016-11-09 09:44:21 +0100
commit12e1c70c90ad1ba53ae5221717c7ae53dc73fd5a (patch)
tree285bb9f2d6d0f37a9d14f03902d8118cf6049582 /lib
parent3e06b82f0f29d90bff0783e7f3d1dabb435782f5 (diff)
downloadotp-12e1c70c90ad1ba53ae5221717c7ae53dc73fd5a.tar.gz
otp-12e1c70c90ad1ba53ae5221717c7ae53dc73fd5a.tar.bz2
otp-12e1c70c90ad1ba53ae5221717c7ae53dc73fd5a.zip
ssl: Remove faulty workaround
We where never really satisfied with this workaround it was a bit far fetched, so we are pleased to be able to remove it.
Diffstat (limited to 'lib')
-rw-r--r--lib/ssl/test/ssl_ECC_SUITE.erl13
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) ->