20 files changed, 351 insertions, 119 deletions
diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
index 285537643e..94d156b0ec 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
@@ -85,7 +85,7 @@ DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
 
 ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
 SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@
-CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME) -l$(SSL_SSL_LIBNAME)
+CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME)
 else
 SSL_DED_LD_RUNTIME_LIBRARY_PATH=
 CRYPTO_LINK_LIB=$(SSL_LIBDIR)/lib$(SSL_CRYPTO_LIBNAME).a 
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index 4dc62421d2..4be593e208 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -1456,10 +1456,37 @@ static ERL_NIF_TERM rc2_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM a
     return ret;
 }
 
+static int get_rsa_private_key(ErlNifEnv* env, ERL_NIF_TERM key, RSA *rsa)
+{
+    /* key=[E,N,D]|[E,N,D,P1,P2,E1,E2,C] */
+    ERL_NIF_TERM head, tail;
+
+    if (!enif_get_list_cell(env, key, &head, &tail)
+	|| !get_bn_from_mpint(env, head, &rsa->e)
+	|| !enif_get_list_cell(env, tail, &head, &tail)
+	|| !get_bn_from_mpint(env, head, &rsa->n)
+	|| !enif_get_list_cell(env, tail, &head, &tail)
+	|| !get_bn_from_mpint(env, head, &rsa->d)
+	|| (!enif_is_empty_list(env, tail) &&
+	    (!enif_get_list_cell(env, tail, &head, &tail)
+	     || !get_bn_from_mpint(env, head, &rsa->p)
+	     || !enif_get_list_cell(env, tail, &head, &tail)
+	     || !get_bn_from_mpint(env, head, &rsa->q)
+	     || !enif_get_list_cell(env, tail, &head, &tail)
+	     || !get_bn_from_mpint(env, head, &rsa->dmp1)
+	     || !enif_get_list_cell(env, tail, &head, &tail)
+	     || !get_bn_from_mpint(env, head, &rsa->dmq1)
+	     || !enif_get_list_cell(env, tail, &head, &tail)
+	     || !get_bn_from_mpint(env, head, &rsa->iqmp)
+	     || !enif_is_empty_list(env, tail)))) {
+	return 0;
+    }
+    return 1;
+}
+
 static ERL_NIF_TERM rsa_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Type,Data,Key=[E,N,D]) */
+{/* (Type,Data,Key=[E,N,D]|[E,N,D,P1,P2,E1,E2,C]) */
     ErlNifBinary data_bin, ret_bin;
-    ERL_NIF_TERM head, tail;
     unsigned char hmacbuf[SHA_DIGEST_LENGTH];
     unsigned rsa_s_len;
     RSA *rsa = RSA_new();
@@ -1470,13 +1497,7 @@ static ERL_NIF_TERM rsa_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar
     else goto badarg;
 
     if (!inspect_mpint(env,argv[1],&data_bin)
-	|| !enif_get_list_cell(env, argv[2], &head, &tail)
-	|| !get_bn_from_mpint(env, head, &rsa->e)
-	|| !enif_get_list_cell(env, tail, &head, &tail)
-	|| !get_bn_from_mpint(env, head, &rsa->n)
-	|| !enif_get_list_cell(env, tail, &head, &tail)
-	|| !get_bn_from_mpint(env, head, &rsa->d)
-	|| !enif_is_empty_list(env,tail)) {
+	|| !get_rsa_private_key(env, argv[2], rsa)) {
     badarg:
 	RSA_free(rsa);
 	return enif_make_badarg(env);
@@ -1623,20 +1644,13 @@ static ERL_NIF_TERM rsa_public_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TER
 }
 
 static ERL_NIF_TERM rsa_private_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Data, PublKey=[E,N,D], Padding, IsEncrypt) */
+{/* (Data, Key=[E,N,D]|[E,N,D,P1,P2,E1,E2,C], Padding, IsEncrypt) */
     ErlNifBinary data_bin, ret_bin;
-    ERL_NIF_TERM head, tail;
     int padding, i;
     RSA* rsa = RSA_new();
 
     if (!enif_inspect_binary(env, argv[0], &data_bin)
-	|| !enif_get_list_cell(env, argv[1], &head, &tail)
-	|| !get_bn_from_mpint(env, head, &rsa->e)
-	|| !enif_get_list_cell(env, tail, &head, &tail)
-	|| !get_bn_from_mpint(env, head, &rsa->n)
-	|| !enif_get_list_cell(env, tail, &head, &tail)
-	|| !get_bn_from_mpint(env, head, &rsa->d)
-	|| !enif_is_empty_list(env,tail)
+	|| !get_rsa_private_key(env, argv[1], rsa)
 	|| !rsa_pad(argv[2], &padding)) {
 
 	RSA_free(rsa);
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index 8cb893cd1c..19db6c9dd4 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -870,10 +870,15 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
       <fsummary>Sign the data using rsa with the given key.</fsummary>
       <type>
         <v>Data = Mpint</v>
-        <v>Key = [E, N, D]</v>
+        <v>Key = [E, N, D] | [E, N, D, P1, P2, E1, E2, C]</v>
         <v>E, N, D = Mpint</v>
         <d>Where <c>E</c> is the public exponent, <c>N</c> is public modulus and 
 	  <c>D</c> is the private exponent.</d>
+	<v>P1, P2, E1, E2, C = Mpint</v>
+	<d>The longer key format contains redundant information that will make
+	   the calculation faster. <c>P1,P2</c> are first and second prime factors.
+           <c>E1,E2</c> are first and second exponents. <c>C</c> is the CRT coefficient.
+           Terminology is taken from RFC 3447.</d>
 	<v>DigestType = md5 | sha</v>
 	<d>The default <c>DigestType</c> is sha.</d>
         <v>Mpint = binary()</v>
@@ -943,10 +948,15 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
       <fsummary>Decrypts ChipherText using the private Key.</fsummary>
       <type>
 	<v>ChipherText = binary()</v>
-	<v>PrivateKey = [E, N, D]</v>
+	<v>PrivateKey = [E, N, D] | [E, N, D, P1, P2, E1, E2, C]</v>
 	<v>E, N, D = Mpint</v>
 	<d>Where <c>E</c> is the public exponent, <c>N</c> is public modulus  and 
 	  <c>D</c> is the private exponent.</d>
+	<v>P1, P2, E1, E2, C = Mpint</v>
+	<d>The longer key format contains redundant information that will make
+	   the calculation faster. <c>P1,P2</c> are first and second prime factors.
+           <c>E1,E2</c> are first and second exponents. <c>C</c> is the CRT coefficient.
+           Terminology is taken from RFC 3447.</d>
 	<v>Padding = rsa_pkcs1_padding | rsa_pkcs1_oaep_padding | rsa_no_padding</v>
         <v>PlainText = binary()</v>
       </type>
@@ -965,10 +975,15 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
       <fsummary>Encrypts Msg using the private Key.</fsummary>
       <type>
 	<v>PlainText = binary()</v>
-	<v>PrivateKey = [E, N, D]</v>
-	<v>E, N, D = Mpint</v>	
+	<v>PrivateKey = [E, N, D] | [E, N, D, P1, P2, E1, E2, C]</v>
+	<v>E, N, D = Mpint</v>
 	<d>Where <c>E</c> is the public exponent, <c>N</c> is public modulus and 
 	  <c>D</c> is the private exponent.</d>
+	<v>P1, P2, E1, E2, C = Mpint</v>
+	<d>The longer key format contains redundant information that will make
+	   the calculation faster. <c>P1,P2</c> are first and second prime factors.
+           <c>E1,E2</c> are first and second exponents. <c>C</c> is the CRT coefficient.
+           Terminology is taken from RFC 3447.</d>
 	<v>Padding = rsa_pkcs1_padding | rsa_no_padding</v>
         <v>ChipherText = binary()</v>
       </type>
diff --git a/lib/dialyzer/test/small_SUITE_data/results/port_info_test b/lib/dialyzer/test/small_SUITE_data/results/port_info_test
index 9ee863f9eb..863a3d61df 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/port_info_test
+++ b/lib/dialyzer/test/small_SUITE_data/results/port_info_test
@@ -3,4 +3,5 @@ port_info_test.erl:10: The pattern {'connected', 42} can never match the type 'u
 port_info_test.erl:14: The pattern {'registered_name', "42"} can never match the type 'undefined' | {'registered_name',atom()}
 port_info_test.erl:19: The pattern {'output', 42} can never match the type 'undefined' | {'connected',pid()}
 port_info_test.erl:24: Guard test 'links' =:= Atom::'connected' can never succeed
-port_info_test.erl:28: The pattern {'gazonk', _} can never match the type 'undefined' | {'connected' | 'id' | 'input' | 'links' | 'name' | 'output' | 'registered_name',atom() | pid() | [pid() | char()] | integer()}
+port_info_test.erl:28: The pattern {'gazonk', _} can never match the type 'undefined' | {'connected' | 'id' | 'input' | 'links' | 'name' | 'os_pid' | 'output' | 'registered_name',atom() | pid() | [pid() | char()] | integer()}
+port_info_test.erl:32: The pattern {'os_pid', "42"} can never match the type 'undefined' | {'os_pid','undefined' | non_neg_integer()}
diff --git a/lib/dialyzer/test/small_SUITE_data/src/port_info_test.erl b/lib/dialyzer/test/small_SUITE_data/src/port_info_test.erl
index 2ee9a3a6e2..07f22256c9 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/port_info_test.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/port_info_test.erl
@@ -3,7 +3,7 @@
 %% and the quality of the warnings that Dialyzer spits out
 %%
 -module(port_info_test).
--export([t1/1, t2/1, t3/1, t4/1, t5/2, buggy/1]).
+-export([t1/1, t2/1, t3/1, t4/1, t5/2, t6/1, buggy/1]).
 
 %% The following errors are correctly caught, but the messages are a bit weird
 t1(X) when is_port(X) ->
@@ -28,6 +28,10 @@ t5(X, Atom) when is_port(X) ->
   {gazonk, _} = erlang:port_info(X, Atom);
 t5(_, _) -> ok.
 
+t6(X) when is_port(X) ->
+  {os_pid, "42"} = erlang:port_info(X, os_pid);
+t6(_) -> ok.
+
 %% The type system is not strong enough to catch the following errors
 buggy(X) when is_atom(X) ->
   {links, X} = erlang:port_info(foo, X).
diff --git a/lib/eldap/.gitignore b/lib/eldap/.gitignore
index 5585418186..d3dd8228d5 100644
--- a/lib/eldap/.gitignore
+++ b/lib/eldap/.gitignore
@@ -1,4 +1,4 @@
 *.beam
 *.asn1db
-src/ELDAPv3.hrl
-src/ELDAPv3.erl
+ebin/ELDAPv3.hrl
+ebin/ELDAPv3.erl
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index 0c2e846010..5033cef8c5 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -1186,6 +1186,7 @@ type(erlang, port_info, 2, Xs) ->
 		     ['links'] -> t_tuple([Item, t_list(t_pid())]);
 		     ['name'] -> t_tuple([Item, t_string()]);
 		     ['output'] -> t_tuple([Item, t_integer()]);
+		     ['os_pid'] -> t_tuple([Item, t_sup(t_non_neg_integer(),t_atom('undefined'))]);
 		     ['registered_name'] -> t_tuple([Item, t_atom()]);
 		     List when is_list(List) ->
 		       t_tuple([t_sup([t_atom(A) || A <- List]),
@@ -3789,7 +3790,7 @@ arg_types(erlang, port_info, 1) ->
 arg_types(erlang, port_info, 2) ->
   [t_sup(t_port(), t_atom()),
    t_atoms(['registered_name', 'id', 'connected',
-	    'links', 'name', 'input', 'output'])];
+	    'links', 'name', 'input', 'output', 'os_pid'])];
 arg_types(erlang, port_to_list, 1) ->
   [t_port()];
 arg_types(erlang, ports, 0) ->
diff --git a/lib/kernel/doc/src/gen_sctp.xml b/lib/kernel/doc/src/gen_sctp.xml
index 579b7f1f74..7275c40e6a 100644
--- a/lib/kernel/doc/src/gen_sctp.xml
+++ b/lib/kernel/doc/src/gen_sctp.xml
@@ -530,19 +530,8 @@
               SCTP data interleaved with other inter-process messages.</p>
           </item>
         </list>
-        <marker id="option-buffer"></marker>
       </item>
-      <tag><c>{buffer, integer()}</c></tag>
-      <item>
-        <p>Determines the size of the user-level software buffer used by
-          the SCTP driver. Not to be confused with <c>sndbuf</c>
-          and <c>recbuf</c> options which correspond to
-          the kernel socket buffers. It is recommended
-          to have <c>val(buffer) &gt;= max(val(sndbuf),val(recbuf))</c>.
-          In fact, the <c>val(buffer)</c> is automatically set to
-          the above maximum when <c>sndbuf</c> or <c>recbuf</c> values are set.</p>
-      </item>
-      <tag><c>{tos, integer()}</c></tag>
+     <tag><c>{tos, integer()}</c></tag>
       <item>
         <p>Sets the Type-Of-Service field on the IP datagrams being sent,
           to the given value, which effectively determines a prioritization
@@ -567,19 +556,8 @@
           <c>{IP,Port}</c> of the socket can be re-used immediately:
           no waiting in the CLOSE_WAIT state is performed (may be
           required for high-throughput servers).</p>
-        <marker id="option-linger"></marker>
-      </item>
-      <tag><c>{linger, {true|false, integer()}</c></tag>
-      <item>
-        <p>Determines the timeout in seconds for flushing unsent data in the
-          <c>gen_sctp:close/1</c> socket call. If the 1st component of the value
-          tuple is <c>false</c>, the 2nd one is ignored, which means that
-          <c>gen_sctp:close/1</c> returns immediately not waiting
-          for data to be flushed. Otherwise, the 2nd component is
-          the flushing time-out in seconds.</p>
-        <marker id="option-sndbuf"></marker>
       </item>
-      <tag><c>{sndbuf, integer()}</c></tag>
+	  <tag><c>{sndbuf, integer()}</c></tag>
       <item>
         <p>The size, in bytes, of the *kernel* send buffer for this socket.
           Sending errors would occur for datagrams larger than
@@ -593,6 +571,15 @@
           <c>val(sndbuf)</c>. Setting this option also adjusts
           the size of the driver buffer (see <c>buffer</c> above).</p>
       </item>
+
+		  <tag><c>{sctp_module, module()}</c></tag>
+		  <item> <p>
+				  Override which callback module is used. Defaults to
+				  <c>inet_sctp</c> for IPv4 and <c>inet6_sctp</c> for IPv6.
+			  </p>
+		  </item>
+
+
       <tag><c>{sctp_rtoinfo, #sctp_rtoinfo{}}</c></tag>
       <item>
 <pre>  #sctp_rtoinfo{
diff --git a/lib/kernel/doc/src/gen_tcp.xml b/lib/kernel/doc/src/gen_tcp.xml
index cf97607af1..daf26a0b63 100644
--- a/lib/kernel/doc/src/gen_tcp.xml
+++ b/lib/kernel/doc/src/gen_tcp.xml
@@ -96,37 +96,47 @@ do_recv(Sock, Bs) ->
           can be either a hostname, or an IP address.</p>
         <p>The available options are:</p>
         <taglist>
-          <tag><c>list</c></tag>
-          <item>
-            <p>Received <c>Packet</c> is delivered as a list.</p>
-          </item>
-          <tag><c>binary</c></tag>
-          <item>
-            <p>Received <c>Packet</c> is delivered as a binary.</p>
-          </item>
-          <tag><c>{ip, ip_address()}</c></tag>
+         <tag><c>{ip, ip_address()}</c></tag>
           <item>
             <p>If the host has several network interfaces, this option
               specifies which one to use.</p>
           </item>
-          <tag><c>{port, Port}</c></tag>
+
+		  <tag><c>{ifaddr, ip_address()}</c></tag>
           <item>
-            <p>Specify which local port number to use.</p>
-          </item>
+			  <p>Same as <c>{ip, ip_address()}</c>. If the host has several network interfaces, this option
+              specifies which one to use.</p>
+		  </item>
+
           <tag><c>{fd, integer() >= 0}</c></tag>
           <item>
             <p>If a socket has somehow been connected without using
               <c>gen_tcp</c>, use this option to pass the file
               descriptor for it.</p>
           </item>
-          <tag><c>inet6</c></tag>
+
+          <tag><c>inet</c></tag>
           <item>
+            <p>Set up the socket for IPv4.</p>
+          </item>
+
+		  <tag><c>inet6</c></tag>
+		  <item>
             <p>Set up the socket for IPv6.</p>
           </item>
-          <tag><c>inet</c></tag>
+
+          <tag><c>{port, Port}</c></tag>
           <item>
-            <p>Set up the socket for IPv4.</p>
+            <p>Specify which local port number to use.</p>
           </item>
+
+		  <tag><c>{tcp_module, module()}</c></tag>
+		  <item> <p>
+				  Override which callback module is used. Defaults to
+				  <c>inet_tcp</c> for IPv4 and <c>inet6_tcp</c> for IPv6.
+			  </p>
+		  </item>
+
           <tag><c>Opt</c></tag>
           <item>
             <p>See
@@ -197,6 +207,13 @@ do_recv(Sock, Bs) ->
               <c>gen_tcp</c>, use this option to pass the file
               descriptor for it.</p>
           </item>
+
+		  <tag><c>{ifaddr, ip_address()}</c></tag>
+          <item>
+			  <p>Same as <c>{ip, ip_address()}</c>. If the host has several network interfaces, this option
+              specifies which one to use.</p>
+		  </item>
+
           <tag><c>inet6</c></tag>
           <item>
             <p>Set up the socket for IPv6.</p>
@@ -205,6 +222,14 @@ do_recv(Sock, Bs) ->
           <item>
             <p>Set up the socket for IPv4.</p>
           </item>
+
+		  <tag><c>{tcp_module, module()}</c></tag>
+		  <item> <p>
+				  Override which callback module is used. Defaults to
+				  <c>inet_tcp</c> for IPv4 and <c>inet6_tcp</c> for IPv6.
+			  </p>
+		  </item>
+
           <tag><c>Opt</c></tag>
           <item>
             <p>See
diff --git a/lib/kernel/doc/src/gen_udp.xml b/lib/kernel/doc/src/gen_udp.xml
index daa9b7d887..6b83dfa030 100644
--- a/lib/kernel/doc/src/gen_udp.xml
+++ b/lib/kernel/doc/src/gen_udp.xml
@@ -72,6 +72,14 @@
             <p>If the host has several network interfaces, this option
               specifies which one to use.</p>
           </item>
+
+		  <tag><c>{ifaddr, ip_address()}</c></tag>
+          <item>
+			  <p>Same as <c>{ip, ip_address()}</c>. If the host has several network interfaces, this option
+              specifies which one to use.</p>
+		  </item>
+
+
           <tag><c>{fd, integer() >= 0}</c></tag>
           <item>
             <p>If a socket has somehow been opened without using
@@ -86,6 +94,51 @@
           <item>
             <p>Set up the socket for IPv4.</p>
           </item>
+
+		  <tag><c>{udp_module, module()}</c></tag>
+		  <item> <p>
+				  Override which callback module is used. Defaults to
+				  <c>inet_udp</c> for IPv4 and <c>inet6_udp</c> for IPv6.
+			  </p>
+		  </item>
+
+          <tag><c>{multicast_if, Address}</c></tag>
+          <item>
+			  <p>Set the local device for a multicast socket.</p>
+          </item>
+ 
+          <tag><c>{multicast_loop, true | false}</c></tag>
+          <item>
+			  <p>
+				  When <c>true</c> sent multicast packets will be looped back to the local
+				  sockets.
+			  </p>
+          </item>
+
+          <tag><c>{multicast_ttl, Integer}</c></tag>
+          <item>
+			  <p>
+				  The <c>multicast_ttl</c> option changes the time-to-live (TTL) for
+				  outgoing multicast datagrams in order to control the scope of the 
+				  multicasts.
+			  </p>
+			  <p>
+				  Datagrams with a TTL of 1 are not forwarded beyond the local
+				  network.
+				  <br />Default: 1
+			  </p>
+          </item>
+
+		  <tag><c>{add_membership, {MultiAddress, InterfaceAddress}}</c></tag>
+          <item>
+			  <p>Join a multicast group. </p>
+          </item>
+
+		  <tag><c>{drop_membership, {MultiAddress, InterfaceAddress}}</c></tag>
+          <item>
+			  <p>Leave multicast group.</p>
+          </item>
+
           <tag><c>Opt</c></tag>
           <item>
             <p>See
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index bf6c4cfb1a..901b4f5c34 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -445,10 +445,33 @@ fe80::204:acff:fe17:bf38
               flow control; the other side will not be able send
               faster than the receiver can read.</p>
           </item>
+
+		  <tag><c>{bit8, clear | set | on | off}</c></tag>
+		  <item>
+			  <p>
+				  Scans every byte in received data-packets and checks if the 8 bit
+				  is set in any of them. Information is retrieved with
+				  <c>inet:getopts/2</c>.
+				  <note>Deprecated! Will be removed in Erlang/OTP R16.</note>
+			  </p>
+		  </item>
+
           <tag><c>{broadcast, Boolean}</c>(UDP sockets)</tag>
           <item>
             <p>Enable/disable permission to send broadcasts.</p>
           </item>
+
+		  <tag><c>{buffer, Size}</c></tag>
+		  <item>
+			  <p>Determines the size of the user-level software buffer used by
+				  the driver. Not to be confused with <c>sndbuf</c>
+				  and <c>recbuf</c> options which correspond to
+				  the kernel socket buffers. It is recommended
+				  to have <c>val(buffer) &gt;= max(val(sndbuf),val(recbuf))</c>.
+				  In fact, the <c>val(buffer)</c> is automatically set to
+				  the above maximum when <c>sndbuf</c> or <c>recbuf</c> values are set.</p>
+		  </item>
+
           <tag><c>{delay_send, Boolean}</c></tag>
           <item>
             <p>Normally, when an Erlang process sends to a socket,
@@ -463,10 +486,19 @@ fe80::204:acff:fe17:bf38
               real property of the socket. Needless to say it is an
               implementation specific option. Default is <c>false</c>.</p>
           </item>
+
+		  <tag><c>{deliver, port | term}</c></tag>
+		  <item> <p> When <c>{active, true}</c> delivers data on the forms
+				  <c>port</c> : <c>{S, {data, [H1,..Hsz | Data]}}</c> or
+				  <c>term</c> : <c>{tcp, S, [H1..Hsz | Data]}</c>.
+				  </p>
+		  </item>
+
           <tag><c>{dontroute, Boolean}</c></tag>
           <item>
             <p>Enable/disable routing bypass for outgoing messages.</p>
           </item>
+
           <tag><c>{exit_on_close, Boolean}</c></tag>
           <item>
             <p>By default this option is set to <c>true</c>.</p>
@@ -476,6 +508,7 @@ fe80::204:acff:fe17:bf38
               <seealso marker="gen_tcp#shutdown/2">gen_tcp:shutdown/2</seealso>
               to shutdown the write side.</p>
           </item>
+
           <tag><c>{header, Size}</c></tag>
           <item>
             <p>This option is only meaningful if the <c>binary</c>
@@ -487,6 +520,15 @@ fe80::204:acff:fe17:bf38
               example <c>Size == 2</c>, the data received will match
               <c>[Byte1,Byte2|Binary]</c>.</p>
           </item>
+
+		  <tag><c>{high_watermark, Size}</c></tag>
+		  <item> <p>
+				  Sender is forced busy if sent and enqueued data
+				  reaches the highwater mark.
+				  <br /> Default: 8192 kB. 
+			  </p>
+		  </item>
+
           <tag><c>{keepalive, Boolean}</c>(TCP/IP sockets)</tag>
           <item>
             <p>Enables/disables periodic transmission on a connected
@@ -495,6 +537,41 @@ fe80::204:acff:fe17:bf38
               considered broken and an error message will be sent to
               the controlling process. Default disabled.</p>
           </item>
+
+		  <tag><c>{linger, {true|false, Seconds}}</c></tag>
+		  <item>
+			  <p>Determines the timeout in seconds for flushing unsent data in the
+				  <c>close/1</c> socket call. If the 1st component of the value
+				  tuple is <c>false</c>, the 2nd one is ignored, which means that
+				  <c>close/1</c> returns immediately not waiting
+				  for data to be flushed. Otherwise, the 2nd component is
+				  the flushing time-out in seconds.</p>
+		  </item>
+
+		  <tag><c>{low_watermark, Size}</c></tag>
+		  <item> <p>
+				  If the port has reached its <c>high_watermark</c> it will
+				  force busy onto senders. When the port data queue reaches the
+				  <c>low_watermark</c> callers are no longer forced busy.
+				  <br /> Default: 4096 kB. 
+			  </p>
+		  </item>
+
+		  <tag><c>{mode, Mode :: binary | list}</c></tag>
+          <item>
+			  <p>Received <c>Packet</c> is delivered as defined by Mode.</p>
+		  </item>
+
+		  <tag><c>list</c></tag>
+          <item>
+			  <p>Received <c>Packet</c> is delivered as a list.</p>
+		  </item>
+
+		  <tag><c>binary</c></tag>
+          <item>
+			  <p>Received <c>Packet</c> is delivered as a binary.</p>
+		  </item>
+
           <tag><c>{nodelay, Boolean}</c>(TCP/IP sockets)</tag>
           <item>
             <p>If <c>Boolean == true</c>, the <c>TCP_NODELAY</c> option
@@ -578,6 +655,16 @@ fe80::204:acff:fe17:bf38
 	    indicated length are accepted and not considered invalid due
 	    to internal buffer limitations.</p>
           </item>
+
+		  <tag><c>{priority, Priority}</c></tag>
+          <item> <p>Set the protocol-defined priority for all packets to be sent
+			  on this socket.</p>
+		  </item>
+
+		  <tag><c>{raw, Protocol, OptionNum, ValueBin}</c></tag>
+          <item> <p>See below.</p>
+		  </item>
+
           <tag><c>{read_packets, Integer}</c>(UDP sockets)</tag>
           <item>
             <p>Sets the max number of UDP packets to read without
@@ -589,7 +676,7 @@ fe80::204:acff:fe17:bf38
               high the system can become unresponsive due to
               UDP packet flooding.</p>
           </item>
-          <tag><c>{recbuf, Integer}</c></tag>
+          <tag><c>{recbuf, Size}</c></tag>
           <item>
             <p>Gives the size of the receive buffer to use for
               the socket.</p>
@@ -620,7 +707,7 @@ fe80::204:acff:fe17:bf38
               Default is <c>false</c> due to backward compatibility.</p>
           </item>
 
-          <tag><c>{sndbuf, Integer}</c></tag>
+          <tag><c>{sndbuf, Size}</c></tag>
           <item>
             <p>Gives the size of the send buffer to use for the socket.</p>
           </item>
@@ -639,6 +726,7 @@ fe80::204:acff:fe17:bf38
               not implemented. Use with caution.</p>
           </item>
         </taglist>
+
         <p>In addition to the options mentioned above, <em>raw</em>
           option specifications can be used. The raw options are
           specified as a tuple of arity four, beginning with the tag
diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl
index ef6bfdf7f4..e6dfdadb03 100644
--- a/lib/kernel/src/gen_tcp.erl
+++ b/lib/kernel/src/gen_tcp.erl
@@ -31,7 +31,6 @@
 
 -type option() ::
         {active,          true | false | once} |
-        {bit8,            clear | set | on | off} |
         {buffer,          non_neg_integer()} |
         {delay_send,      boolean()} |
         {deliver,         port | term} |
@@ -61,7 +60,6 @@
         {tos,             non_neg_integer()}.
 -type option_name() ::
         active |
-        bit8 |
         buffer |
         delay_send |
         deliver |
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index 76d3003ff4..c494f8a864 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 2.15.1
+KERNEL_VSN = 2.15.2
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl
index 2e2a6cd296..9f1a0b3af5 100644
--- a/lib/public_key/src/public_key.erl
+++ b/lib/public_key/src/public_key.erl
@@ -241,15 +241,15 @@ pkix_encode(Asn1Type, Term0, otp) when is_atom(Asn1Type) ->
 decrypt_private(CipherText, Key) ->
     decrypt_private(CipherText, Key, []).
 
-decrypt_private(CipherText, 
-		#'RSAPrivateKey'{modulus = N,publicExponent = E,
-				 privateExponent = D}, 
-		Options)  when is_binary(CipherText), 
-			       is_list(Options) ->
+decrypt_private(CipherText,
+		#'RSAPrivateKey'{modulus = N, publicExponent = E,
+				 privateExponent = D} = Key,
+		Options)
+  when is_binary(CipherText),
+       is_integer(N), is_integer(E), is_integer(D),  
+       is_list(Options) ->
     Padding = proplists:get_value(rsa_pad, Options, rsa_pkcs1_padding),
-    crypto:rsa_private_decrypt(CipherText, 
-			       [crypto:mpint(E), crypto:mpint(N),
-				crypto:mpint(D)], Padding).
+    crypto:rsa_private_decrypt(CipherText, format_rsa_private_key(Key), Padding).
 
 %%--------------------------------------------------------------------
 -spec decrypt_public(CipherText :: binary(), rsa_public_key() | rsa_private_key()) ->
@@ -307,14 +307,29 @@ encrypt_public(PlainText, #'RSAPrivateKey'{modulus=N,publicExponent=E},
 encrypt_private(PlainText, Key) ->
     encrypt_private(PlainText, Key, []).
 
-encrypt_private(PlainText, #'RSAPrivateKey'{modulus = N,
-					    publicExponent = E, 
-					    privateExponent = D}, 
-		Options) when is_binary(PlainText), is_list(Options) ->		
+encrypt_private(PlainText,
+		#'RSAPrivateKey'{modulus = N, publicExponent = E,
+				 privateExponent = D} = Key,
+		Options)
+  when is_binary(PlainText),
+       is_integer(N), is_integer(E), is_integer(D),
+       is_list(Options) ->		
     Padding = proplists:get_value(rsa_pad, Options, rsa_pkcs1_padding),
-    crypto:rsa_private_encrypt(PlainText, [crypto:mpint(E), 
-					   crypto:mpint(N), 
-					   crypto:mpint(D)], Padding).
+    crypto:rsa_private_encrypt(PlainText, format_rsa_private_key(Key), Padding).
+
+
+format_rsa_private_key(#'RSAPrivateKey'{modulus = N, publicExponent = E,
+					privateExponent = D,
+					prime1 = P1, prime2 = P2,
+					exponent1 = E1, exponent2 = E2,
+					coefficient = C})
+  when is_integer(P1), is_integer(P2), 
+       is_integer(E1), is_integer(E2), is_integer(C) ->
+   [crypto:mpint(K) || K <- [E, N, D, P1, P2, E1, E2, C]];
+
+format_rsa_private_key(#'RSAPrivateKey'{modulus = N, publicExponent = E,
+					privateExponent = D}) ->
+   [crypto:mpint(K) || K <- [E, N, D]].
 
 %%--------------------------------------------------------------------
 -spec sign(PlainTextOrDigest :: binary(), rsa_digest_type() | dss_digest_type(), 
@@ -323,15 +338,13 @@ encrypt_private(PlainText, #'RSAPrivateKey'{modulus = N,
 %%
 %% Description: Create digital signature.
 %%--------------------------------------------------------------------
-sign(PlainText, DigestType,  #'RSAPrivateKey'{modulus = N,  publicExponent = E,
-					      privateExponent = D}) 
+sign(PlainText, DigestType,
+     #'RSAPrivateKey'{modulus = N, publicExponent = E, privateExponent = D} = Key)
   when is_binary(PlainText),
-       (DigestType == md5 orelse
-	DigestType == sha) ->
-    
-    crypto:rsa_sign(DigestType, sized_binary(PlainText), [crypto:mpint(E),
-							  crypto:mpint(N),
-							  crypto:mpint(D)]);
+       (DigestType == md5 orelse DigestType == sha),
+       is_integer(N), is_integer(E), is_integer(D)  ->
+    crypto:rsa_sign(DigestType, sized_binary(PlainText),
+                    format_rsa_private_key(Key));
 
 sign(Digest, none, #'DSAPrivateKey'{p = P, q = Q, g = G, x = X}) 
   when is_binary(Digest)->
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 39c7fe329e..f4a40c81a4 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -346,8 +346,9 @@ handle_option([{role, _} = Opt | Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
 handle_option([{compression, _} = Opt | Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
-handle_option([{allow_user_interaction, _} = Opt | Rest], SocketOptions, SshOptions) ->
-    handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
+%%Backwards compatibility
+handle_option([{allow_user_interaction, Value}  | Rest], SocketOptions, SshOptions) ->
+    handle_option(Rest, SocketOptions, [handle_ssh_option({user_interaction, Value}) | SshOptions]);
 handle_option([{infofun, _} = Opt | Rest],SocketOptions, SshOptions) ->
     handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
 handle_option([{connectfun, _} = Opt | Rest], SocketOptions, SshOptions) ->
@@ -366,6 +367,8 @@ handle_option([{ssh_cli, _} = Opt | Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
 handle_option([{shell, _} = Opt | Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
+handle_option([{exec, _} = Opt | Rest], SocketOptions, SshOptions) ->
+    handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
 handle_option([Opt | Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, [handle_inet_option(Opt) | SocketOptions], SshOptions).
 
@@ -401,8 +404,9 @@ handle_ssh_option({key_cb, Value} = Opt)  when is_atom(Value) ->
     Opt;
 handle_ssh_option({compression, Value} = Opt) when is_atom(Value) ->
     Opt;
-handle_ssh_option({allow_user_interaction, Value} = Opt) when Value == true;
-							      Value == false ->
+handle_ssh_option({exec, {Module, Function, _}} = Opt) when is_atom(Module), 
+							    is_atom(Function) ->
+
     Opt;
 handle_ssh_option({infofun, Value} = Opt)  when is_function(Value) ->
     Opt;
@@ -412,11 +416,12 @@ handle_ssh_option({disconnectfun , Value} = Opt) when is_function(Value) ->
     Opt;
 handle_ssh_option({failfun, Value} = Opt) when is_function(Value) ->
     Opt;
-handle_ssh_option({ip_v6_disabled, Value} = Opt) when is_function(Value) ->
+handle_ssh_option({ip_v6_disabled, Value} = Opt) when Value == true;
+						      Value == false ->
     Opt;
 handle_ssh_option({transport, {Protocol, Cb, ClosTag}} = Opt) when is_atom(Protocol),
-							     is_atom(Cb),
-							     is_atom(ClosTag) ->
+								   is_atom(Cb),
+								   is_atom(ClosTag) ->
     Opt;
 handle_ssh_option({subsystems, Value} = Opt) when is_list(Value) ->
     Opt;
@@ -495,4 +500,3 @@ verify_data(Data, Signature, Algorithm) when is_binary(Data), is_binary(Signatur
 	Error ->
 	    Error
     end.
-
diff --git a/lib/ssh/src/ssh_auth.erl b/lib/ssh/src/ssh_auth.erl
index 1a4517c689..aa452a8e09 100644
--- a/lib/ssh/src/ssh_auth.erl
+++ b/lib/ssh/src/ssh_auth.erl
@@ -71,7 +71,7 @@ password_msg([#ssh{opts = Opts, io_cb = IoCb,
     ssh_bits:install_messages(userauth_passwd_messages()),
     Password = case proplists:get_value(password, Opts) of
 		   undefined -> 
-		       user_interaction(Opts, IoCb);
+		       user_interaction(IoCb);
 		   PW -> 
 		       PW
 	       end,
@@ -89,13 +89,10 @@ password_msg([#ssh{opts = Opts, io_cb = IoCb,
 	      Ssh)
     end.
 
-user_interaction(Opts, IoCb) ->
-    case proplists:get_value(allow_user_interaction, Opts, true) of
-	true ->
-	    IoCb:read_password("ssh password: ");
-	false ->
-	    not_ok
-    end.
+user_interaction(ssh_no_io) ->
+    not_ok;
+user_interaction(IoCb) ->
+    IoCb:read_password("ssh password: ").
 
 
 %% See RFC 4256 for info on keyboard-interactive
@@ -124,8 +121,7 @@ init_userauth_request_msg(#ssh{opts = Opts} = Ssh) ->
 	    FirstAlg = algorithm(proplists:get_value(public_key_alg, Opts,
 					  ?PREFERRED_PK_ALG)),
 	    SecondAlg = other_alg(FirstAlg),
-	    AllowUserInt =  proplists:get_value(allow_user_interaction, Opts,
-						true),
+	    AllowUserInt =  proplists:get_value(user_interaction, Opts, true),
 	    Prefs = method_preference(FirstAlg, SecondAlg, AllowUserInt),
 	    ssh_transport:ssh_packet(Msg, Ssh#ssh{user = User,
 					    userauth_preference = Prefs,
diff --git a/lib/ssh/src/ssh_channel.erl b/lib/ssh/src/ssh_channel.erl
index 7b600ed8b2..1938858420 100644
--- a/lib/ssh/src/ssh_channel.erl
+++ b/lib/ssh/src/ssh_channel.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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
@@ -215,7 +215,7 @@ handle_info({ssh_cm, ConnectionManager, {closed, ChannelId}},
 		   close_sent = false} = State) ->
     %% To be on the safe side, i.e. the manager has already been terminated.
     (catch ssh_connection:close(ConnectionManager, ChannelId)),
-    {stop, normal, State};
+    {stop, normal, State#state{close_sent = true}};
 
 handle_info({ssh_cm, _, _} = Msg, #state{cm = ConnectionManager,
 			channel_cb = Module, 
diff --git a/lib/ssh/src/ssh_connection_manager.erl b/lib/ssh/src/ssh_connection_manager.erl
index e993f597a5..8c1f88e572 100644
--- a/lib/ssh/src/ssh_connection_manager.erl
+++ b/lib/ssh/src/ssh_connection_manager.erl
@@ -384,9 +384,10 @@ handle_call({close, ChannelId}, _,
 	    #state{connection = Pid, connection_state = 
 		   #connection{channel_cache = Cache}} = State) ->
     case ssh_channel:cache_lookup(Cache, ChannelId) of			 
-	#channel{remote_id = Id} ->
+	#channel{remote_id = Id} = Channel ->
 	    send_msg({connection_reply, Pid, 
 		      ssh_connection:channel_close_msg(Id)}),
+	    ssh_channel:cache_update(Cache, Channel#channel{sent_close = true}),
 	    {reply, ok, State};
 	undefined -> 
 	    {reply, ok, State}
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index d66214d415..c5019425cd 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -183,7 +183,29 @@ app_test(doc) ->
 app_test(Config) when is_list(Config) ->
     ?t:app_test(ssh),
     ok.
+%%--------------------------------------------------------------------
+misc_ssh_options(doc) ->
+    ["Test that we can set some misc options not tested elsewhere, "
+     "some options not yet present are not decided if we should support or "
+     "if they need thier own test case."];
+misc_ssh_options(suite) ->
+    [];
+misc_ssh_options(Config) when is_list(Config) ->  
+    SystemDir = filename:join(?config(priv_dir, Config), system),
+    UserDir = ?config(priv_dir, Config),
+    
+    CMiscOpt0 = [{connecect_timeout, 1000}, {ip_v6_disable, false}, {user_dir, UserDir}],
+    CMiscOpt1 = [{connecect_timeout, infinity}, {ip_v6_disable, true}, {user_dir, UserDir}],
+    SMiscOpt0 =  [{ip_v6_disable, false}, {user_dir, UserDir}, {system_dir, SystemDir}],
+    SMiscOpt1 =  [{ip_v6_disable, true}, {user_dir, UserDir}, {system_dir, SystemDir}],
+    
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+
+    basic_test([{client_opts, CMiscOpt0 ++ ClientOpts}, {server_opts, SMiscOpt0 ++ ServerOpts}]),
+    basic_test([{client_opts, CMiscOpt1 ++ ClientOpts}, {server_opts, SMiscOpt1 ++ ServerOpts}]).
 
+%%--------------------------------------------------------------------
 exec(doc) ->
     ["Test api function ssh_connection:exec"];
 
@@ -500,13 +522,14 @@ internal_error(Config) when is_list(Config) ->
     SystemDir = filename:join(?config(priv_dir, Config), system),
     UserDir = ?config(priv_dir, Config),
     
-    {_Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
+    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
 					     {user_dir, UserDir},
 					     {failfun, fun ssh_test_lib:failfun/2}]),
     {error,"Internal error"} =
 	ssh:connect(Host, Port, [{silently_accept_hosts, true},
 				 {user_dir, UserDir},
-				 {user_interaction, false}]).
+				 {user_interaction, false}]),
+    ssh:stop_daemon(Pid).
 
 %%--------------------------------------------------------------------
 close(doc) ->
@@ -539,3 +562,12 @@ close(Config) when is_list(Config) ->
 %%--------------------------------------------------------------------
 %% Internal functions
 %%--------------------------------------------------------------------
+  
+basic_test(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    
+    {Pid, Host, Port} = ssh_test_lib:daemon(ServerOpts),
+    {ok, CM} = ssh:connect(Host, Port, ClientOpts),
+    ok = ssh:close(CM),
+    ssh:stop_daemon(Pid).
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index 694d39ce9c..3df7495ec4 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 1.18.1
+STDLIB_VSN = 1.18.2