\subsection{SSL \& TLS}
+Serverchecks via the web
\begin{itemize}
-\item Check your browser's ssl capabilities: \url{https://cc.dcsec.uni-hannover.de/}.
-\item \href{http://ssllabs.com}{ssllabs.com} offers a great way to check your webserver for misconfigurations. See \url{https://www.ssllabs.com/ssltest/}.
-Furthermore, ssllabs.com has a good best practices tutorial, which focuses on avoiding the most common mistakes in SSL.
-See: \url{https://www.ssllabs.com/downloads/SSL_TLS_Deployment_Best_Practices_1.3.pdf}.
-%% this breaks my pdf converter hmm
+\item \href{http://ssllabs.com}{ssllabs.com} offers a great way to check your webserver for misconfigurations. See \url{https://www.ssllabs.com/ssltest/}.Furthermore, ssllabs.com has a good best practices tutorial, which focuses on avoiding the most common mistakes in SSL.
+\item SSL Server certificate installation issues \url{http://www.sslshopper.com/ssl-checker.html}
+\item Check SPDY protocol support and basic TLS setup \url{http://spdycheck.org/}
+\item XMPP/Jabber Server check (Client-to-Server and Server-to-Server) \url{https://xmpp.net/}
+\item Luxsci SMTP TLS Checker \url{https://luxsci.com/extranet/tlschecker.html}
+\item \url{http://checktls.com} is a tool for testing arbitrary TLS services.
+\item TLS and SSH key check \url{https://factorable.net/keycheck.html}
\item \url{http://tls.secg.org} is a tool for testing interoperability of HTTPS implementations for ECC cipher suites.
+\end{itemize}
+
+Browserchecks
+\begin{itemize}
+\item Check your browser's ssl capabilities: \url{https://cc.dcsec.uni-hannover.de/} and \url{https://www.ssllabs.com/ssltest/viewMyClient.html}.
+\end{itemize}
+
+
+Command line tools
+\begin{itemize}
\item \url{http://sourceforge.net/projects/sslscan} connects to a given SSL service and shows the cipher suites that are offered.
\item \url{http://checktls.com} is a tool for testing arbitrary TLS services.
-\item \url{https://github.com/iSECPartners/sslyze} Fast and full-featured SSL scanner.
-\item \url{http://www.xmpp.net} is a tool for testing XMPP (Jabber) servers.
+\item \url{http://nmap.org/} nmap security scanner
\end{itemize}
+
\subsection{Keylength}
+\begin{itemize}
+\item \url{http://www.keylength.com} comprehensive online resource for comparison of keylengths according to common recommendatons and standards in cryptography.
+\end{itemize}
-\url{http://www.keylength.com} comprehensive online resource for comparison of keylengths according to common recommendatons and standards in cryptography.
\subsection{RNGs}
%% NOTE: should we merge that with chapter 6.6??
\begin{itemize}
-\item \href{http://www.fourmilab.ch/random/}{ENT} is a pseudo random number generator sequence tester.
+\item \href{http://www.fourmilab.ch/random/}{ENT} is a pseudo random number generator sequence tester.
\item \href{http://www.issihosts.com/haveged/}{HaveGE} is a tool which increases the Entropy of the Linux random number generator devices. It is based on the HAVEGE algorithm. \url{http://dl.acm.org/citation.cfm?id=945516}
\item \href{http://www.phy.duke.edu/~rgb/General/dieharder.php}{Dieharder} a random number generator testing tool.
\item \href{http://www.cacert.at/random/}{CAcert Random} another random number generator testing service.
-
\end{itemize}
-
-
+\subsection{Guides}
+\begin{itemize}
+\item See: \url{https://www.ssllabs.com/downloads/SSL_TLS_Deployment_Best_Practices_1.3.pdf}.
+\end{itemize}