Merge branch 'ia/ssl/new-doc' into dev

14 files changed, 483 insertions, 912 deletions

diff --git a/lib/ssl/doc/src/Makefile b/lib/ssl/doc/src/Makefile
index d6788c1633..3119d37af0 100644
--- a/lib/ssl/doc/src/Makefile
+++ b/lib/ssl/doc/src/Makefile
@@ -37,7 +37,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 # Target Specs
 # ----------------------------------------------------
 XML_APPLICATION_FILES = refman.xml
-XML_REF3_FILES = ssl.xml old_ssl.xml
+XML_REF3_FILES = ssl.xml old_ssl.xml ssl_session_cache_api.xml
 XML_REF6_FILES = ssl_app.xml
 
 XML_PART_FILES = release_notes.xml usersguide.xml
@@ -45,9 +45,7 @@ XML_CHAPTER_FILES = \
 	ssl_protocol.xml \
 	using_ssl.xml \
 	pkix_certs.xml \
-	create_certs.xml \
 	ssl_distribution.xml \
-	licenses.xml \
 	notes.xml
 
 BOOK_FILES = book.xml
diff --git a/lib/ssl/doc/src/book.xml b/lib/ssl/doc/src/book.xml
index 9122addb74..85d6b56b26 100644
--- a/lib/ssl/doc/src/book.xml
+++ b/lib/ssl/doc/src/book.xml
@@ -28,9 +28,6 @@
     <rev>A</rev>
     <file>book.sgml</file>
   </header>
-  <insidecover>
-    <include file="insidecover"></include>
-  </insidecover>
   <pagetext>SSL Application</pagetext>
   <preamble>
     <contents level="2"></contents>
diff --git a/lib/ssl/doc/src/create_certs.xml b/lib/ssl/doc/src/create_certs.xml
deleted file mode 100644
index 79cc8a0537..0000000000
--- a/lib/ssl/doc/src/create_certs.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2003</year><year>2009</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
-    
-    </legalnotice>
-
-    <title>Creating Certificates</title>
-    <prepared>UAB/F/P Peter H&ouml;gfeldt</prepared>
-    <docno></docno>
-    <date>2003-06-16</date>
-    <rev>A</rev>
-    <file>create_certs.xml</file>
-  </header>
-  <p>Here we consider the creation of example certificates. 
-    </p>
-
-  <section>
-    <title>The openssl Command</title>
-    <p>The <c>openssl</c> command is a utility that comes with the
-      OpenSSL distribution. It provides a variety of subcommands. Each
-      subcommand is invoked as</p>
-    <code type="none"><![CDATA[
-      openssl subcmd <options and arguments>    ]]></code>
-    <p>where <c>subcmd</c> denotes the subcommand in question.
-      </p>
-    <p>We shall use the following subcommands to create certificates for
-      the purpose of testing Erlang/OTP SSL:
-      </p>
-    <list type="bulleted">
-      <item><em>req</em> to create certificate requests and a
-       self-signed certificates, 
-      </item>
-      <item><em>ca</em> to create certificates from certificate requests.</item>
-    </list>
-    <p>We create the following certificates:
-      </p>
-    <list type="bulleted">
-      <item>the <em>erlangCA</em> root certificate (a self-signed
-       certificate), </item>
-      <item>the <em>otpCA</em> certificate signed by the <em>erlangCA</em>, </item>
-      <item>a client certificate signed by the <em>otpCA</em>, and</item>
-      <item>a server certificate signed by the <em>otpCA</em>.</item>
-    </list>
-
-    <section>
-      <title>The openssl configuration file</title>
-      <p>An <c>openssl</c> configuration file consist of a number of
-        sections, where each section starts with one line containing
-        <c>[ section_name ]</c>, where <c>section_name</c> is the name
-        of the section. The first section of the file is either
-        unnamed, or is named <c>[ default ]</c>. For further details
-        see the OpenSSL config(5) manual page.
-        </p>
-      <p>The required sections for the subcommands we are going to 
-        use are as follows:
-        </p>
-      <table>
-        <row>
-          <cell align="left" valign="middle">subcommand</cell>
-          <cell align="left" valign="middle">required/default section</cell>
-          <cell align="left" valign="middle">override command line option</cell>
-          <cell align="left" valign="middle">configuration file option</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">req</cell>
-          <cell align="left" valign="middle">[req]</cell>
-          <cell align="left" valign="middle">-</cell>
-          <cell align="left" valign="middle"><c>-config FILE</c></cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">ca</cell>
-          <cell align="left" valign="middle">[ca]</cell>
-          <cell align="left" valign="middle"><c>-name section</c></cell>
-          <cell align="left" valign="middle"><c>-config FILE</c></cell>
-        </row>
-        <tcaption>openssl subcommands to use</tcaption>
-      </table>
-    </section>
-
-    <section>
-      <title>Creating the Erlang root CA</title>
-      <p>The Erlang root CA is created with the command</p>
-      <code type="none">
-	openssl req -new -x509 -config /some/path/req.cnf \\
-                -keyout /some/path/key.pem -out /some/path/cert.pem </code>
-      <p>where the option <c>-new</c> indicates that we want to create
-        a new certificate request and the option <c>-x509</c> implies
-        that a self-signed certificate is created.
-      </p>
-    </section>
-
-    <section>
-      <title>Creating the OTP CA</title>
-      <p>The OTP CA is created by first creating a certificate request
-        with the command</p>
-      <code type="none">
-	openssl req -new -config /some/path/req.cnf \\
-	        -keyout /some/path/key.pem -out /some/path/req.pem      </code>
-      <p>and the ask the Erlang CA to sign it:</p>
-      <code type="none">
-	openssl ca -batch -notext -config /some/path/req.cnf \\
-	        -extensions ca_cert -in /some/path/req.pem -out /some/path/cert.pem      </code>
-      <p>where the option <c>-extensions</c> refers to a section in the
-        configuration file saying that it should create a CA certificate, 
-        and not a plain user certificate. 
-        </p>
-      <p>The <c>client</c> and <c>server</c> certificates are created
-        similarly, except that the option <c>-extensions</c> then has the 
-        value <c>user_cert</c>.  
-        </p>
-    </section>
-  </section>
-
-  <section>
-    <title>An Example</title>
-    <p>The following module <c>create_certs</c> is used by the Erlang/OTP
-      SSL application for generating certificates to be used in tests. The
-      source code is also found in <c>ssl-X.Y.Z/examples/certs/src</c>.
-      </p>
-    <p>The purpose of the <c>create_certs:all/1</c> function is to make
-      it possible to provide from the <c>erl</c> command line, the
-      full path name of the <c>openssl</c> command.
-      </p>
-    <p>Note that the module creates temporary OpenSSL configuration files
-      for the <c>req</c> and <c>ca</c> subcommands. 
-      </p>
-    <codeinclude file="../../examples/certs/src/make_certs.erl" tag="" type="erl"></codeinclude>
-  </section>
-</chapter>
-
-
diff --git a/lib/ssl/doc/src/insidecover.xml b/lib/ssl/doc/src/insidecover.xml
deleted file mode 100644
index 4f3f5e5951..0000000000
--- a/lib/ssl/doc/src/insidecover.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE bookinsidecover SYSTEM "bookinsidecover.dtd">
-
-<bookinsidecover>
-The Erlang/OTP SSL application includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/). Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.  <br></br>
-This product includes cryptographic software written by Eric Young ([email protected]).  This product includes software written by Tim Hudson ([email protected]). Copyright (C) 1995-1998 Eric Young ([email protected]). All rights reserved.  <br></br>
-For further OpenSSL and SSLeay license information se the chapter  <bold>Licenses</bold>
-.  <vfill></vfill>
-  <br></br>
-  <tt>http://www.erlang.org</tt>
-  <br></br>
-</bookinsidecover>
-
-
diff --git a/lib/ssl/doc/src/licenses.xml b/lib/ssl/doc/src/licenses.xml
deleted file mode 100644
index 0969f9ad6e..0000000000
--- a/lib/ssl/doc/src/licenses.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2003</year><year>2009</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
-    
-    </legalnotice>
-
-    <title>Licenses</title>
-    <prepared>Peter H&ouml;gfeldt</prepared>
-    <docno></docno>
-    <date>2003-05-26</date>
-    <rev>A</rev>
-    <file>licenses.xml</file>
-  </header>
-  <p>    <marker id="licenses"></marker>
-This chapter contains in extenso versions
-    of the OpenSSL and SSLeay licenses.
-    </p>
-
-  <section>
-    <title>OpenSSL License</title>
-    <code type="none">
-/* ====================================================================
- * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    [email protected].
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * ([email protected]).  This product includes software written by Tim
- * Hudson ([email protected]).
- *
- */    </code>
-  </section>
-
-  <section>
-    <title>SSLeay License</title>
-    <code type="none">
-/* Copyright (C) 1995-1998 Eric Young ([email protected])
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young ([email protected]).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson ([email protected]).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young ([email protected])"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson ([email protected])"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */    </code>
-  </section>
-</chapter>
-
-
diff --git a/lib/ssl/doc/src/refman.xml b/lib/ssl/doc/src/refman.xml
index 9658e229eb..68f84660f3 100644
--- a/lib/ssl/doc/src/refman.xml
+++ b/lib/ssl/doc/src/refman.xml
@@ -45,7 +45,8 @@
   </description>
   <xi:include href="ssl_app.xml"/>
   <xi:include href="ssl.xml"/>
-  <xi:include href="old_ssl.xml"/>  
+  <xi:include href="old_ssl.xml"/>
+  <xi:include href="ssl_session_cache_api.xml"/>
 </application>
 
 
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index 75aa8f2fe9..def61bcf03 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -21,13 +21,6 @@
 
     </legalnotice>
     <title>ssl</title>
-    <prepared>Ingela Anderton Andin</prepared>
-    <responsible>Ingela Anderton Andin</responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2003-03-25</date>
-    <rev></rev>
     <file>ssl.xml</file>
   </header>
   <module>ssl</module>
@@ -185,8 +178,17 @@ end
        {bad_cert, cert_expired}, {bad_cert, invalid_issuer},
        {bad_cert, invalid_signature}, {bad_cert, name_not_permitted},
        {bad_cert, cert_revoked} (not implemented yet),
-       {bad_cert, unknown_critical_extension} or {bad_cert, term()} (Will
-								    be relevant later when an option is added for the user to be able to verify application specific extensions.) 
+       {bad_cert, unknown_critical_extension} or {bad_cert, term()}
+      </item>
+
+      
+      <tag>{validate_extensions_fun, fun()}</tag>
+      <item>
+	This options makes it possible to supply a fun to validate
+	possible application specific certificate extensions
+	during the certificat path validation. This option
+	will be better documented onec the public_key API is more
+	mature.
       </item>
       
       <tag>{depth, integer()}</tag>
@@ -231,7 +233,8 @@ end
       </item>
 
       <tag>{ssl_imp, ssl_imp()}</tag>
-      <item>Specify which ssl implementation you want to use.
+      <item>Specify which ssl implementation you want to use. Defaults to
+      new.
       </item>
 
       <tag>{reuse_sessions, boolean()}</tag>
@@ -248,6 +251,15 @@ end
       certificate, Compression is an enumeration integer
       and CipherSuite of type ciphersuite().      
       </item>
+
+      <tag>{secure_renegotiate, boolean()}</tag>
+      <item>Specifies if to reject renegotiation attempt that does
+      not live up to RFC 5746. By default secure_renegotiate is
+      set to false e.i. secure renegotiation will be used if possible
+      but it will fallback to unsecure renegotiation if the peer
+      does not support  RFC 5746.
+      </item>
+
     </taglist>
   </section>
   
@@ -414,7 +426,6 @@ end
      <type>
         <v>Socket = sslsocket()</v>
         <v>Cert = binary()</v>
-        <v>Subject = term()</v>
       </type>
       <desc>
         <p>The peer certificate is returned as a DER encoded binary.
diff --git a/lib/ssl/doc/src/ssl_app.xml b/lib/ssl/doc/src/ssl_app.xml
index fac2053532..2ba6f48611 100644
--- a/lib/ssl/doc/src/ssl_app.xml
+++ b/lib/ssl/doc/src/ssl_app.xml
@@ -22,38 +22,11 @@
     </legalnotice>
 
     <title>ssl</title>
-    <prepared>Peter H&ouml;gfeldt</prepared>
-    <responsible>Peter H&ouml;gfeldt</responsible>
-    <docno></docno>
-    <approved>Peter H&ouml;gfeldt</approved>
-    <checked>Peter H&ouml;gfeldt</checked>
-    <date>2005-03-10</date>
-    <rev>E</rev>
     <file>ssl_app.sgml</file>
   </header>
   <app>ssl</app>
-  <appsummary>The SSL Application</appsummary>
-  <description>
-    <p>The Secure Socket Layer (SSL) application provides secure
-      socket communication over TCP/IP. Note that this documentation
-      is mainly valid for the old ssl implementation and will
-      be replaced in a future release.
-      </p>
-  </description>
-
-  <section>
-    <title>Warning</title>
-    <p>In previous versions of Erlang/OTP SSL it was advised, as a
-      work-around, to set the operating system environment variable
-      <c>SSL_CERT_FILE</c> to point at a file containing CA
-      certificates. That variable is no longer needed, and is not
-      recognised by Erlang/OTP SSL any more.
-      </p>
-    <p>However, the OpenSSL package does interpret that environment
-      variable. Hence a setting of that variable might have
-      unpredictable effects on the Erlang/OTP SSL application. It is
-      therefore adviced to not used that environment variable at all.</p>
-  </section>
+  <appsummary>The SSL application provides secure communication over
+  sockets.</appsummary>
 
   <section>
     <title>Environment</title>
@@ -63,115 +36,43 @@
       </p>
     <p>Note that the environment parameters can be set on the command line,
       for instance,</p>
-    <p><c>erl ... -ssl protocol_version '[sslv2,sslv3]' ...</c>.
+    <p><c>erl ... -ssl protocol_version '[sslv3, tlsv1]' ...</c>.
       </p>
     <taglist>
-      <tag><c><![CDATA[ephemeral_rsa = true | false <optional>]]></c></tag>
+      <tag><c><![CDATA[protocol_version = [sslv3|tlsv1] <optional>]]></c>.</tag>
       <item>
-        <p>Enables all SSL servers (those that listen and accept)
-          to use ephemeral RSA key generation when a clients connect with
-          weak handshake cipher specifications, that need equally weak
-          ciphers from the server (i.e. obsolete restrictions on export
-          ciphers).  Default is <c>false</c>.
-          </p>
+	<p>Protocol that will be supported by started clients and
+	servers. If this option is not set it will default to all
+	protocols currently supported by the erlang ssl application.
+	Note that this option may be overridden by the version option
+	to ssl:connect/[2,3] and ssl:listen/2.
+	</p>
       </item>
-      <tag><c><![CDATA[debug = true | false <optional>]]></c></tag>
-      <item>
-        <p>Causes debug information to be written to standard
-          output. Default is <c>false</c>.
-          </p>
-      </item>
-      <tag><c><![CDATA[debugdir = path() | false <optional>]]></c></tag>
-      <item>
-        <p>Causes debug information output controlled by <c>debug</c>
-          and <c>msgdebug</c> to be printed to a file named 
-          <c><![CDATA[ssl_esock.<pid>.log]]></c> in the directory specified by
-          <c>debugdir</c>, where <c><![CDATA[<pid>]]></c> is the operating system
-          specific textual representation of the process identifier 
-          of the external port program of the SSL application. Default
-          is <c>false</c>, i.e. no log file is produced.
-          </p>
-      </item>
-      <tag><c><![CDATA[msgdebug = true | false <optional>]]></c></tag>
-      <item>
-        <p>Sets <c>debug = true</c> and causes also the contents
-          of low level messages to be printed to standard output.
-          Default is <c>false</c>.
-          </p>
-      </item>
-      <tag><c><![CDATA[port_program = string() | false <optional>]]></c></tag>
-      <item>
-        <p>Name of port program. The default is <c>ssl_esock</c>.
-          </p>
-      </item>
-      <tag><c><![CDATA[protocol_version = [sslv2|sslv3|tlsv1] <optional>]]></c>.</tag>
+
+      <tag><c><![CDATA[session_lifetime = integer() <optional>]]></c></tag>
       <item>
-        <p>Name of protocols to use. If this option is not set, 
-          all protocols are assumed, i.e. the default value is
-          <c>[sslv2, sslv3, tlsv1]</c>.
-          </p>
+	<p>The lifetime of session data in seconds. 
+	</p>
       </item>
-      <tag><c><![CDATA[proxylsport = integer() | false <optional>]]></c></tag>
+
+        <tag><c><![CDATA[session_cb = atom() <optional>]]></c></tag>
       <item>
-        <p>Define the port number of the listen port of the 
-          SSL port program. Almost never is this option needed.
+        <p>
+	  Name of session cache callback module that implements
+	  the ssl_session_cache_api behavior, defaults to
+	  ssl_session_cache.erl.
           </p>
       </item>
-      <tag><c><![CDATA[proxylsbacklog = integer() | false <optional>]]></c></tag>
+
+      <tag><c><![CDATA[session_cb_init_args = list() <optional>]]></c></tag>
       <item>
-        <p>Set the listen queue size of the listen port of the
-          SSL port program. The default is 128.
-          </p>
+	<p>
+	  List of arguments to the init function in session cache
+	  callback module, defaults to [].
+	</p>
       </item>
-    </taglist>
-  </section>
-
-  <section>
-    <title>OpenSSL libraries</title>
-    <p>The current implementation of the Erlang SSL application is
-      based on the <em>OpenSSL</em> package version 0.9.7 or higher.
-      There are source and binary releases on the web.
-      </p>
-    <p>Source releases of OpenSSL can be downloaded from the <url href="http://www.openssl.org">OpenSSL</url> project home page,
-      or mirror sites listed there.
-      </p>
-    <p>The same URL also contains links to some compiled binaries and
-      libraries of OpenSSL (see the <c>Related/Binaries</c> menu) of
-      which the <url href="http://www.shininglightpro.com/search.php?searchname=Win32+OpenSSL">Shining Light Productions Win32 and OpenSSL</url> pages are of
-      interest for the Win32 user.
-      </p>
-    <p>For some Unix flavours there are binary packages available
-      on the net. 
-      </p>
-    <p>If you cannot find a suitable binary OpenSSL package, you 
-      have to fetch an OpenSSL source release and compile it. 
-      </p>
-    <p>You then have to compile and install the libraries
-      <c>libcrypto.so</c> and <c>libssl.so</c> (Unix), or the
-      libraries <c>libeay32.dll</c> and <c>ssleay32.dll</c> (Win32).
-      </p>
-    <p>For Unix The <c>ssl_esock</c> port program is delivered linked
-      to OpenSSL libraries in <c>/usr/local/lib</c>, but the default
-      dynamic linking will also accept libraries in <c>/lib</c> and
-      <c>/usr/lib</c>.
-      </p>
-    <p>If that is not applicable to the particular Unix operating
-      system used, the example <c>Makefile</c> in the SSL
-      <c>priv/obj</c> directory, should be used as a guide to
-      relinking the final version of the port program.
-      </p>
-    <p>For <c>Win32</c> it is only required that the libraries can be
-      found from the <c>PATH</c> environment variable, or that they
-      reside in the appropriate <c>SYSTEM32</c> directory; hence no
-      particular relinking is need. Hence no example <c>Makefile</c>
-      for Win32 is provided.</p>
-  </section>
 
-  <section>
-    <title>Restrictions</title>
-    <p>Users must be aware of export restrictions and patent rights
-      concerning cryptographic software.
-      </p>
+    </taglist>
   </section>
 
   <section>
@@ -180,5 +81,3 @@
   </section>
   
 </appref>
-
-
diff --git a/lib/ssl/doc/src/ssl_distribution.xml b/lib/ssl/doc/src/ssl_distribution.xml
index c743cd67a3..4067fb8a22 100644
--- a/lib/ssl/doc/src/ssl_distribution.xml
+++ b/lib/ssl/doc/src/ssl_distribution.xml
@@ -32,7 +32,13 @@
     <file>ssl_distribution.xml</file>
   </header>
   <p>This chapter describes how the Erlang distribution can use 
-    SSL to get additional verification and security.</p>
+    SSL to get additional verification and security.
+
+    <note><p>Note this
+    documentation is written for the old ssl implementation and
+    will be updated for the new one once this functionallity is
+    supported by the new implementation.</p></note>
+  </p>
 
   <section>
     <title>Introduction</title>
diff --git a/lib/ssl/doc/src/ssl_protocol.xml b/lib/ssl/doc/src/ssl_protocol.xml
index 3dc2332795..726b9a4eeb 100644
--- a/lib/ssl/doc/src/ssl_protocol.xml
+++ b/lib/ssl/doc/src/ssl_protocol.xml
@@ -13,337 +13,138 @@
       compliance with the License. You should have received a copy of the
       Erlang Public License along with this software. If not, it can be
       retrieved online at http://www.erlang.org/.
-    
+      
       Software distributed under the License is distributed on an "AS IS"
       basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
       the License for the specific language governing rights and limitations
       under the License.
-    
+      
     </legalnotice>
 
-    <title>The SSL Protocol</title>
-    <prepared>Peter H&ouml;gfeldt</prepared>
-    <docno></docno>
-    <date>2003-04-28</date>
-    <rev>PA2</rev>
+    <title>Transport Layer Security (TLS) and its predecessor, Secure Socket Layer (SSL)</title>
     <file>ssl_protocol.xml</file>
   </header>
-  <p>Here we provide a short introduction to the SSL protocol. We only
-    consider those part of the protocol that are important from a
-    programming point of view.
-    </p>
-  <p>For a very good general introduction to SSL and TLS see the book
-    <cite id="rescorla"></cite>.
-    </p>
-  <p><em>Outline:</em></p>
-  <list type="bulleted">
-    <item>Two types of connections - connection: handshake, data transfer, and
-     shutdown - 
-     SSL/TLS protocol - server must have certificate - what the the
-     server sends to the client - client may verify the server -
-     server may ask client for certificate - what the client sends to
-     the server - server may then verify the client - verification -
-     certificate chains - root certificates - public keys - key
-     agreement - purpose of certificate - references</item>
-  </list>
+  
+  <p>The erlang ssl application currently supports SSL 3.0 and TLS 1.0
+  RFC 2246, and will in the future also support later versions of TLS.
+  SSL 2.0 is not supported.
+  </p>
 
-  <section>
-    <title>SSL Connections</title>
-    <p>The SSL protocol is implemented on top of the TCP/IP protocol.
-      From an endpoint view it also has the same type of connections
-      as that protocol, almost always created by calls to socket
-      interface functions <em>listen</em>, <em>accept</em> and
-      <em>connect</em>. The endpoints are <em>servers</em> and
-      <em>clients</em>.
-      </p>
-    <p>A <em>server</em><em>listen</em>s for connections on a
-      specific address and port. This is done once. The server then
-      <em>accept</em>s each connections on that same address and
-      port. This is typically done indefinitely many times.
-      </p>
-    <p>A <em>client</em> connects to a server on a specific address 
-      and port. For each purpose this is done once.
-      </p>
-    <p>For a plain TCP/IP connection the establishment of a connection
-      (through an accept or a connect) is followed by data transfer between
-      the client and server, finally ended by a connection close. 
-      </p>
-    <p>An SSL connection also consists of data transfer and connection
-      close, However, the data transfer contains encrypted data, and
-      in order to establish the encryption parameters, the data
-      transfer is preceded by an SSL <em>handshake</em>. In this
-      handshake the server plays a dominant role, and the main
-      instrument used in achieving a valid SSL connection is the
-      server's <em>certificate</em>. We consider certificates in the
-      next section, and the SSL handshake in a subsequent section.</p>
-  </section>
+  <p>By default erlang ssl is run over the TCP/IP protocol even
+  though you could plug in an other reliable transport protocol
+  with the same API as gen_tcp.</p>
+  
+  <p>If a client and server wants to use an upgrade mechanism, such as
+  defined by RFC2817, to upgrade a regular TCP/IP connection to a ssl
+  connection the erlang ssl API supports this. This can be useful for
+  things such as supporting HTTP and HTTPS on the same port and
+  implementing virtual hosting.
+  </p>
 
   <section>
-    <title>Certificates</title>
-    <p>A certificate is similar to a driver's license, or a
-      passport. The holder of the certificate is called the
-      <em>subject</em>.  First of all the certificate identifies the
-      subject in terms of the name of the subject, its postal address,
-      country name, company name (if applicable), etc.
-      </p>
-    <p>Although a driver's license is always issued by a well-known and
-      distinct authority, a certificate may have an <em>issuer</em>
-      that is not so well-known. Therefore a certificate also always
-      contains information on the issuer of the certificate. That
-      information is of the same type as the information on the
-      subject. The issuer of a certificate also signs the certificate
-      with a <em>digital signature</em> (the signature is an inherent
-      part of the certificate), which allow others to verify that the
-      issuer really is the issuer of the certificate.
-      </p>
-    <p>Now that a certificate can be checked by verifying the
-      signature of the issuer, the question is how to trust the
-      issuer. The answer to this question is to require that there is
-      a certificate for the issuer as well. That issuer has in turn an
-      issuer, which must also have a certificate, and so on. This
-      <em>certificate chain</em> has to have en end, which then must
-      be a certificate that is trusted by other means. We shall cover
-      this problem of <em>authentication</em> in a subsequent
-      section.
-      </p>
+    <title>Security overview</title>
+      
+    <p>To achive authentication and privacy the client and server will
+    perform a TLS Handshake procedure before transmitting or receiving
+    any data. During the handshake they agree on a protocol version and
+    cryptographic algorithms, they generate shared secrets using public
+    key cryptographics and optionally authenticate each other with
+    digital certificates.</p>
   </section>
-
+  
   <section>
-    <title>Encryption Algorithms</title>
-    <p>An encryption algorithm is a mathematical algorithm for
-      encryption and decryption of messages (arrays of bytes,
-      say). The algorithm as such is always required to be publicly
-      known, otherwise its strength cannot be evaluated, and hence it
-      cannot be used reliably. The secrecy of an encrypted message is
-      not achieved by the secrecy of the algorithm used, but by the
-      secrecy of the <em>keys</em> used as input to the encryption and
-      decryption algorithms. For an account of cryptography in general
-      see <cite id="schneier"></cite>.
-      </p>
-    <p>There are two classes of encryption algorithms: <em>symmetric key</em> algorithms and <em>public key</em> algorithms.  Both
-      types of algorithms are used in the SSL protocol.
-      </p>
-    <p>In the sequel we assume holders of keys keep them secret (except
-      public keys) and that they in that sense are trusted. How a 
-      holder of a secret key is proved to be the one it claims to be
-      is a question of <em>authentication</em>, which, in the context
-      of the SSL protocol, is described in a section further below.
-      </p>
-
-    <section>
-      <title>Symmetric Key Algorithms</title>
-      <p>A <em>symmetric key</em> algorithm has one key only. The key
-        is used for both encryption and decryption. Obviously the key
-        of a symmetric key algorithm must always be kept secret by the
-        users of the key. DES is an example of a symmetric key
-        algorithm.
-        </p>
-      <p>Symmetric key algorithms are fast compared to public key
-        algorithms. They are therefore typically used for encrypting
-        bulk data.
-        </p>
-    </section>
-
-    <section>
-      <title>Public Key Algorithms</title>
-      <p>A <em>public key</em> algorithm has two keys. Any of the two
-        keys can be used for encryption. A message encrypted with one
-        of the keys, can only be decrypted with the other key. One of
-        the keys is public (known to the world), while the other key
-        is private (i.e. kept secret) by the owner of the two keys.
-        </p>
-      <p>RSA is an example of a public key algorithm.
-        </p>
-      <p>Public key algorithms are slow compared to symmetric key
-        algorithms, and they are therefore seldom used for bulk data
-        encryption. They are therefore only used in cases where the
-        fact that one key is public and the other is private, provides
-        features that cannot be provided by symmetric algorithms.
-        </p>
-    </section>
-
-    <section>
-      <title>Digital Signature Algorithms</title>
-      <p>An interesting feature of a public key algorithm is that its
-        public and private keys can both be used for encryption.
-        Anyone can use the public key to encrypt a message, and send
-        that message to the owner of the private key, and be sure of
-        that only the holder of the private key can decrypt the
-        message.
-        </p>
-      <p>On the other hand, the owner of the private key can encrypt a
-        message with the private key, thus obtaining an encrypted
-        message that can decrypted by anyone having the public key.
-        </p>
-      <p>The last approach can be used as a digital signature
-        algorithm.  The holder of the private key signs an array of
-        bytes by performing a specified well-known <em>message digest algorithm</em> to compute a hash of the array, encrypts the
-        hash value with its private key, an then presents the original
-        array, the name of the digest algorithm, and the encryption of
-        the hash value as a <em>signed array of bytes</em>.
-        </p>
-      <p>Now anyone having the public key, can decrypt the encrypted
-        hash value with that key, compute the hash with the specified
-        digest algorithm, and check that the hash values compare equal
-        in order to verify that the original array was indeed signed
-        by the holder of the private key.
-        </p>
-      <p>What we have accounted for so far is by no means all that can
-        be said about digital signatures (see <cite id="schneier"></cite>for
-        further details).
-        </p>
-    </section>
-
-    <section>
-      <title>Message Digests Algorithms</title>
-      <p>A message digest algorithm is a hash function that accepts 
-        an array bytes of arbitrary but finite length of input, and 
-        outputs an array of bytes of fixed length. Such an algorithm
-        is also required to be very hard to invert.  
-        </p>
-      <p>MD5 (16 bytes output) and SHA1 (20 bytes output) are examples
-        of message digest algorithms.
-        </p>
-    </section>
+    <title>Data Privacy and Integrity</title>
+    
+    <p>A <em>symmetric key</em> algorithm has one key only. The key is
+    used for both encryption and decryption. These algoritms are fast
+    compared to public key algorithms (using two keys, a public and a
+    private one) and are therefore typically used for encrypting bulk
+    data.
+    </p>
+    
+    <p>The keys for the symmetric encryption are generated uniquely
+    for each connection and are based on a secret negotiated
+    in the TLS handshake. </p>
+    
+    <p>The TLS handsake protocol and data transfer is run on top of
+    the TLS Record Protocol that uses a keyed-hash MAC (Message
+    Authenticity Code), or HMAC, to protect the message's data
+    integrity. From the TLS RFC "A Message Authentication Code is a
+    one-way hash computed from a message and some secret data. It is
+    difficult to forge without knowing the secret data. Its purpose is
+    to detect if the message has been altered."
+    </p>
+    
   </section>
 
-  <section>
-    <title>SSL Handshake</title>
-    <p>The main purpose of the handshake performed before an an SSL
-      connection is established is to negotiate the encryption
-      algorithm and key to be used for the bulk data transfer between
-      the client and the server. We are writing <em>the</em> key,
-      since the algorithm to choose for bulk encryption one of the
-      symmetric algorithms.
-      </p>
-    <p>There is thus only one key to agree upon, and obviously that
-      key has to be kept secret between the client and the server. To
-      obtain that the handshake has to be encrypted as well.
-      </p>
-    <p>The SSL protocol requires that the server always sends its
-      certificate to the client in the beginning of the handshake. The
-      client then retrieves the server's public key from the
-      certificate, which means that the client can use the server's
-      public key to encrypt messages to the server, and the server can
-      decrypt those messages with its private key. Similarly, the
-      server can encrypt messages to the client with its private key,
-      and the client can decrypt messages with the server's public
-      key. It is thus is with the server's public and private keys
-      that messages in the handshake are encrypted and decrypted, and
-      hence the key agreed upon for symmetric encryption of bulk data
-      can be kept secret (there are more things to consider to really
-      keep it secret, see <cite id="rescorla"></cite>).
-      </p>
-    <p>The above indicates that the server does not care who is
-      connecting, and that only the client has the possibility to
-      properly identify the server based on the server's certificate.
-      That is indeed true in the minimal use of the protocol, but it
-      is possible to instruct the server to request the certificate of
-      the client, in order to have a means to identify the client, but
-      it is by no means required to establish an SSL connection.
-      </p>
-    <p>If a server request the client certificate, it verifies, as a
-      part of the protocol, that the client really holds the private
-      key of the certificate by sending the client a string of bytes
-      to encrypt with its private key, which the server then decrypts
-      with the client's public key, the result of which is compared
-      with the original string of bytes (a similar procedure is always
-      performed by the client when it has received the server's
-      certificate).
-      </p>
-    <p>The way clients and servers <em>authenticate</em> each other,
-      i.e. proves that their respective peers are what they claim to
-      be, is the topic of the next section.
-      </p>
-  </section>
+   <section>
+     <title>Digital Certificates</title>
+     <p>A certificate is similar to a driver's license, or a
+     passport. The holder of the certificate is called the
+     <em>subject</em>. The certificate is signed 
+     with the private key of the issuer of the certificate. A chain
+     of trust is build by having the issuer in its turn being
+     certified by an other certificate and so on until you reach the
+     so called root certificate that is self signed e.i. issued
+     by itself.</p>
+     
+     <p>Certificates are issued by <em>certification
+     authorities</em> (<em>CA</em>s) only.  There are a handful of
+     top CAs in the world that issue root certificates. You can
+     examine the certificates of several of them by clicking
+     through the menus of your web browser.
+     </p>
+   </section>
+	   
+   <section>
+     <title>Authentication of Sender</title>
+      
+     <p>Authentication of the sender is done by public key path
+     validation as defined in RFC 3280. Simplified that means that
+     each certificate in the certificate chain is issued by the one
+     before, the certificates attributes are valid ones, and the
+     root cert is a trusted cert that is present in the trusted
+     certs database kept by the peer.</p>
+     
+     <p>The server will always send a certificate chain as part of
+     the TLS handshake, but the client will only send one if
+     the server requests it. If the client does not have
+     an appropriate certificate it may send an "empty" certificate
+     to the server.</p>
+     
+     <p>The client may choose to accept some path evaluation errors
+     for instance a web browser may ask the user if they want to
+     accept an unknown CA root certificate. The server, if it request
+     a certificate, will on the other hand not accept any path validation
+     errors. It is configurable if the server should accept
+     or reject an "empty" certificate as response to
+     a certificate request.</p>
+   </section>
+  
+   <section>
+     <title>TLS Sessions</title>
+     
+     <p>From the TLS RFC "A TLS session is an association between a
+     client and a server.  Sessions are created by the handshake
+     protocol. Sessions define a set of cryptographic security
+     parameters, which can be shared among multiple
+     connections. Sessions are used to avoid the expensive negotiation
+     of new security parameters for each connection."</p>
 
-  <section>
-    <title>Authentication</title>
-    <p>As we have already seen the reception of a certificate from a
-      peer is not enough to prove that the peer is authentic. More
-      certificates are needed, and we have to consider how certificates
-      are issued and on what grounds.
-      </p>
-    <p>Certificates are issued by <em>certification authorities</em>
-      (<em>CA</em>s) only. They issue certificates both for other CAs
-      and ordinary users (which are not CAs). 
-      </p>
-    <p>Certain CAs are <em>top CAs</em>, i.e. they do not have a
-      certificate issued by another CA. Instead they issue their own
-      certificate, where the subject and issuer part of the
-      certificate are identical (such a certificate is called a
-      self-signed certificate). A top CA has to be well-known, and has
-      to have a publicly available policy telling on what grounds it
-      issues certificates. 
-      </p>
-    <p>There are a handful of top CAs in the world. You can examine the
-      certificates of several of them by clicking through the menus of
-      your web browser. 
-      </p>
-    <p>A top CA typically issues certificates for other CAs, called
-      <em>intermediate CAs</em>, but possibly also to ordinary users. Thus
-      the certificates derivable from a top CA constitute a tree, where
-      the leaves of the tree are ordinary user certificates. 
-      </p>
-    <p>A <em>certificate chain</em> is an ordered sequence of
-      certificates, <c>C1, C2, ..., Cn</c>, say, where <c>C1</c> is a
-      top CA certificate, and where <c>Cn</c> is an ordinary user
-      certificate, and where the holder of <c>C1</c> is the issuer of
-      <c>C2</c>, the holder of <c>C2</c> is the issuer of <c>C3</c>,
-      ..., and the holder of <c>Cn-1</c> is the issuer of <c>Cn</c>,
-      the ordinary user certificate. The holders of <c>C2, C3, ..., Cn-1</c> are then intermediate CAs.
-      </p>
-    <p>Now to verify that a certificate chain is unbroken we have to
-      take the public key from each certificate <c>Ck</c>, and apply
-      that key to decrypt the signature of certificate <c>Ck-1</c>,
-      thus obtaining the message digest computed by the holder of the
-      <c>Ck</c> certificate, compute the real message digest of the
-      <c>Ck-1</c> certificate and compare the results. If they compare
-      equal the link of the chain between <c>Ck</c> and <c>Ck-1</c> is
-      considered to unbroken. This is done for each link k = 1, 2,
-      ..., n-1. If all links are found to be unbroken, the user
-      certificate <c>Cn</c> is considered authenticated.
-      </p>
+     <p>Session data is by default kept by the ssl application in a
+     memory storage hence session data will be lost at application
+     restart or takeover. Users may define their own callback module
+     to handle session data storage if persistent data storage is
+     required. Session data will also be invalidated after 24 hours
+     from it was saved, for security reasons. It is of course
+     possible to configure the amount of time the session data should be
+     saved.</p>
 
-    <section>
-      <title>Trusted Certificates</title>
-      <p>Now that there is a way to authenticate a certificate by
-        checking that all links of a certificate chain are unbroken,
-        the question is how you can be sure to trust the certificates
-        in the chain, and in particular the top CA certificate of the
-        chain.
-        </p>
-      <p>To provide an answer to that question consider the
-        perspective of a client, which have just received the
-        certificate of the server. In order to authenticate the server
-        the client has to construct a certificate chain and to prove
-        that the chain is unbroken. The client has to have a set of CA
-        certificates (top CA or intermediate CA certificates) not
-        obtained from the server, but obtained by other means. Those
-        certificates are kept <c>locally</c> by the client, and are 
-        trusted by the client.
-        </p>
-      <p>More specifically, the client does not really have to have
-        top CA certificates in its local storage. In order to
-        authenticate a server it is sufficient for the client to
-        posses the trusted certificate of the issuer of the server
-        certificate.
-        </p>
-      <p>Now that is not the whole story. A server can send an
-        (incomplete) certificate chain to its client, and then the
-        task of the client is to construct a certificate chain that
-        begins with a trusted certificate and ends with the server's
-        certificate. (A client can also send a chain to its server, 
-        provided the server requested the client's certificate.)
-        </p>
-      <p>All this means that an unbroken certificate chain begins with
-        a trusted certificate (top CA or not), and ends with the peer
-        certificate. That is the end of the chain is obtained from the
-        peer, but the beginning of the chain is obtained from local
-        storage, which is considered trusted.
-        </p>
-    </section>
-  </section>
-</chapter>
+     <p>Ssl clients will by default try to reuse an available session,
+     ssl servers will by default agree to reuse sessions when clients
+     ask to do so.</p>
+
+   </section>
+ </chapter>
 
 
diff --git a/lib/ssl/doc/src/ssl_session_cache_api.xml b/lib/ssl/doc/src/ssl_session_cache_api.xml
new file mode 100644
index 0000000000..7b70c6cf34
--- /dev/null
+++ b/lib/ssl/doc/src/ssl_session_cache_api.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="latin1" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>1999</year><year>2010</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      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
+      compliance with the License. You should have received a copy of the
+      Erlang Public License along with this software. If not, it can be
+      retrieved online at http://www.erlang.org/.
+
+      Software distributed under the License is distributed on an "AS IS"
+      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+      the License for the specific language governing rights and limitations
+      under the License.
+
+    </legalnotice>
+    <title>ssl</title>
+    <file>ssl_session_cache_api.xml</file>
+  </header>
+  <module>ssl_session_cache_api</module>
+  <modulesummary>Defines the API for the TLS session cache so
+    that the datastorge scheme can be replaced by
+    defining a new callback module implementing this API.</modulesummary>
+
+  <section>
+    <title>Common Data Types</title>
+
+    <p>The following data types are used in the functions below:
+    </p>
+
+    <p><c>cache_ref() = opaque()</c></p> 
+    
+    <p><c>key() = {partialkey(), session_id()}</c></p>
+    
+    <p><c>partialkey() = opaque()</c></p>
+    
+    <p><c>session_id() = binary()</c></p>
+
+    <p><c>session() = opaque()</c></p>
+    
+  </section>
+  
+  <funcs>   
+
+    <func>
+      <name>delete(Cache, Key) -> _</name>
+      <fsummary></fsummary>
+      <type>
+	<v> Cache = cache_ref()</v>
+	<v> Key  = key()</v>
+      </type>
+      <desc>
+	<p> Delets a cache entry. Will only be called from the cache
+	handling process.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>foldl(Fun, Acc0, Cache) -> Acc</name>
+      <fsummary></fsummary>
+      <type>
+	<v></v>
+      </type>
+      <desc>
+	<p>Calls Fun(Elem, AccIn) on successive elements of the
+	cache, starting with AccIn == Acc0. Fun/2 must return a new
+	accumulator which is passed to the next call. The function returns
+	the final value of the accumulator. Acc0 is returned if the cache is
+	empty. 
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>init() -> opaque() </name>
+      <fsummary>Return cache reference</fsummary>
+      <type>
+	<v></v>
+      </type>
+      <desc>
+	<p>Performes possible initializations of the cache and returns
+	a reference to it that will be used as parameter to the other
+	api functions. Will be called by the cache handling processes
+	init function, hence puting the same requierments on it as
+	a normal process init function.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>lookup(Cache, Key) -> Entry</name>
+      <fsummary> Looks up a cach entry.</fsummary>
+      <type>
+	<v> Cache = cache_ref()</v>
+	<v> Key  = key()</v>
+	<v> Entry = session() | undefined </v>
+      </type>
+      <desc>
+	<p>Looks up a cach entry. Should be callable from any
+	process.
+	</p>
+      </desc>
+    </func>
+    
+    <func>
+      <name>select_session(Cache, PartialKey) -> [session()]</name>
+      <fsummary>>Selects sessions that could be reused.</fsummary>
+      <type>
+	<v> Cache = cache_ref()</v>
+	<v> PartialKey = partialkey()</v>
+	<v> Session = session()</v>
+      </type>
+      <desc>
+	<p>Selects sessions that could be reused. Should be callable
+	from any process.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>terminate(Cache) -> _</name>
+      <fsummary>Called by the process that handles the cache when it
+      is aboute to terminat.</fsummary>
+      <type>
+	<v>Cache = term()  - as returned by init/0</v>
+      </type>
+      <desc>
+	<p>Takes care of possible cleanup that is needed when the
+	cache handling process terminates.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>update(Cache, Key, Session) -> _</name>
+      <fsummary> Caches a new session or updates a already cached one.</fsummary>
+      <type>
+	<v> Cache = cache_ref()</v>
+	<v> Key  = key()</v>
+	<v> Session = session()</v>
+      </type>
+      <desc>
+	<p> Caches a new session or updates a already cached one. Will
+	only be called from the cache handling process.
+	</p>
+      </desc>
+    </func>
+    
+  </funcs> 
+  
+</erlref>
diff --git a/lib/ssl/doc/src/usersguide.xml b/lib/ssl/doc/src/usersguide.xml
index 76ee13dd23..6528c00a0b 100644
--- a/lib/ssl/doc/src/usersguide.xml
+++ b/lib/ssl/doc/src/usersguide.xml
@@ -23,35 +23,17 @@
 
     <title>SSL User's Guide</title>
     <prepared>OTP Team</prepared>
-    <docno></docno>
     <date>2003-05-26</date>
-    <rev>B</rev>
     <file>usersguide.sgml</file>
   </header>
   <description>
     <p>The <em>SSL</em> application provides secure communication over
-      sockets. Note that this users guide was written for
-      the old ssl implementation that is now being phased out and
-      will be replaced by a new guide in a future release.
-      </p>
-    <p>This product includes software developed by the OpenSSL Project for
-      use in the OpenSSL Toolkit (http://www.openssl.org/).
-      </p>
-    <p>This product includes cryptographic software written by Eric Young
-      ([email protected]).  
-      </p>
-    <p>This product includes software written by Tim Hudson
-      ([email protected]).
-      </p>
-    <p>For full OpenSSL and SSLeay license texts, see <seealso marker="licenses#licenses">Licenses</seealso>.
+      sockets.
       </p>
   </description>
   <xi:include href="ssl_protocol.xml"/>
   <xi:include href="using_ssl.xml"/>
-  <xi:include href="pkix_certs.xml"/>
-  <xi:include href="create_certs.xml"/>
   <xi:include href="ssl_distribution.xml"/>
-  <xi:include href="licenses.xml"/>
 </part>
 
 
diff --git a/lib/ssl/doc/src/using_ssl.xml b/lib/ssl/doc/src/using_ssl.xml
new file mode 100644
index 0000000000..4bdd8f97b4
--- /dev/null
+++ b/lib/ssl/doc/src/using_ssl.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="latin1" ?>
+<!DOCTYPE chapter SYSTEM "chapter.dtd">
+
+<chapter>
+  <header>
+    <copyright>
+      <year>2003</year><year>2009</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      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
+      compliance with the License. You should have received a copy of the
+      Erlang Public License along with this software. If not, it can be
+      retrieved online at http://www.erlang.org/.
+    
+      Software distributed under the License is distributed on an "AS IS"
+      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+      the License for the specific language governing rights and limitations
+      under the License.
+    
+    </legalnotice>
+
+    <title>Using the SSL API</title>
+    <file>using_ssl.xml</file>
+  </header>
+
+  <section>
+    <title>General information</title>
+    <p>To see relevant version information for ssl you can
+    call ssl:versions/0</p>
+    
+    <p>To see all supported cipher suites 
+    call ssl:cipher_suites/0. Note that available cipher suites
+    for a connection will depend on your certificate. It is also
+    possible to specify a specific cipher suite(s) that you
+    want your connection to use. Default is to use the  strongest
+    available.</p>
+
+  </section>
+  
+  <section>
+    <title>Setting up connections</title>
+    
+    <p>Here follows some small example of how to set up client/server connections
+    using the erlang shell. The returned value of the sslsocket has been abbreviated with
+    <c>[...]</c> as it can be fairly large and is opaque.</p>
+    
+    <section>
+      <title>Minmal example</title>
+      
+      <note><p> The minimal setup is not the  most secure setup of ssl.</p>    
+      </note>
+      
+      <p> Start server side</p>
+      <code type="erl">1 server> ssl:start().
+ok</code>
+      
+      <p>Create a ssl listen socket</p>
+      <code type="erl">2 server> {ok, ListenSocket} =
+ssl:listen(9999, [{certfile, "cert.pem"}, {keyfile, "key.pem"},{reuseaddr, true}]).
+{ok,{sslsocket, [...]}}</code>
+      
+      <p>Do a transport accept on the ssl listen socket</p>
+      <code type="erl">3 server> {ok, Socket} = ssl:transport_accept(ListenSocket).
+{ok,{sslsocket, [...]}}</code>
+
+      <p>Start client side</p>
+      <code type="erl">1 client> ssl:start().
+ok</code>
+      
+      <code type="erl">2 client> {ok, Socket} = ssl:connect("localhost", 9999,  [], infinity).
+{ok,{sslsocket, [...]}}</code>
+      
+      <p>Do the ssl handshake</p>
+      <code type="erl">4 server> ok = ssl:ssl_accept(Socket).
+ok</code>
+      
+      <p>Send a messag over ssl</p>
+      <code type="erl">5 server> ssl:send(Socket, "foo").
+ok</code>
+      
+      <p>Flush the shell message queue to see that we got the message
+      sent on the server side</p>
+      <code type="erl">3 client> flush().
+Shell got {ssl,{sslsocket,[...]},"foo"}
+ok</code>
+    </section>
+    
+    <section>
+      <title>Upgrade example</title>
+      
+      <note><p> To upgrade a TCP/IP connection to a ssl connection the
+      client and server have to aggre to do so. Agreement
+      may be accompliced by using a protocol such the one used by HTTP
+      specified in RFC 2817.</p> </note>
+      
+      <p>Start server side</p>
+      <code type="erl">1 server> ssl:start().
+ok</code>
+      
+      <p>Create a normal tcp listen socket</p>
+      <code type="erl">2 server> {ok, ListenSocket} = gen_tcp:listen(9999, [{reuseaddr, true}]).
+{ok, #Port&lt;0.475&gt;}</code>
+      
+      <p>Accept client connection</p>
+      <code type="erl">3 server> {ok, Socket} = gen_tcp:accept(ListenSocket).
+{ok, #Port&lt;0.476&gt;}</code>
+      
+      <p>Start client side</p>
+      <code type="erl">1 client> ssl:start().
+ok</code>
+      
+      <code type="erl">2 client> {ok, Socket} = gen_tcp:connect("localhost", 9999,  [], infinity).</code>
+      
+      <p>Make sure active is set to false before trying
+      to upgrade a connection to a ssl connection, otherwhise
+      ssl handshake messages may be deliverd to the wrong process.</p>
+      <code type="erl">4 server> inet:setopts(Socket, [{active, false}]).
+ok</code>
+      
+      <p>Do the ssl handshake.</p>
+      <code type="erl">5 server> {ok, SSLSocket} = ssl:ssl_accept(Socket, [{cacertfile, "cacerts.pem"},
+{certfile, "cert.pem"}, {keyfile, "key.pem"}]).
+{ok,{sslsocket,[...]}}</code>
+      
+      <p> Upgrade to a ssl connection. Note that the client and server
+      must agree upon the upgrade and the server must call
+      ssl:accept/2 before the client calls ssl:connect/3.</p>
+      <code type="erl">3 client>{ok, SSLSocket} = ssl:connect(Socket, [{cacertfile, "cacerts.pem"},
+{certfile, "cert.pem"}, {keyfile, "key.pem"}], infinity).
+{ok,{sslsocket,[...]}}</code>
+      
+      <p>Send a messag over ssl</p>
+      <code type="erl">4 client> ssl:send(SSLSocket, "foo").
+ok</code>
+      
+      <p>Set active true on the ssl socket</p>
+      <code type="erl">4 server> ssl:setopts(SSLSocket, [{active, true}]).
+ok</code>
+      
+      <p>Flush the shell message queue to see that we got the message
+      sent on the client side</p>
+      <code type="erl">5 server> flush().
+Shell got {ssl,{sslsocket,[...]},"foo"}
+ok</code>
+    </section>
+  </section>
+ </chapter>
diff --git a/lib/ssl/doc/src/using_ssl.xmlsrc b/lib/ssl/doc/src/using_ssl.xmlsrc
deleted file mode 100644
index ba74dcfef4..0000000000
--- a/lib/ssl/doc/src/using_ssl.xmlsrc
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2003</year><year>2009</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
-    
-    </legalnotice>
-
-    <title>Using the SSL application</title>
-    <prepared>Peter H&ouml;gfeldt</prepared>
-    <docno></docno>
-    <date>2003-04-23</date>
-    <rev>PA2</rev>
-    <file>using_ssl.xml</file>
-  </header>
-  <p>Here we provide an introduction to using the Erlang/OTP SSL
-    application, which is accessed through the <c>ssl</c> interface
-    module. 
-    </p>
-  <p>We also present example code in the Erlang module
-    <c>client_server</c>, also provided in the directory
-    <c>ssl-X.Y.Z/examples</c>, with source code in <c>src</c> and the
-    compiled module in <c>ebin</c> of that directory.
-    </p>
-
-  <section>
-    <title>The ssl Module</title>
-    <p>The <c>ssl</c> module provides the user interface to the Erlang/OTP
-      SSL application. The interface functions provided are very similar
-      to those provided by the <c>gen_tcp</c> and <c>inet</c> modules. 
-      </p>
-    <p>Servers use the interface functions <c>listen</c> and
-      <c>accept</c>. The <c>listen</c> function specifies a TCP port
-      to to listen to, and each call to the <c>accept</c> function
-      establishes an incoming connection.
-      </p>
-    <p>Clients use the <c>connect</c> function which specifies the address 
-      and port of a server to connect to, and  a successful call establishes
-      such a connection. 
-      </p>
-    <p>The <c>listen</c> and <c>connect</c> functions have almost all
-      the options that the corresponding functions in <c>gen_tcp/</c> have, 
-      but there are also additional options specific to the SSL protocol. 
-      </p>
-    <p>The most important SSL specific option is the <c>cacertfile</c>
-      option which specifies a local file containing trusted CA
-      certificates which are and used for peer authentication. This
-      option is used by clients and servers in case they want to
-      authenticate their peers.
-      </p>
-    <p>The <c>certfile</c> option specifies a local path to a file
-      containing the certificate of the holder of the connection
-      endpoint. In case of a server endpoint this option is mandatory
-      since the contents of the sever certificate is needed in the
-      the handshake preceding the establishment of a connection. 
-      </p>
-    <p>Similarly, the <c>keyfile</c> option points to a local file
-      containing the private key of the holder of the endpoint. If the
-      <c>certfile</c> option is present, this option has to be
-      specified as well, unless the private key is provided in the
-      same file as specified by the <c>certfile</c> option (a
-      certificate and a private key can thus coexist in the same file).
-      </p>
-    <p>The <c>verify</c> option specifies how the peer should be verified:
-      </p>
-    <taglist>
-      <tag>0</tag>
-      <item>Do not verify the peer,</item>
-      <tag>1</tag>
-      <item>Verify peer,</item>
-      <tag>2</tag>
-      <item>Verify peer, fail the verification if the peer has no 
-       certificate. </item>
-    </taglist>
-    <p>The <c>depth</c> option specifies the maximum length of the
-      verification certificate chain. Depth = 0 means the peer
-      certificate, depth = 1 the CA certificate, depth = 2 the next CA
-      certificate etc. If the verification process does not find a
-      trusted CA certificate within the maximum length, the verification
-      fails.
-      </p>
-    <p>The <c>ciphers</c> option specifies which ciphers to use (a
-      string of colon separated cipher names). To obtain a list of
-      available ciphers, evaluate the <c>ssl:ciphers/0</c> function
-      (the SSL application has to be running). 
-      </p>
-  </section>
-
-  <section>
-    <title>A Client-Server Example</title>
-    <p>Here is a simple client server example. 
-      </p>
-    <codeinclude file="../../examples/src/client_server.erl" tag="" type="erl"></codeinclude>
-  </section>
-</chapter>
-
-
-