DBs.tex still had a hardcoded cipherstring B text and no @@@CIPHERSTRINGB@@@ macro!

This was wrong. If we decide to use cipherstring B everywhere, then we need to also do it here.

diff --git a/src/practical_settings.tex b/src/practical_settings.tex
index c875959..d588f97 100644 (file)
--- a/src/practical_settings.tex
+++ b/src/practical_settings.tex
@@ -25,7 +25,7 @@
 \input{practical_settings/im}
 \section{Database Systems}
 \label{sec:database-systems}
-\input{practical_settings/DBs}
+\input{practical_settings/DBs_generated}
 \section{Intercepting proxy solutions and reverse proxies}
 \label{sec:interc-proxy-solut}
 \input{practical_settings/proxy_solutions_generated}

diff --git a/src/practical_settings/DBs.tex b/src/practical_settings/DBs.tex
index 13c9983..e486eec 100644 (file)
--- a/src/practical_settings/DBs.tex
+++ b/src/practical_settings/DBs.tex
@@ -37,7 +37,7 @@ ssl
 ssl-ca=/etc/mysql/ssl/ca-cert.pem
 ssl-cert=/etc/mysql/ssl/server-cert.pem
 ssl-key=/etc/mysql/ssl/server-key.pem
-ssl-cipher=EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EDH+CAMELLIA256:EECDH:EDH+aRSA:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!RC4:!SEED:!AES128:!CAMELLIA128:!ECDSA:AES256-SHA
+ssl-cipher=@@@CIPHERSTRINGB@@@
 \end{lstlisting}
 
 \item[Additional settings:]
@@ -132,7 +132,7 @@ ssl_ca_file = '/your/path/root.crt'
 \begin{lstlisting}[breaklines]
 #>=8.3
 ssl = on 
-ssl_ciphers = 'EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EDH+CAMELLIA256:EECDH:EDH+aRSA:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!RC4:!SEED:!AES128:!CAMELLIA128:!ECDSA:AES256-SHA'
+ssl_ciphers = '@@@CIPHERSTRINGB@@@'
 \end{lstlisting}