encryption schemes. It consists of the following components:
\begin{description}
-\item{Key exchange protocol:}
+
+\item{\it Key exchange protocol:}
``An (interactive) key exchange protocol is a method whereby parties who do not
share any secret information can generate a shared, secret key by communicating
over a public channel. The main property guaranteed here is that an
Example: \texttt{DHE}
-\item{Authentication:}
+\item{\it Authentication:}
The client authenticates the server by its certificate. Optionally the server
may authenticate the client certificate.
Example: \texttt{RSA}
-\item{Cipher:}
+\item{\it Cipher:}
The cipher is used to encrypt the message stream. It also contains the key size
and mode used by the suite.
Example: \texttt{AES256}
-\item{Message authentication code (MAC):}
+\item{\it Message authentication code (MAC):}
A MAC ensures that the message has not been tampered with (integrity).
Examples: \texttt{SHA256}
+\todo{ explain that this is either MAC ...or ... this:}
+
+\item{\it Authenticated Encryption with Associated Data (AEAD):}
+An encryption scheme which provides for confidentiality, integrity and authenticity.
+\todo{explain more? link? / reference }
+
+Examples: \texttt{AES256-GCM}
+
+
\begin{figure}[h]
\makebox[\textwidth]{
\caption{Composition of a typical cipher string}
\end{figure}
-\item{Authenticated encryption scheme:}
-An encryption scheme which provides for confidentiality, integrity and authenticity.
-
\item {\textbf{NOTE:}} there are two naming schemes for cipher strings -- IANA names (see section \ref{section:Links}) and the more well known OpenSSL names. In this document we will always use OpenSSL names unless a specific service uses IANA names.
\end{description}
%%\subsection{Recommended cipher suites}
+<<<<<<< HEAD
In principle system administrators who want to improve their communication security
have ton make a difficult decision between effectively locking out some users and
keeping high cipher suite security while supporting as many users as possible.
a tool to test their setup and compare compatibility with clients. The authors made
use of ssllabs.com to arrive at a set of cipher suites which we will recommend
throughout this document.\\
+=======
+In principle system administrators who want to improve their servers have to
+make a difficult decision between locking out some users and keeping high
+cipher suite security while supporting as many users as possible.
+The website \url{https://www.ssllabs.com/} gives administrators a
+tool to test their setup. The authors made use of ssllabs.com
+to arrive at a set of cipher suites which we will recommend throughout this
+document.\\
+>>>>>>> af7f2e99d0778d0e9828ca8b21c96bc0e462fea4
\textbf{Caution: these settings can only represent a subjective
choice of the authors at the time of writing. It might be a wise choice to