Merge branch 'fredrik/ssh/fix-idle-tests' into fredrik/ssh/rekeying

* fredrik/ssh/fix-idle-tests: (50 commits)
  Modifications to idle_time testcase
  Teach Win installer to handle redist on w2012/w8
  ssl: Receive port EXIT-message so that it does not get mixed up with the protocol-error message we are expecting
  ssl: Add and enhance tests
  ssl: Consider new server options when resuming a session
  Prepare release
  ssl: Add dependencies to Makefile
  Simplify the code for the generated info/0 function
  Don't try to work around a non-loadable NIF library
  Fix BER encoding when multiple levels of typedefs are used
  Update megaco documentation
  Update documentation for the asn1 application
  Fix other applications
  Fix use of asn1 in megaco
  Remove the unused asn1ct_gen_ber module
  Fix erroneous skipping for jinterface, erl_interface and ic
  kernel: Heart port needs to be unregistered
  Update preloaded modules
  Update primary bootstrap
  Update copyright years
  ...

3 files changed, 47 insertions, 3 deletions

diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 36010da07a..d4acb2ef1a 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -29,6 +29,50 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 2.1.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    SSH quiet mode</p>
+          <p>
+	    A new option to ssh:connect/3,4, quiet_mode. If true, the
+	    client will not print out anything on authorization.</p>
+          <p>
+	    Own Id: OTP-10429 Aux Id: kunagi-273 [184] </p>
+        </item>
+        <item>
+          <p>
+	    Restrict which key algorithms to use</p>
+          <p>
+	    A new option to ssh:connect/3,4 is introduced,
+	    public_key_algs, where you can restrict which key
+	    algorithms to use and in which order to try them.</p>
+          <p>
+	    Own Id: OTP-10498 Aux Id: kunagi-289 [200] </p>
+        </item>
+        <item>
+          <p>
+	    Confidentiality of client password</p>
+          <p>
+	    Unsets clients password after authentication.</p>
+          <p>
+	    Own Id: OTP-10511 Aux Id: kunagi-292 [203] </p>
+        </item>
+        <item>
+          <p>
+	    Fixed user interaction for SSH</p>
+          <p>
+	    It's now available to accept hosts and input password</p>
+          <p>
+	    Own Id: OTP-10513 Aux Id: kunagi-293 [204] </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 2.1.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/src/ssh_io.erl b/lib/ssh/src/ssh_io.erl
index 17a7cebb4a..01fc713569 100644
--- a/lib/ssh/src/ssh_io.erl
+++ b/lib/ssh/src/ssh_io.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index e1949daba2..efcb11f88f 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -42,7 +42,6 @@ all() ->
      {group, dsa_pass_key},
      {group, rsa_pass_key},
      {group, internal_error},
-     {group, idle_time},
      daemon_already_started,
      server_password_option,
      server_userpassword_option,
@@ -247,7 +246,8 @@ idle_time(Config) ->
     ConnectionRef =
 	ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
 					  {user_dir, UserDir},
-					  {user_interaction, false}]),
+					  {user_interaction, false},
+					  {idle_time, 2000}]),
     {ok, Id} = ssh_connection:session_channel(ConnectionRef, 1000),
     ssh_connection:close(ConnectionRef, Id),
     receive