diff options
| author | Manuel Traut <manut@mecka.net> | 2013-03-10 12:13:49 +0100 |
|---|---|---|
| committer | Manuel Traut <manut@mecka.net> | 2013-03-10 12:13:49 +0100 |
| commit | 9c0f862749f30800837a45aff5abdcb529867dbc (patch) | |
| tree | b0ca51fff64f12fac03aea4afaa1fa722376844b /security/vpn/frm_protocol-overview.tex | |
| parent | 33b79c725448efd2c9a72e2ae9a1fb04270492f5 (diff) | |
| parent | cea5039322781f6085dd47954af5584ca3f78911 (diff) | |
Merge branch 'schulung'
updates from current linutronix schulung.git
Conflicts:
Makefile
configpres.tex
flash-memory/ubi/handout_ubi_de.tex
handout.tex
index.txt
pres_master.tex
vorl.tex
vorl1.tex
vorl2.tex
vorl3.tex
vorl4.tex
vorl5.tex
Signed-off-by: Manuel Traut <manut@mecka.net>
Diffstat (limited to 'security/vpn/frm_protocol-overview.tex')
| -rw-r--r-- | security/vpn/frm_protocol-overview.tex | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/security/vpn/frm_protocol-overview.tex b/security/vpn/frm_protocol-overview.tex new file mode 100644 index 0000000..1efd5ce --- /dev/null +++ b/security/vpn/frm_protocol-overview.tex @@ -0,0 +1,22 @@ +\begin{frame}[fragile] +\frametitle{VPN Protocol Overview} +\begin{itemize} +\item Internet Protocol Security (IPsec) + \begin{itemize} + \item Internet Key Exchange (IKEv1, IKEv2) + \item Layer 2 Tunneling Protocol (L2TP) + \item XAUTH + \end{itemize} +\item Transport Layer Security (TLS/SSL) + \begin{itemize} + \item TLS/SSL Authentication Methods + \end{itemize} +\item Proprietary Protocols + \begin{itemize} + \item Generic Routing Encapsulation (GRE) + \begin{itemize} + \item Point-to-Point Tunneling Protocol (PPTP) + \end{itemize} + \end{itemize} +\end{itemize} +\end{frame} |