Merge https://github.com/BetterCrypto/Applied-Crypto-Hardening
authorAaron Zauner <azet@azet.org>
Sat, 5 Apr 2014 18:17:05 +0000 (20:17 +0200)
committerAaron Zauner <azet@azet.org>
Sat, 5 Apr 2014 18:17:05 +0000 (20:17 +0200)
Conflicts:
src/practical_settings/ssh.tex

presentations/2014-03-11-DFN-Betriebstagung-BetterCrypto.org.pdf [new file with mode: 0644]
src/common/cipherStringB.tex
src/practical_settings/proxy_solutions.tex

diff --git a/presentations/2014-03-11-DFN-Betriebstagung-BetterCrypto.org.pdf b/presentations/2014-03-11-DFN-Betriebstagung-BetterCrypto.org.pdf
new file mode 100644 (file)
index 0000000..b9b188a
Binary files /dev/null and b/presentations/2014-03-11-DFN-Betriebstagung-BetterCrypto.org.pdf differ
index eb5e55f..ec9eb7c 100644 (file)
@@ -1 +1 @@
-\seqsplit{EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA}
+\seqsplit{EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!IDEA:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA}
index e80d15e..0d2bf65 100644 (file)
@@ -50,7 +50,7 @@ For squid Versions before 3.2.7 use this patch against a vanilla source-tree:
 
 
 %% ---------------------------------------------------------------------- 
-\subsubsection{Bluecoat}
+\subsection{Bluecoat}
 %% https://kb.bluecoat.com/index?page=content&id=KB5549
 \subsubsection{Tested with Versions}
 \begin{itemize*}