Merge github.com:BetterCrypto/Applied-Crypto-Hardening

Conflicts:
	src/practical_settings/DBs.tex

diff --cc src/practical_settings/DBs.tex
index cb9f7c4,cc0ce01..68a8974
--- 1/src/practical_settings/DBs.tex
--- 2/src/practical_settings/DBs.tex
+++ b/src/practical_settings/DBs.tex
@@@ -1,9 -1,7 +1,8 @@@
  %%\subsection{Database Systems}
  % This list is based on : http://en.wikipedia.org/wiki/Relational_database_management_system#Market_share
  
 +%% ---------------------------------------------------------------------- 
  \subsubsection{Oracle}
- 
  \begin{description}
  \item[Tested with Version:] not tested
  
@@@ -74,19 -66,9 +71,9 @@@ show variables like '%ssl%'
  {\small \url{http://pic.dhe.ibm.com/infocenter/db2luw/v9r7/index.jsp?topic=%2Fcom.ibm.db2.luw.admin.sec.doc%2Fdoc%2Fc0053544.html}}
  
  
 -\paragraph*{ssl_cipherspecs}\mbox{}\\
 -In the link above the whole SSL-configuration is in-depth described. The following command shows only how to set the recommended ciphersuites.
 +\paragraph*{ssl\_cipherspecs}\mbox{}\\
- In the link above the whole SSL-Configuration is in-depth described. The following command shows only the recommended ciphersuites.
++In the link above the whole SSL-configuration is described in-depth. The following command shows only how to set the recommended ciphersuites.
  \begin{lstlisting}[breaklines]
- % it's out of scope to describe the whole SSL procedure
- % # fully qualified path of the key database file
- %db2 update dbm cfg using SSL_SVR_KEYDB /home/dba/sqllib/security/keystore/key.kdb
- %
- %# fully qualified path of the stash file
- %db2 update dbm cfg using SSL_SVR_STASH /home/dba/sqllib/security/keystore/mydbserver.sth
- %
- %# label of the digital certificate of the server
- %db2 update dbm cfg using SSL_SVR_LABEL myselfsigned
- %
  # recommended and supported ciphersuites 
  
  db2 update dbm cfg using SSL_CIPHERSPECS