Merge branch 'master' of github.com:dopefishh/ssh-pres

Conflicts:
	intro.tex
	server.tex

diff --combined intro.tex
index e751127,dd09fb8..f6e3d57
--- 1/intro.tex
--- 2/intro.tex
+++ b/intro.tex
@@@ -1,14 -1,15 +1,29 @@@
  \begin{frame}
        \frametitle{Introductie}
++<<<<<<< HEAD
 +      \begin{block}{Waarom}
 +              \begin{enumerate}
 +                              \pause
 +                      \item{veiligheid \footnote{mits goed gebruikt}}
 +                              \pause
 +                      \item{beschikbaarheid}
 +                              \pause
 +                      \item{cross platform}
 +              \end{enumerate}
 +      \end{block}
 +      En natuurlijk al de handige truukjes die je er mee uit kunt halen...
++=======
+       \begin{block}{Wat is SSH}
+                       \pause
+                       \begin{enumerate}
+                                       \item remote shell
+                                       \item x forwarding
+                                       \item port forwarding
+                                       \item ...
+                       \end{enumerate}
+       \end{block}
+       \pause
+       \begin{block}{Versleuteling}
+       \end{block}
++>>>>>>> 045d7a2a20106057e9b1a2b7ce76c3ae174ab6b8
  \end{frame}

diff --combined server.tex
index 45177bd,6806116..2597941
--- 1/server.tex
--- 2/server.tex
+++ b/server.tex
@@@ -1,38 -1,38 +1,39 @@@
  \begin{frame}[fragile]
        \frametitle{Installeren}
-       \begin{block}{Verschillende smaken}
-               Openssh-server\\
-               Dropbear\\
-               ...
+       \begin{block}{Smaken}
+               \begin{enumerate}
+                       \item OpenSSH
+                       \item Dropbear
+                       \item lsh
+                       \item ...
+               \end{enumerate}
        \end{block}
+       \pause
        \begin{block}{Installeren}
                \begin{lstlisting}
- sudo apt-get install {openssh-server,dropbear}
- yum
- pacman
- zypper
- ...
+ # apt-get install openssh-server
+ # pacman -S openssh
+ # yum install openssh-server
+ # zypper install openssh-server
                \end{lstlisting}
        \end{block}
  \end{frame}
  
  \begin{frame}[fragile]
-       \frametitle{Configureren systeem breed}
-       \begin{block}{/etc/ssh/sshd\_config}
-               \lstinline{man sshd\_config}
-       \end{block}
+       \frametitle{/etc/ssh/sshd\_config}
        \begin{block}{Broodnodig}
-               \lstinline{AllowUsers henk}
-       \end{block}
- \end{frame}
- 
- \begin{frame}[fragile]
-       \frametitle{Configureren per user}
-       \begin{block}{\textasciitilde/.ssh/authorized\_keys}
-               \lstinline{parameter1="waarde",parameter2="waarde", ... ,parameter2="waarde",ssh-rsa AAAAB3N...}
+               \lstinline{AllowUsers frobnicator}\\
        \end{block}
-       \begin{block}{Merk op}
-               alles in \textasciitilde/.ssh/ moet alleen leesbaar zijn voor de user. 
-               \lstinline{chmod 600} dus
+       \pause
+       \begin{block}{Verder}
+               \begin{enumerate}
+                       \item PermitOpen
+                       \item X11Forwarding
+                       \item PermitRootLogin
+                       \item ChrootDirectory
+                       \item ...
+                       \item \lstinline{$ man sshd_config}
+               \end{enumerate}
++>>>>>>> 045d7a2a20106057e9b1a2b7ce76c3ae174ab6b8
        \end{block}
  \end{frame}

diff --combined truuk.tex
index 37f6ea6,bf50aca..d7e6f07
--- 1/truuk.tex
--- 2/truuk.tex
+++ b/truuk.tex
@@@ -6,7 -6,7 +6,7 @@@
        \end{block}
        \pause
        \begin{block}{Command line vlag}
-               \lstinline{ssh -i ~/.ssh/keyfile user@server.nl}
+               \lstinline{ssh -i ~/.ssh/keyfile frobnicator@foobarbaz.com}
        \end{block}
        \pause
        \begin{block}{Config file}
@@@ -20,14 -20,14 +20,14 @@@
        \begin{block}{\$ ssh-keygen}
                \begin{lstlisting}
  Generating public/private rsa key pair.
- Enter file in which to save the key (/home/user/.ssh/id_rsa):
-               /home/user/.ssh/github
+ Enter file in which to save the key (/home/frobnicator/.ssh/id_rsa):
+               /home/frobnicator/.ssh/github
  Enter passphrase (empty for no passphrase): 
  Enter same passphrase again: 
- Your identification has been saved in /home/user/.ssh/github.
- Your public key has been saved in /home/user/.ssh/github.pub.
+ Your identification has been saved in /home/frobnicator/.ssh/github.
+ Your public key has been saved in /home/frobnicator/.ssh/github.pub.
  The key fingerprint is:
- 92:92:6e:b8:3f:d5:76:e8:1b:73:ed:97:c4:e5:87:ba user@system
+ 92:92:6e:b8:3f:d5:76:e8:1b:73:ed:97:c4:e5:87:ba frobnicator@foobarbaz
  The key's randomart image is:
  +--[ RSA 2048]----+
  |                 |
@@@ -54,8 -54,8 +54,8 @@@ suOAErDvInRDQbl2bjR0PGizL2t5lM9zE+mS0HH
  BcW55x3LR/2fLSujUqcloQNwLUpD5da6eGg9yPo1fEaAOK1ssHGA30o6nmDEZEHy
  PFgBtPwtDw5TPXPpzslaJx1u7CdeyzqpYsUycxzboy3GBcCsvG4nzD4C9vd0yk5o
  jlDeECul4mwyg7NuEjltaY89RzrSa8NtqtURyg/JFQW2IVGe+oBXeTL/eQRuo1Nj
- GhYyPm1VMVM+NvaYQZXxGfLpoDoP2V+deD+gP5DuC8WW4LSGnkHKhDEin0Yl mar
- t@valhalla
+ GhYyPm1VMVM+NvaYQZXxGfLpoDoP2V+deD+gP5DuC8WW4LSGnkHKhDEin0Yl foo
+ @foobarbaz
                \end{lstlisting}
        \end{block}
        \pause
@@@ -76,6 -76,16 +76,20 @@@ d5DgKnWxgJPHnDjmwqTeX3A5S34m/qJKK67IF9W
        \end{block}
  \end{frame}
  
+ \begin{frame}[fragile]
+       \frametitle{Public key authentication}
+       \begin{block}{\textasciitilde/.ssh/authorized\_keys}
+               \begin{lstlisting}
+ option1="option1value",option2="option2value"...optionn="optionnvalue" ssh-rsa\
+ AAAB4N.....
+               \end{lstlisting}
+       \end{block}
++      \begin{block}{Merk op}
++              alles in \textasciitilde/.ssh/ moet alleen leesbaar zijn voor de user. 
++              \lstinline{chmod 600} dus
++      \end{block}
+ \end{frame}
+ 
  \begin{frame}[fragile]
        \frametitle{X forwarding}
        \begin{block}{Nut}
@@@ -84,7 -94,7 +98,7 @@@
        \end{block}
        \pause
        \begin{block}{Command line vlag}
-               \lstinline{ssh -X user@server.nl}
+               \lstinline{ssh -X frobnicator@foobarbaz.com}
        \end{block}
        \pause
        \begin{block}{Config file}
@@@ -103,8 -113,8 +117,8 @@@
        \end{block}
        \pause
        \begin{block}{Command line vlag}
-               \lstinline{ssh -L port:host:hostport}\\
-               \lstinline{ssh -R port:host:hostport}
+               \lstinline{ssh -L port:host:hostport frobnicator@foobarbaz.com}\\
+               \lstinline{ssh -R port:host:hostport frobnicator@foobarbaz.com}
        \end{block}
        \pause
        \begin{block}{Config file}
@@@ -120,7 -130,7 +134,7 @@@
        \end{block}
        \pause
        \begin{block}{Command line vlag}
-               \lstinline{ssh -A user@system}
+               \lstinline{ssh -A frobnicator@foobarbaz.com}
        \end{block}
        \pause
        \begin{block}{Config file}
@@@ -135,7 -145,7 +149,7 @@@
        \end{block}
        \pause
        \begin{block}{Command line vlag}
-               \lstinline{ssh -D port}
+               \lstinline{ssh -D port frobnicator@foobarbaz.com}
        \end{block}
        \pause
        \begin{block}{Config file}
@@@ -152,3 -162,18 +166,18 @@@
        Edit - Preferences - Advanced - Network - Settings
        \includegraphics[width=200px]{./img/firefox_socks.png}
  \end{frame}
+ 
+ \begin{frame}[fragile]
+       \frametitle{Compression}
+       \begin{block}{Nut}
+               Snelheid
+       \end{block}
+       \pause
+       \begin{block}{Command line vlag}
+               \lstinline{ssh -C frobnicator@foobarbaz.com}
+       \end{block}
+       \pause
+       \begin{block}{Config file}
+               \lstinline{Compression yes}
+       \end{block}
+ \end{frame}