aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Thorsen <lars@erlang.org>2011-11-08 14:10:53 +0100
committerLars Thorsen <lars@erlang.org>2011-11-18 15:00:35 +0100
commitbf48907f0e318e7ccd573d1eeeabc0eb14cf6b7a (patch)
tree61c4d45f56e20f982857e058783b44671ca47b48
parent405322cc25ae4343ec824c2d611553534d1b1b92 (diff)
downloadotp-bf48907f0e318e7ccd573d1eeeabc0eb14cf6b7a.tar.gz
otp-bf48907f0e318e7ccd573d1eeeabc0eb14cf6b7a.tar.bz2
otp-bf48907f0e318e7ccd573d1eeeabc0eb14cf6b7a.zip
[orber] Remove usage of ssl:seed/1
-rw-r--r--lib/orber/test/csiv2_SUITE.erl4
-rw-r--r--lib/orber/test/multi_ORB_SUITE.erl2
-rw-r--r--lib/orber/test/orber_test_lib.erl3
-rw-r--r--lib/orber/vsn.mk2
4 files changed, 3 insertions, 8 deletions
diff --git a/lib/orber/test/csiv2_SUITE.erl b/lib/orber/test/csiv2_SUITE.erl
index 95cd8c56b3..406a8ea693 100644
--- a/lib/orber/test/csiv2_SUITE.erl
+++ b/lib/orber/test/csiv2_SUITE.erl
@@ -696,7 +696,6 @@ ssl_client_peercert_api(_Config) ->
?match({ok,_,_}, orber_test_lib:js_node(Options)),
crypto:start(),
ssl:start(),
- ssl:seed("testing"),
SSLOptions = orber_test_lib:get_options(ssl, server),
{ok, LSock} = ?match({ok, _}, ssl:listen(0, SSLOptions)),
{ok, {_Address, LPort}} = ?match({ok, {_, _}}, ssl:sockname(LSock)),
@@ -857,8 +856,7 @@ fake_server_ORB(Type, Port, Options, Action, Data) ->
start_ssl(ssl) ->
crypto:start(),
- ssl:start(),
- ssl:seed("testing");
+ ssl:start();
start_ssl(_) ->
ok.
diff --git a/lib/orber/test/multi_ORB_SUITE.erl b/lib/orber/test/multi_ORB_SUITE.erl
index 608fb23f3e..b9453663c3 100644
--- a/lib/orber/test/multi_ORB_SUITE.erl
+++ b/lib/orber/test/multi_ORB_SUITE.erl
@@ -1683,7 +1683,6 @@ ssl_reconfigure(ExtraSSLOptions) ->
{ip_address, IP}|ExtraSSLOptions])),
orber_test_lib:remote_apply(ServerNode, ssl, start, []),
orber_test_lib:remote_apply(ServerNode, crypto, start, []),
- orber_test_lib:remote_apply(ServerNode, ssl, seed, ["testing"]),
?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
install_test_data,
[ssl])),
@@ -1713,7 +1712,6 @@ ssl_reconfigure(ExtraSSLOptions) ->
[ssl])),
orber_test_lib:remote_apply(ClientNode, ssl, start, []),
orber_test_lib:remote_apply(ServerNode, crypto, start, []),
- orber_test_lib:remote_apply(ClientNode, ssl, seed, ["testing"]),
Obj = ?match(#'IOP_IOR'{},
orber_test_lib:remote_apply(ClientNode, corba,
string_to_object, ["corbaname:iiop:1.1@"++Loopback++":5648/NameService#mamba",
diff --git a/lib/orber/test/orber_test_lib.erl b/lib/orber/test/orber_test_lib.erl
index ffc13d0e3c..903ab1d771 100644
--- a/lib/orber/test/orber_test_lib.erl
+++ b/lib/orber/test/orber_test_lib.erl
@@ -296,8 +296,7 @@ slave_sup() ->
start_ssl(true, Node) ->
rpc:call(Node, ssl, start, []),
- rpc:call(Node, crypto, start, []),
- rpc:call(Node, ssl, seed, ["testing"]);
+ rpc:call(Node, crypto, start, []);
start_ssl(_, _) ->
ok.
diff --git a/lib/orber/vsn.mk b/lib/orber/vsn.mk
index 29b21e8e01..0eac1e1410 100644
--- a/lib/orber/vsn.mk
+++ b/lib/orber/vsn.mk
@@ -1,3 +1,3 @@
-ORBER_VSN = 3.6.22
+ORBER_VSN = 3.6.23