# HG changeset patch
# User Christian Urban <christian dot urban at kcl dot ac dot uk>
# Date 1379977101 -3600
# Node ID b37223b88ebdf0ffe9e3322416d86e34a55588a0
# Parent  62b66cb088f6c824e4b590d07937ddb2144f4974
updated

diff -r 62b66cb088f6 -r b37223b88ebd slides/slides01.pdf
Binary file slides/slides01.pdf has changed
diff -r 62b66cb088f6 -r b37223b88ebd slides/slides01.tex
--- a/slides/slides01.tex	Mon Sep 23 23:53:46 2013 +0100
+++ b/slides/slides01.tex	Mon Sep 23 23:58:21 2013 +0100
@@ -1175,13 +1175,14 @@
 \begin{itemize}
 \item break-ins (buffer overflows)
 \item access control\\ (role based, data security / data integrity)
-\item protocols\\
-(specification)
+\item electronic voting
+\item protocols (specification)
 \item access control logic
 \item privacy
 \begin{quote}
 Scott McNealy: \\``You have zero privacy anyway. Get over it.''
 \end{quote}
+\item zero-knowledge proofs
 \end{itemize}
 
 \end{frame}}
@@ -1326,6 +1327,40 @@
   
 \end{frame}}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%   
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\mode<presentation>{
+\begin{frame}[c]
+\frametitle{Satan's Computer}
+
+Ross Anderson and Roger Needham wrote:\bigskip
+
+\begin{tikzpicture}
+\draw (0,0) node[inner sep=2mm,fill=cream, ultra thick, draw=red, rounded corners=2mm] 
+{\normalsize\color{darkgray}
+\begin{minipage}{10cm}\raggedright\small
+``In effect, our task is to program a computer which gives 
+answers which are subtly and maliciously wrong at the most 
+inconvenient possible moment\ldots{} we hope that the lessons 
+learned from programming Satan's computer may be helpful 
+in tackling the more common problem of programming Murphy's.''
+\end{minipage}};
+\end{tikzpicture}\\[30mm]
+
+\only<2>{
+\begin{textblock}{11}(2,12)
+\begin{tabular}{c}
+\includegraphics[scale=0.12]{pics/ariane.jpg}\\[-2mm]
+\footnotesize Murphy's computer
+\end{tabular}
+\begin{tabular}{c}
+\includegraphics[scale=0.15]{pics/mobile.jpg}\;
+\includegraphics[scale=0.06]{pics/pinsentry.jpg}\\[-2mm]
+\footnotesize Satan's computers
+\end{tabular}
+\end{textblock}}
+
+\end{frame}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%