# HG changeset patch
# User Christian Urban <christian dot urban at kcl dot ac dot uk>
# Date 1412425971 -3600
# Node ID 20af800ce73677db208a029a6455a2f5b920ea79
# Parent  2ce98ee39990ff2490cda25b8051e17270172ee3
updated pics

diff -r 2ce98ee39990 -r 20af800ce736 handouts/ho01.pdf
Binary file handouts/ho01.pdf has changed
diff -r 2ce98ee39990 -r 20af800ce736 handouts/ho02.pdf
Binary file handouts/ho02.pdf has changed
diff -r 2ce98ee39990 -r 20af800ce736 handouts/ho02.tex
--- a/handouts/ho02.tex	Sat Oct 04 13:17:18 2014 +0100
+++ b/handouts/ho02.tex	Sat Oct 04 13:32:51 2014 +0100
@@ -197,7 +197,7 @@
 ballot box with false votes). 
 
 \begin{center}
-\includegraphics[scale=2.5]{../slides/pics/ballotbox.jpg}
+\includegraphics[scale=2.5]{../pics/ballotbox.jpg}
 \end{center}
 
 \noindent Another security mechanism is to guard the ballot
@@ -252,9 +252,9 @@
 \begin{figure}[t]
 \begin{center}
 \begin{tabular}{c}
-\includegraphics[scale=0.45]{../slides/pics/dre1.jpg}\; 
-\includegraphics[scale=0.40]{../slides/pics/dre2.jpg}\smallskip\\
-\includegraphics[scale=0.5]{../slides/pics/opticalscan.jpg} 
+\includegraphics[scale=0.45]{../pics/dre1.jpg}\; 
+\includegraphics[scale=0.40]{../pics/dre2.jpg}\smallskip\\
+\includegraphics[scale=0.5]{../pics/opticalscan.jpg} 
 \end{tabular}
 \end{center}
 \caption{Direct-Recording Electronic voting machines above;
diff -r 2ce98ee39990 -r 20af800ce736 pics/alibaba1.png
Binary file pics/alibaba1.png has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/alibaba2.png
Binary file pics/alibaba2.png has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/alibaba3.png
Binary file pics/alibaba3.png has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/apple.png
Binary file pics/apple.png has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/ariane.jpg
Binary file pics/ariane.jpg has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/bulletin.jpg
Binary file pics/bulletin.jpg has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/clicker.png
Binary file pics/clicker.png has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/edf.png
Binary file pics/edf.png has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/firefox.jpg
Binary file pics/firefox.jpg has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/foursquare.png
Binary file pics/foursquare.png has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/google.png
Binary file pics/google.png has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/graphs.png
Binary file pics/graphs.png has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/guardian.jpg
Binary file pics/guardian.jpg has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/halderman.jpg
Binary file pics/halderman.jpg has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/harper.jpg
Binary file pics/harper.jpg has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/hsbc.png
Binary file pics/hsbc.png has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/jobgraph.png
Binary file pics/jobgraph.png has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/linked.png
Binary file pics/linked.png has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/marspath1.png
Binary file pics/marspath1.png has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/marspath3.png
Binary file pics/marspath3.png has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/marsrover.png
Binary file pics/marsrover.png has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/mobile-thief.gif
Binary file pics/mobile-thief.gif has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/mobile.jpg
Binary file pics/mobile.jpg has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/morgan.png
Binary file pics/morgan.png has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/novell.png
Binary file pics/novell.png has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/oysterc.jpg
Binary file pics/oysterc.jpg has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/pfenning.jpg
Binary file pics/pfenning.jpg has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/ross.jpg
Binary file pics/ross.jpg has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/smiley.jpg
Binary file pics/smiley.jpg has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/snowden.png
Binary file pics/snowden.png has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/suisse.png
Binary file pics/suisse.png has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/tan.jpg
Binary file pics/tan.jpg has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/tvtestscreen.jpg
Binary file pics/tvtestscreen.jpg has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/twitter.png
Binary file pics/twitter.png has changed
diff -r 2ce98ee39990 -r 20af800ce736 pics/x.log
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pics/x.log	Sat Oct 04 13:32:51 2014 +0100
@@ -0,0 +1,38 @@
+This is XeTeX, Version 3.1415926-2.4-0.9998 (TeX Live 2012) (format=xelatex 2013.5.13)  22 SEP 2013 15:58
+entering extended mode
+ restricted \write18 enabled.
+ %&-line parsing enabled.
+**slides01.tex
+(/usr/local/texlive/2012/texmf-dist/tex/latex/tools/x.tex
+LaTeX2e <2011/06/27>
+Babel <v3.8m> and hyphenation patterns for english, dumylang, nohyphenation, ge
+rman-x-2012-05-30, ngerman-x-2012-05-30, afrikaans, ancientgreek, ibycus, arabi
+c, armenian, basque, bulgarian, catalan, pinyin, coptic, croatian, czech, danis
+h, dutch, ukenglish, usenglishmax, esperanto, estonian, ethiopic, farsi, finnis
+h, french, friulan, galician, german, ngerman, swissgerman, monogreek, greek, h
+ungarian, icelandic, assamese, bengali, gujarati, hindi, kannada, malayalam, ma
+rathi, oriya, panjabi, tamil, telugu, indonesian, interlingua, irish, italian, 
+kurmanji, latin, latvian, lithuanian, mongolian, mongolianlmc, bokmal, nynorsk,
+ piedmontese, polish, portuguese, romanian, romansh, russian, sanskrit, serbian
+, serbianc, slovak, slovenian, spanish, swedish, turkish, turkmen, ukrainian, u
+ppersorbian, welsh, loaded.
+
+! .
+l.34   \batchmode \errmessage{}
+                               \csname @@end\endcsname \end
+This error message was generated by an \errmessage
+command, so I can't give any explicit help.
+Pretend that you're Hercule Poirot: Examine all clues,
+and deduce the truth by order and method.
+
+ ) 
+Here is how much of TeX's memory you used:
+ 6 strings out of 493994
+ 177 string characters out of 3150335
+ 48136 words of memory out of 3000000
+ 3368 multiletter control sequences out of 15000+200000
+ 3640 words of font info for 14 fonts, out of 3000000 for 9000
+ 1144 hyphenation exceptions out of 8191
+ 5i,0n,1p,92b,8s stack positions out of 5000i,500n,10000p,200000b,50000s
+
+No pages of output.
diff -r 2ce98ee39990 -r 20af800ce736 slides/slides01.pdf
Binary file slides/slides01.pdf has changed
diff -r 2ce98ee39990 -r 20af800ce736 slides/slides01.tex
--- a/slides/slides01.tex	Sat Oct 04 13:17:18 2014 +0100
+++ b/slides/slides01.tex	Sat Oct 04 13:32:51 2014 +0100
@@ -28,7 +28,7 @@
   \end{tabular}}
 
   \begin{center}
-  \includegraphics[scale=1.3]{pics/barrier.jpg}
+  \includegraphics[scale=1.3]{../pics/barrier.jpg}
   \end{center}
 
   \normalsize
@@ -46,7 +46,7 @@
 \begin{frame}
 
 \begin{center}
-\includegraphics[scale=2.1]{pics/barrier.jpg}
+\includegraphics[scale=2.1]{../pics/barrier.jpg}
 \end{center}
 
 \end{frame}
@@ -58,8 +58,8 @@
 \begin{center}
 \begin{tikzpicture}[scale=1.3]
   %\draw[very thick, scale=1] (0, 0) grid (6, -4);
-  \draw (0,0) node (X) {\includegraphics[scale=0.1]{pics/rman.png}};
-  \draw (6,0) node (Y) {\includegraphics[scale=0.1]{pics/gman.png}};
+  \draw (0,0) node (X) {\includegraphics[scale=0.1]{../pics/rman.png}};
+  \draw (6,0) node (Y) {\includegraphics[scale=0.1]{../pics/gman.png}};
   \node[below] at (X.south) {Alice};
   \node[below] at (Y.south) {Bob};
   
@@ -70,17 +70,17 @@
                                     \end{tabular}}] 
   at ($ (X)!.5!(Y) $) {};
 
-  \draw (1.0,-1.5) node {\includegraphics[scale=0.05]{pics/nsa.png}};
-  \draw (2.4,-1.5) node {\includegraphics[scale=0.3]{pics/gchq.jpg}};
+  \draw (1.0,-1.5) node {\includegraphics[scale=0.05]{../pics/nsa.png}};
+  \draw (2.4,-1.5) node {\includegraphics[scale=0.3]{../pics/gchq.jpg}};
   \draw (1.7,-2.3) node {\huge\ldots};
-  \draw (4.2,-1.5) node {\includegraphics[scale=0.05]{pics/apple.png}};
-  \draw (5.4,-1.7) node {\includegraphics[scale=0.15]{pics/google.png}};
+  \draw (4.2,-1.5) node {\includegraphics[scale=0.05]{../pics/apple.png}};
+  \draw (5.4,-1.7) node {\includegraphics[scale=0.15]{../pics/google.png}};
   \draw (5.0,-2.3) node {\huge\ldots};
 \end{tikzpicture}
 \end{center}
 
 \begin{center}
-\includegraphics[scale=0.1]{pics/snowden.jpg}
+\includegraphics[scale=0.1]{../pics/snowden.jpg}
 \end{center}
 
 \end{frame}
@@ -90,7 +90,7 @@
 \begin{frame}
 
 \begin{center}
-\includegraphics[scale=0.45]{pics/lavabit-email.jpg}
+\includegraphics[scale=0.45]{../pics/lavabit-email.jpg}
 \end{center}
 \small{}\mbox{}\hfill{}
 Lavabit email service closed down on 8 August 2013. \\
@@ -105,8 +105,8 @@
 
 \begin{textblock}{1}(4,2.5)
   \begin{tikzpicture}[scale=1.3]
-  \draw (0,0) node (X) {\includegraphics[scale=0.1]{pics/rman.png}};
-  \draw (4,0) node (Y) {\includegraphics[scale=0.1]{pics/gman.png}};
+  \draw (0,0) node (X) {\includegraphics[scale=0.1]{../pics/rman.png}};
+  \draw (4,0) node (Y) {\includegraphics[scale=0.1]{../pics/gman.png}};
   \draw[red, <->, line width = 2mm] (X) -- (Y);
   \end{tikzpicture}
 \end{textblock}
@@ -136,7 +136,7 @@
 \frametitle{This is a Misconception!}
 
 \begin{center}
-\includegraphics[scale=0.55]{pics/cryptographic-small.png}
+\includegraphics[scale=0.55]{../pics/cryptographic-small.png}
 \end{center}
 
 \centering
@@ -157,9 +157,9 @@
 \small
 \begin{center}
 \begin{tabular}{ccc}
-\includegraphics[scale=1.4]{pics/schneier.png} &
-\includegraphics[scale=0.103]{pics/ross.jpg} &
-\includegraphics[scale=0.2]{pics/halderman.jpg} \\
+\includegraphics[scale=1.4]{../pics/schneier.png} &
+\includegraphics[scale=0.103]{../pics/ross.jpg} &
+\includegraphics[scale=0.2]{../pics/halderman.jpg} \\
 Bruce Schneier & Ross Anderson & Alex Halderman\\
 \tiny\url{en.wikipedia.org/wiki/Bruce_Schneier} & 
 \tiny\url{www.cl.cam.ac.uk/~rja14} & 
@@ -201,10 +201,10 @@
 \end{overlayarea}
 
 \begin{flushright}
-\includegraphics[scale=0.0087]{pics/schneierbook1.jpg}\;
-\includegraphics[scale=0.0087]{pics/schneierbook2.jpg}\;
-\includegraphics[scale=0.23]{pics/schneierbook3.jpg}\;
-\includegraphics[scale=0.85]{pics/schneier.png}
+\includegraphics[scale=0.0087]{../pics/schneierbook1.jpg}\;
+\includegraphics[scale=0.0087]{../pics/schneierbook2.jpg}\;
+\includegraphics[scale=0.23]{../pics/schneierbook3.jpg}\;
+\includegraphics[scale=0.85]{../pics/schneier.png}
 \end{flushright}
 
 \end{frame}
@@ -298,8 +298,8 @@
 \frametitle{Chip-and-PIN}
 
 \begin{center}
-\includegraphics[scale=0.3]{pics/creditcard1.jpg}\;
-\includegraphics[scale=0.3]{pics/creditcard2.jpg}
+\includegraphics[scale=0.3]{../pics/creditcard1.jpg}\;
+\includegraphics[scale=0.3]{../pics/creditcard2.jpg}
 \end{center}
 
 \begin{itemize}
@@ -347,20 +347,20 @@
 
 \begin{textblock}{1}(3,4)
 \begin{tabular}{c}
-\includegraphics[scale=0.3]{pics/bank.png}\\[-2mm]
+\includegraphics[scale=0.3]{../pics/bank.png}\\[-2mm]
 \small Bank
 \end{tabular}
 \end{textblock}
 
 \begin{textblock}{1}(7,4.5)
 \begin{tabular}{c}
-\includegraphics[scale=3]{pics/store.png}\\[-2mm]
+\includegraphics[scale=3]{../pics/store.png}\\[-2mm]
 \end{tabular}
 \end{textblock}
 
 \begin{textblock}{1}(4.5,9.9)
 \begin{tabular}{c}
-\includegraphics[scale=0.16]{pics/rman.png}\\[-1mm]
+\includegraphics[scale=0.16]{../pics/rman.png}\\[-1mm]
 \small customer / you
 \end{tabular}
 \end{textblock}  
@@ -397,7 +397,7 @@
 \only<4->{  
 \begin{textblock}{1}(12,6.5)
 \begin{tabular}{c}
-\includegraphics[scale=0.8]{pics/factory.png}\\[-1mm]
+\includegraphics[scale=0.8]{../pics/factory.png}\\[-1mm]
 \small card\\[-2mm]\small terminal\\[-2mm] \small producer
 \end{tabular}
 \end{textblock}
@@ -424,7 +424,7 @@
 \footnotesize(\url{http://www.youtube.com/watch?v=wWTzkD9M0sU})
 \end{itemize}
  
-\includegraphics[scale=0.2]{pics/tetris.jpg}
+\includegraphics[scale=0.2]{../pics/tetris.jpg}
   
 \end{frame}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%   
@@ -451,8 +451,8 @@
 \frametitle{Chip-and-PIN is Broken}
 
 \begin{flushright}
-\includegraphics[scale=0.01]{pics/andersonbook1.jpg}\;
-\includegraphics[scale=1.5]{pics/anderson.jpg}
+\includegraphics[scale=0.01]{../pics/andersonbook1.jpg}\;
+\includegraphics[scale=1.5]{../pics/anderson.jpg}
 \end{flushright}
 
 \begin{itemize}
@@ -460,7 +460,7 @@
 \end{itemize}
 
 \begin{center}
-\mbox{}\hspace{-20mm}\includegraphics[scale=0.5]{pics/chip-attack.png}
+\mbox{}\hspace{-20mm}\includegraphics[scale=0.5]{../pics/chip-attack.png}
 \end{center}
 
 \begin{textblock}{1}(11.5,13.7)
@@ -479,8 +479,8 @@
 \frametitle{\Large Chip-and-PIN is Really Broken}
 
 \begin{flushright}
-\includegraphics[scale=0.01]{pics/andersonbook1.jpg}\;
-\includegraphics[scale=1.5]{pics/anderson.jpg}
+\includegraphics[scale=0.01]{../pics/andersonbook1.jpg}\;
+\includegraphics[scale=1.5]{../pics/anderson.jpg}
 \end{flushright}
 
 \begin{itemize}
@@ -498,27 +498,27 @@
 
 \begin{textblock}{1}(3,4)
 \begin{tabular}{c}
-\includegraphics[scale=0.3]{pics/bank.png}\\[-2mm]
+\includegraphics[scale=0.3]{../pics/bank.png}\\[-2mm]
 \small Bank
 \end{tabular}
 \end{textblock}
 
 \begin{textblock}{1}(7,4.5)
 \begin{tabular}{c}
-\includegraphics[scale=3]{pics/store.png}\\[-2mm]
+\includegraphics[scale=3]{../pics/store.png}\\[-2mm]
 \end{tabular}
 \end{textblock}
 
 \begin{textblock}{1}(12,6.5)
 \begin{tabular}{c}
-\includegraphics[scale=0.8]{pics/factory.png}\\[-1mm]
+\includegraphics[scale=0.8]{../pics/factory.png}\\[-1mm]
 \small terminal\\[-2mm] \small producer
 \end{tabular}
 \end{textblock}
 
 \begin{textblock}{1}(4.5,9.9)
 \begin{tabular}{c}
-\includegraphics[scale=0.13]{pics/rman.png}\\[-1mm]
+\includegraphics[scale=0.13]{../pics/rman.png}\\[-1mm]
 \small customer / you
 \end{tabular}
 \end{textblock}  
@@ -595,7 +595,7 @@
 \frametitle{Being Screwed Again}
 
 \begin{flushright}
-\includegraphics[scale=0.3]{pics/rbssecure.jpg}
+\includegraphics[scale=0.3]{../pics/rbssecure.jpg}
 \end{flushright}
 
 \begin{itemize}
@@ -614,7 +614,7 @@
 
 \begin{textblock}{1}(2,5)
 \begin{tabular}{c}
-\includegraphics[scale=0.15]{pics/servers.png}\\[-2mm]
+\includegraphics[scale=0.15]{../pics/servers.png}\\[-2mm]
 \small Servers from\\[-2mm] 
 \small Dot.com Inc.
 \end{tabular}
@@ -636,7 +636,7 @@
 
 \begin{textblock}{1}(9,5.5)
 \begin{tabular}{c}
-\includegraphics[scale=0.15]{pics/laptop.png}\\[-2mm]
+\includegraphics[scale=0.15]{../pics/laptop.png}\\[-2mm]
 \small Client(s)
 \end{tabular}
 \end{textblock}
@@ -686,7 +686,7 @@
 
 \begin{textblock}{1}(1.5,5)
 \begin{tabular}{c}
-\includegraphics[scale=0.15]{pics/servers.png}\\[-2mm]
+\includegraphics[scale=0.15]{../pics/servers.png}\\[-2mm]
 \small Servers from\\[-2mm] 
 \small Dot.com Inc.
 \end{tabular}
@@ -714,7 +714,7 @@
 
 \begin{textblock}{1}(9.5,5.5)
 \begin{tabular}{c}
-\includegraphics[scale=0.15]{pics/laptop.png}\\[-2mm]
+\includegraphics[scale=0.15]{../pics/laptop.png}\\[-2mm]
 \small Client
 \end{tabular}
 \end{textblock}
@@ -756,7 +756,7 @@
 
 \begin{textblock}{1}(1.5,4.5)
 \begin{tabular}{c}
-\includegraphics[scale=0.07]{pics/servers.png}\\[-2mm]
+\includegraphics[scale=0.07]{../pics/servers.png}\\[-2mm]
 \small Pet Store\\[-2mm] 
 \small Dot.com\\[-2mm] 
 \end{tabular}
@@ -764,14 +764,14 @@
   
 \begin{textblock}{1}(1.5,8)
 \begin{tabular}{c}
-\includegraphics[scale=0.07]{pics/servers.png}\\[-2mm]
+\includegraphics[scale=0.07]{../pics/servers.png}\\[-2mm]
 \small Dating.com
 \end{tabular}
 \end{textblock}  
 
 \begin{textblock}{1}(10.5,7.5)
 \begin{tabular}{c}
-\includegraphics[scale=0.07]{pics/servers.png}\\[-2mm]
+\includegraphics[scale=0.07]{../pics/servers.png}\\[-2mm]
 \small Evil-Ad-No\\[-2mm]
 \small Privacy.com
 \end{tabular}
@@ -779,7 +779,7 @@
 
 \begin{textblock}{1}(6,10.5)
 \begin{tabular}{c}
-\includegraphics[scale=0.16]{pics/rman.png}\\[-1mm]
+\includegraphics[scale=0.16]{../pics/rman.png}\\[-1mm]
 \small you
 \end{tabular}
 \end{textblock}  
@@ -860,7 +860,7 @@
 \begin{frame}[c]
 
 \begin{center}
-\includegraphics[scale=1.8]{pics/barrier.jpg}
+\includegraphics[scale=1.8]{../pics/barrier.jpg}
 \end{center}
 
 \begin{itemize}
@@ -990,7 +990,7 @@
 \draw (0,0) node[inner sep=2mm,fill=white, ultra thick, draw=red, rounded corners=2mm] 
 {\normalsize\color{darkgray}
 \begin{minipage}{7.5cm}\raggedright\small
-\includegraphics[scale=0.6]{pics/IEEElog.jpg}
+\includegraphics[scale=0.6]{../pics/IEEElog.jpg}
 \end{minipage}};
 \end{tikzpicture}
 \end{textblock}}
@@ -1060,7 +1060,7 @@
 \only<2->{
 \begin{textblock}{1}(12,5)
 \begin{tabular}{c}
-\includegraphics[scale=0.3]{pics/radeon.jpg}\\[-6mm]
+\includegraphics[scale=0.3]{../pics/radeon.jpg}\\[-6mm]
 \footnotesize graphics card\\[-1mm]
 \footnotesize ca.~\pounds{}300
 \end{tabular}
@@ -1134,14 +1134,14 @@
 \only<1->{
 \begin{textblock}{1}(2,2)
   \begin{tikzpicture}[scale=1.3]
-  \draw[white] (0,0) node (X) {\includegraphics[scale=0.12]{pics/firefox.jpg}};
+  \draw[white] (0,0) node (X) {\includegraphics[scale=0.12]{../pics/firefox.jpg}};
   \end{tikzpicture}
 \end{textblock}}
 
 \only<1->{
 \begin{textblock}{1}(11,2)
   \begin{tikzpicture}[scale=1.3]
-  \draw[white] (0,0) node (X) {\includegraphics[scale=0.15]{pics/servers.png}};
+  \draw[white] (0,0) node (X) {\includegraphics[scale=0.15]{../pics/servers.png}};
   \end{tikzpicture}
 \end{textblock}}
 
@@ -1162,7 +1162,7 @@
   \draw[white] (3,0) node (Y) {};
   \draw[red, <-, line width = 2mm] (X) -- (Y);
   \node [inner sep=5pt,label=below:\textcolor{black}{\small ETag: 7b33de1}] at ($ (X)!.5!(Y) $) {};
-   \node [inner sep=5pt,label=above:{\includegraphics[scale=0.15]{pics/tvtestscreen.jpg}}] at ($ (X)!.5!(Y) $) {};
+   \node [inner sep=5pt,label=above:{\includegraphics[scale=0.15]{../pics/tvtestscreen.jpg}}] at ($ (X)!.5!(Y) $) {};
   \end{tikzpicture}
 \end{textblock}}
 
@@ -1197,8 +1197,8 @@
 \item There is no single book I am following
 
   \begin{center}
-    \includegraphics[scale=0.012]{pics/andersonbook1.jpg}
-    %%\includegraphics[scale=0.23]{pics/accesscontrolbook.jpg}
+    \includegraphics[scale=0.012]{../pics/andersonbook1.jpg}
+    %%\includegraphics[scale=0.23]{../pics/accesscontrolbook.jpg}
   \end{center}\medskip\pause
 
 \item The question ``Is this relevant for the exams'' is not appreciated!\medskip\\
diff -r 2ce98ee39990 -r 20af800ce736 slides/slides02.pdf
Binary file slides/slides02.pdf has changed
diff -r 2ce98ee39990 -r 20af800ce736 slides/slides02.tex
--- a/slides/slides02.tex	Sat Oct 04 13:17:18 2014 +0100
+++ b/slides/slides02.tex	Sat Oct 04 13:32:51 2014 +0100
@@ -61,12 +61,12 @@
 \only<2>{
 \begin{textblock}{11}(3.5,12)
 \begin{tabular}{c}
-\includegraphics[scale=0.12]{pics/ariane.jpg}\\[-2mm]
+\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]
+\includegraphics[scale=0.15]{../pics/mobile.jpg}\;
+\includegraphics[scale=0.06]{../pics/pinsentry.jpg}\\[-2mm]
 \footnotesize Satan's computers
 \end{tabular}
 \end{textblock}}
@@ -271,7 +271,7 @@
 \frametitle{Traditional Ballot Boxes}
 
 \begin{center}
-\includegraphics[scale=2.5]{pics/ballotbox.jpg}
+\includegraphics[scale=2.5]{../pics/ballotbox.jpg}
 \end{center}\pause\bigskip
 
 mechanical, but they need a ``protocol''
@@ -435,7 +435,7 @@
 \end{enumerate}
 
 \begin{center}
-\includegraphics[scale=1.5]{pics/ballotbox.jpg}
+\includegraphics[scale=1.5]{../pics/ballotbox.jpg}
 \end{center}
 
 
@@ -467,7 +467,7 @@
 
 \only<2>{
 \begin{center}
-\includegraphics[scale=0.8]{pics/tweet.jpg}\\
+\includegraphics[scale=0.8]{../pics/tweet.jpg}\\
 \footnotesize William M.~Tweed, US Politician in 1860's\\
 ``As long as I count the votes, what are you going to do about it?''
 \end{center}}
@@ -501,14 +501,14 @@
 \item<1-> Lever Voting Machines (ca.~1930 - 1990)
 \only<1>{
 \begin{center}
-\includegraphics[scale=0.56]{pics/leavermachine.jpg}
+\includegraphics[scale=0.56]{../pics/leavermachine.jpg}
 \end{center}
 }
 \item<2->Punch Cards (ca.~1950 - 2000)
 \only<2>{
 \begin{center}
-\includegraphics[scale=0.5]{pics/punchcard1.jpg}\;\;
-\includegraphics[scale=0.46]{pics/punchcard2.jpg}
+\includegraphics[scale=0.5]{../pics/punchcard1.jpg}\;\;
+\includegraphics[scale=0.46]{../pics/punchcard2.jpg}
 \end{center}
 }
 \end{itemize}
@@ -523,9 +523,9 @@
 
 \begin{center}
 \begin{tabular}{c}
-\includegraphics[scale=0.45]{pics/dre1.jpg}\; 
-\includegraphics[scale=0.40]{pics/dre2.jpg}\\\hline\\
-\includegraphics[scale=0.5]{pics/opticalscan.jpg} 
+\includegraphics[scale=0.45]{../pics/dre1.jpg}\; 
+\includegraphics[scale=0.40]{../pics/dre2.jpg}\\\hline\\
+\includegraphics[scale=0.5]{../pics/opticalscan.jpg} 
 \end{tabular}
 \end{center}
 
@@ -559,7 +559,7 @@
 usually no papertrail
 
 \begin{center}
-\includegraphics[scale=0.56]{pics/dre1.jpg}
+\includegraphics[scale=0.56]{../pics/dre1.jpg}
 \end{center}
 
 
@@ -613,7 +613,7 @@
 
 \begin{center}
 \begin{tabular}{c}
-\includegraphics[scale=0.5]{pics/opticalscan.jpg} 
+\includegraphics[scale=0.5]{../pics/opticalscan.jpg} 
 \end{tabular}
 \end{center}\pause
 
@@ -633,8 +633,8 @@
 
 \begin{center}
 \begin{tabular}{c}
-\includegraphics[scale=1.05]{pics/indiaellection.jpg}\;\;
-\includegraphics[scale=0.40]{pics/india1.jpg}
+\includegraphics[scale=1.05]{../pics/indiaellection.jpg}\;\;
+\includegraphics[scale=0.40]{../pics/india1.jpg}
 \end{tabular}
 \end{center}\medskip\pause
 
@@ -678,7 +678,7 @@
 \frametitle{Student In-Lecture Polling}
 
 \begin{center}
-\includegraphics[scale=0.3]{pics/clicker.png}
+\includegraphics[scale=0.3]{../pics/clicker.png}
 \end{center}
 
 \begin{itemize}
@@ -698,12 +698,12 @@
 \begin{itemize}
 \item anonymity through one-time pads
 \begin{center}
-\includegraphics[scale=0.3]{pics/tan.jpg}
+\includegraphics[scale=0.3]{../pics/tan.jpg}
 \end{center}\bigskip\pause
 
 \item solving the problem of distribution
 \begin{center}
-\includegraphics[scale=0.3]{pics/bulletin.jpg}
+\includegraphics[scale=0.3]{../pics/bulletin.jpg}
 \end{center}
 
 \end{itemize}
@@ -716,7 +716,7 @@
 \begin{frame}[c]
 
 \begin{center}
-\includegraphics[scale=0.56]{pics/Voting1.png}
+\includegraphics[scale=0.56]{../pics/Voting1.png}
 \end{center}
 
 
@@ -728,7 +728,7 @@
 \begin{frame}[c]
 
 \begin{center}
-\includegraphics[scale=0.56]{pics/Voting2.png}
+\includegraphics[scale=0.56]{../pics/Voting2.png}
 \end{center}
 
 
@@ -740,7 +740,7 @@
 \begin{frame}[c]
 
 \begin{center}
-\includegraphics[scale=0.56]{pics/Voting3.png}
+\includegraphics[scale=0.56]{../pics/Voting3.png}
 \end{center}
 
 
@@ -752,7 +752,7 @@
 \begin{frame}[c]
 
 \begin{center}
-\includegraphics[scale=0.56]{pics/Voting4.png}
+\includegraphics[scale=0.56]{../pics/Voting4.png}
 \end{center}
 
 
@@ -914,12 +914,12 @@
 \begin{columns}[b]
 \begin{column}{.4\textwidth}
 \centering
-\includegraphics[scale=1.2]{pics/barrier.jpg}\\
+\includegraphics[scale=1.2]{../pics/barrier.jpg}\\
 first lecture
 \end{column}
 \begin{column}<2>{.4\textwidth}
 \centering
-\includegraphics[scale=0.32]{pics/trainwreck.jpg}\\
+\includegraphics[scale=0.32]{../pics/trainwreck.jpg}\\
 next week
 \end{column}
 \end{columns}
diff -r 2ce98ee39990 -r 20af800ce736 slides/slides03.pdf
Binary file slides/slides03.pdf has changed
diff -r 2ce98ee39990 -r 20af800ce736 slides/slides03.tex
--- a/slides/slides03.tex	Sat Oct 04 13:17:18 2014 +0100
+++ b/slides/slides03.tex	Sat Oct 04 13:32:51 2014 +0100
@@ -94,12 +94,12 @@
 \begin{columns}[b]
 \begin{column}{.4\textwidth}
 \centering
-\includegraphics[scale=1.2]{pics/barrier.jpg}\\
+\includegraphics[scale=1.2]{../pics/barrier.jpg}\\
 lectures so far
 \end{column}
 \begin{column}<2>{.4\textwidth}
 \centering
-\includegraphics[scale=0.32]{pics/trainwreck.jpg}\\
+\includegraphics[scale=0.32]{../pics/trainwreck.jpg}\\
 today
 \end{column}
 \end{columns}
@@ -394,7 +394,7 @@
 \begin{frame}[c]
 
 \begin{center}
-\includegraphics[scale=0.45]{pics/trainwreck.jpg}\\
+\includegraphics[scale=0.45]{../pics/trainwreck.jpg}\\
 one general defence mechanism is\\\alert{\bf defence in depth}
 \end{center}
 
@@ -480,9 +480,9 @@
 \begin{frame}[c]
 
 \begin{center}
-\only<1>{\includegraphics[scale=0.9]{pics/stack1}\;\;}
-\only<2>{\includegraphics[scale=0.9]{pics/stack2}\;\;}
-\only<3>{\includegraphics[scale=0.9]{pics/stack3}\;\;}
+\only<1>{\includegraphics[scale=0.9]{../pics/stack1}\;\;}
+\only<2>{\includegraphics[scale=0.9]{../pics/stack2}\;\;}
+\only<3>{\includegraphics[scale=0.9]{../pics/stack3}\;\;}
 \end{center}
     
 \end{frame}