From: Aaron Zauner Date: Mon, 9 Dec 2013 21:36:05 +0000 (+0100) Subject: Merge branch 'master' of https://git.bettercrypto.org/ach-master X-Git-Url: https://git.bettercrypto.org/ach-master.git/commitdiff_plain/4b513e74d8563d830d3516a795c75a74ad1e13a4 Merge branch 'master' of https://git.bettercrypto.org/ach-master Conflicts: src/cipher_suites/recommended.tex --- 4b513e74d8563d830d3516a795c75a74ad1e13a4 diff --cc src/cipher_suites/recommended.tex index 166e05d,9919b7b..4017ab0 --- a/src/cipher_suites/recommended.tex +++ b/src/cipher_suites/recommended.tex @@@ -1,16 -1,16 +1,26 @@@ %%\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. +The website \url{https://www.ssllabs.com/} gives administrators and security engineers +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 this writing. It might be a wise choice to -select your own cipher suites based on the instructions in section +choice of the authors at the time of writing. It might be a wise choice to +select your own and review cipher suites based on the instructions in section \ref{section:ChoosingYourOwnCipherSuites}}.