Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorEva Seidl <eva@booksinthefridge.at>
Sun, 22 Dec 2013 12:51:11 +0000 (13:51 +0100)
committerEva Seidl <eva@booksinthefridge.at>
Sun, 22 Dec 2013 12:51:11 +0000 (13:51 +0100)
1  2 
src/applied-crypto-hardening.tex

@@@ -8,7 -8,9 +8,9 @@@
  \documentclass[       DIV=calc,%
                                paper=a4,%
                                fontsize=9pt,%
-                               onecolumn]{scrartcl}                                            % KOMA-article class
+                               %onecolumn]{scrartcl}                                           % KOMA-article class
+                               onecolumn]{scrreprt}                                            % KOMA-article class
+                               %onecolumn]{report}                                             % KOMA-article class
  
  \usepackage{lipsum}                                                                                                   % Package to create dummy text
  
  \usepackage{amsthm}
  \usepackage{fancyvrb}
  \usepackage{listings}
+ \usepackage{longtable}
+ %% Epigraph patching
+ \usepackage{epigraph}
+ % \epigraphsize{\small}% Default
+ \setlength\epigraphwidth{8cm}
+ \setlength\epigraphrule{0pt}
+ \usepackage{etoolbox}
+ \makeatletter
+ \patchcmd{\epigraph}{\@epitext{#1}}{\itshape\@epitext{#1}}{}{}
+ \makeatother
  
  
  \usepackage{gitinfo}
@@@ -48,7 -63,7 +63,7 @@@
  
  % side box
  \usepackage{wrapfig}
- \usepackage{tcolorbox}
%\usepackage{tcolorbox}
  \newenvironment{WrapText}[1][r]
    {\wrapfigure{#1}{0.5\textwidth}\tcolorbox}
    {\endtcolorbox\endwrapfigure}
@@@ -67,9 -82,6 +82,9 @@@
  \definecolor{orange}{RGB}{251,111,16}
  \definecolor{red}{RGB}{247,56,0}
  \definecolor{blue}{RGB}{0,28,128}
 +\definecolor{lightgreen}{RGB}{187,218,216}
 +\definecolor{intersectgreen}{RGB}{103,133,155}
 +\definecolor{darkblue}{RGB}{76,87,117}
  
  \bibliographystyle{alphalink}
  
  \definecolor{CadetBlue}{cmyk}{0.62,0.57,0.23,0}
  \definecolor{lightlightgray}{gray}{0.9}
  
 +% makes default font sans-serif
 + \renewcommand{\familydefault}{\sfdefault}
 +
 +% make font Open Sans
 +% \usepackage{opensans}
 +\usepackage[defaultsans]{opensans}
 +
 +% changes font encoding to T1
 +% \usepackage[T1]{fontenc}
 +% \usepackage{textcomp}
 +
  \lstset{
  %language=Bash,                             % Code langugage
  basicstyle=\ttfamily,                   % Code font, Examples: \footnotesize, \ttfamily
@@@ -157,7 -158,7 +172,7 @@@ morekeywords={__global__, __device__}
  \usepackage{lettrine}
  \newcommand{\initial}[1]{%
       \lettrine[lines=3,lhang=0.3,nindent=0em]{
 -                              \color{DarkGoldenrod}
 +                              \color{darkblue}
                                {\textsf{#1}}}{}}
  
  
  %%% Title, author and date metadata
  \usepackage{titling}                                                                                                                  % For custom titles
  
 -\newcommand{\HorRule}{\color{DarkGoldenrod}%                  % Creating a horizontal rule
 +\newcommand{\HorRule}{\color{darkblue}%                       % Creating a horizontal rule
                                                                                \rule{\linewidth}{1pt}%
                                                                        }
 +% \usefont{OT1}{phv}{b}{n}
 +% \usefont{OT1}{phv}{b}{sl}
  
  \pretitle{\vspace{-30pt} \begin{flushleft} \HorRule 
 -                              \fontsize{36}{36} \usefont{OT1}{phv}{b}{n} \color{DarkRed} \selectfont 
 +                              \fontsize{36}{36}  \color{darkblue} \selectfont 
                                }
                        \title{Applied Crypto Hardening}% \\ \vskip 0.5em \large www.bettercrypto.org}
  \posttitle{\par\end{flushleft}\vskip 0.5em}
  
  \preauthor{\begin{flushleft}
 -                                      \large \lineskip 0.5em \usefont{OT1}{phv}{b}{sl} \color{DarkRed}}
 +                                      \large \lineskip 0.5em  \color{intersectgreen}}
  
                                        \author{Wolfgang Breyha, David Durvaux, Tobias Dussa, L. Aaron
-                                       Kaplan, Christian Mock, Manuel Koschuch, Adi
-                                       Kriegisch, Ramin Sabet, Berg San, Ralf Schlatterbeck, Aaron Zauner, Pepi Zawodsky}
+                                       Kaplan, Florian Mendel, Christian Mock, Manuel Koschuch, Adi
+                                       Kriegisch, Ulrich P\"oschl, Ramin Sabet, Berg San, Ralf Schlatterbeck, 
+                                       Thomas Schreck, Aaron Zauner, Pepi Zawodsky}
  %\institute{
  %FH Campus Wien
  %\and
  \setlength{\parindent}{0cm}
  
  \postauthor{\footnotesize \usefont{OT1}{phv}{m}{sl} \color{Black} 
- \\ \vskip 0.5em  (University of Vienna, CERT.be, KIT-CERT, CERT.at, coretec.at, FH Campus Wien, VRVis, A-Trust, Runtux.com, azet.org, maclemon.at)
+ \\ \vskip 0.5em  (University of Vienna, CERT.be, KIT-CERT, CERT.at, IAIK, coretec.at, FH Campus Wien, VRVis, MilCERT Austria, A-Trust, , Runtux.com, Friedrich-Alexander University Erlangen-Nuremberg, azet.org, maclemon.at)
                                        \par\end{flushleft}\HorRule}
  
  \date{\today}
  % hyperref needs to be the last package you load.
  \usepackage[pdftex,breaklinks,colorlinks,citecolor=blue,urlcolor=blue]{hyperref}
  
  %%% Begin document
  \begin{document}
  \maketitle
  %\initial{H}\textbf{ere is some sample text to show the initial in the introductory paragraph of this template article. The color and lineheight of the initial can be modified in the preamble of this document.}
  
  \input{abstract}
- \newpage
  \tableofcontents
- \newpage
+ \chapter{Introduction}
+ \label{chapter:Intro}
  \input{howtoread}
  \input{disclaimer}
  \input{motivation}
  \input{methods}
- \input{scope}
+ %%
+ \chapter{Practical recommendations}
+ \label{chapter:PracticalSettings}
+ \input{practical_settings}
+ %%
+ \chapter{Theory}
+ \label{chapter:Theory}
  \input{PKIs}
  \input{ECC}
+ \input{SHA}
  \input{DH}
  \input{keylengths}
  \input{RNGs}
  \input{cipher_suites}
  \input{ssllibs}
- \input{practical_settings}
+ \chapter{Appendix}
  \input{tools}
- \input{further_research}
  \input{links}
  \input{suggested_reading}
+ \input{cipher_suite_names}
+ \input{further_research}
  \input{acknowledgements}
  \input{reviewers}
  \input{bib}