aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-11-09 09:55:57 +0100
committerIngela Anderton Andin <[email protected]>2016-11-09 09:55:57 +0100
commit3f14d19422844e3443128e035be24c64347aecc9 (patch)
treeea9e2b25b4b29c263c65b34dbd18da03a5eda4bf /lib
parent99bb976389c8971b755f103a67143815a6b3e388 (diff)
parented42404dded81e6261a0fcd707c22e4bee4df059 (diff)
downloadotp-3f14d19422844e3443128e035be24c64347aecc9.tar.gz
otp-3f14d19422844e3443128e035be24c64347aecc9.tar.bz2
otp-3f14d19422844e3443128e035be24c64347aecc9.zip
Merge branch 'maint'
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) ->