From 54887c55b57e892c7d0d61c68d516753e796a2a8 Mon Sep 17 00:00:00 2001
From: Jon Kristensen <info@jonkristensen.com>
Date: Tue, 12 Jul 2011 14:07:28 +0200
Subject: [PATCH] updated the documentation to reflect the intended usage of
 tls and sasl

---
 Documentation/Pontarius XMPP Manual.lyx       | 16 ++++++-------
 ...ments Specification for Pontarius XMPP.lyx | 24 +++++++++++++------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/Documentation/Pontarius XMPP Manual.lyx b/Documentation/Pontarius XMPP Manual.lyx
index e43eeb6..01b3561 100644
--- a/Documentation/Pontarius XMPP Manual.lyx	
+++ b/Documentation/Pontarius XMPP Manual.lyx	
@@ -61,7 +61,7 @@
 \begin_body
 
 \begin_layout Title
-Pontarius XMPP 0.1 Manual (Third Draft)
+Pontarius XMPP 0.1 Manual (Fourth Draft)
 \end_layout
 
 \begin_layout Author
@@ -69,7 +69,7 @@ The Pontarius Project
 \end_layout
 
 \begin_layout Date
-The 6th of July, 2011
+The 27th of July, 2011
 \end_layout
 
 \begin_layout Standard
@@ -118,19 +118,17 @@ The client is always the initiating entity
 \end_layout
 
 \begin_layout Itemize
-A client-of-server connection is always exactly one TCP connection
+A client-of-server connection always consists of exactly one TCP connection
 \end_layout
 
 \begin_layout Itemize
-TLS is supported for client-to-server confidentiality
+For stream security through TLS, only the TLS_RSA_WITH_AES_128_CBC_SHA cipher
+ suite is supported
 \end_layout
 
 \begin_layout Itemize
-Only the SCRAM authentication method is supported
-\end_layout
-
-\begin_layout Itemize
-...
+For authentication through SASL, only the SHA-1 variant of SASL Salted Challenge
+ Response Authentication Mechanism (SCRAM-SHA-1) is supported
 \end_layout
 
 \begin_layout Standard
diff --git a/Documentation/Software Requirements Specification for Pontarius XMPP.lyx b/Documentation/Software Requirements Specification for Pontarius XMPP.lyx
index 4d42c09..6c9fca1 100644
--- a/Documentation/Software Requirements Specification for Pontarius XMPP.lyx	
+++ b/Documentation/Software Requirements Specification for Pontarius XMPP.lyx	
@@ -61,7 +61,7 @@
 \begin_body
 
 \begin_layout Title
-Software Requirements Specification for Pontarius XMPP 0.1 (Second Draft)
+Software Requirements Specification for Pontarius XMPP 0.1 (Third Draft)
 \end_layout
 
 \begin_layout Author
@@ -69,7 +69,7 @@ The Pontarius Project
 \end_layout
 
 \begin_layout Date
-6th of July 2011
+27th of July 2011
 \end_layout
 
 \begin_layout Standard
@@ -1274,11 +1274,6 @@ See the "Information technology - Telecommunications and information exchange
 , if the first reconnection attempt fails.
 \end_layout
 
-\begin_layout Description
-REQ-28 The system shall make use of TLS session resumption when reconnecting
- to the server, if the connection was TLS secured.
-\end_layout
-
 \begin_layout Description
 REQ-29 The system shall support stream management, as described in section
  4 of XMPP: Core.
@@ -1293,11 +1288,26 @@ REQ-30 The system shall support securing the stream with TLS, as described
  in section 5 of XMPP: Core.
 \end_layout
 
+\begin_layout Description
+REQ-28 The system shall make use of TLS session resumption when reconnecting
+ to the server, if the connection was TLS secured.
+\end_layout
+
+\begin_layout Description
+REQ-XX The system shall implement (at least) the TLS_RSA_WITH_AES_128_CBC_SHA
+ cipher suite for TLS.
+\end_layout
+
 \begin_layout Description
 REQ-31 The system shall support authenticating with SASL, as described in
  section 6 of XMPP: Core.
 \end_layout
 
+\begin_layout Description
+REQ-XX The system shall support (at least) the SHA-1 variant of SASL Salted
+ Challenge Response Authentication Mechanism (SCRAM-SHA-1).
+\end_layout
+
 \begin_layout Description
 REQ-32 Being a client library, the system shall support the 'jabber:client'
  namespace.