From: Aaron Zauner <azet@azet.org>
Date: Fri, 14 Feb 2014 17:19:38 +0000 (+0100)
Subject: merging kerberos pull req. by @arwarw via github
X-Git-Url: https://git.bettercrypto.org/ach-master.git/commitdiff_plain/7a6da2d0a44a73aa5ceae93145a9a1f73d472f41

merging kerberos pull req. by @arwarw via github
---

7a6da2d0a44a73aa5ceae93145a9a1f73d472f41
diff --cc src/practical_settings.tex
index 0ba7045,ec48ecb..a7cbf83
--- a/src/practical_settings.tex
+++ b/src/practical_settings.tex
@@@ -28,7 -28,10 +28,10 @@@
  \input{practical_settings/DBs}
  \section{Intercepting proxy solutions and reverse proxies}
  \label{sec:interc-proxy-solut}
 -\input{practical_settings/proxy_solutions_generated}
 +\input{practical_settings/proxy_solutions}
+ \section{Kerberos}
+ \label{sec:kerberos}
+ \input{practical_settings/kerberos}
  
  %%% Local Variables: 
  %%% mode: latex
diff --cc src/security.bib
index 68b865a,465a408..1381707
--- a/src/security.bib
+++ b/src/security.bib
@@@ -23,15 -23,36 +23,36 @@@
       \hyperref{http://mathworld.wolfram.com/}{}{}{Mathworld}}
  }
  @string {J_TOMACS =
 -    {\hyperref{http://tomacs.acm.org/}{}{}{ACM}
 -     \hyperref{http://tomacs.acm.org/}{}{}{Transactions}
 -     \hyperref{http://tomacs.acm.org/}{}{}{on}
 -     \hyperref{http://tomacs.acm.org/}{}{}{Modeling}
 -     \hyperref{http://tomacs.acm.org/}{}{}{and}
 -     \hyperref{http://tomacs.acm.org/}{}{}{Computer}
 -     \hyperref{http://tomacs.acm.org/}{}{}{Simulation}}
 +    {\hyperref{https://tomacs.acm.org/}{}{}{ACM}
 +     \hyperref{https://tomacs.acm.org/}{}{}{Transactions}
 +     \hyperref{https://tomacs.acm.org/}{}{}{on}
 +     \hyperref{https://tomacs.acm.org/}{}{}{Modeling}
 +     \hyperref{https://tomacs.acm.org/}{}{}{and}
 +     \hyperref{https://tomacs.acm.org/}{}{}{Computer}
 +     \hyperref{https://tomacs.acm.org/}{}{}{Simulation}}
  }
  
+ @string {I_MIT = 
+ 	{\hyperref{http://web.mit.edu/}{}{}{MIT}}
+ }
+ 
+ @string {I_IETF = 
+ 	{\hyperref{https://www.ietf.org/}{}{}{IETF}}
+ }
+ 
+ @string {I_ORACLE = 
+ 	{\hyperref{http://www.oracle.com/}{}{}{Oracle}}
+ }
+ 
+ @string {I_GNU = 
+ 	{\hyperref{https://www.gnu.org/}{}{}{GNU}}
+ }
+ 
+ @string {I_BLACKHAT =
+     {\hyperref{https://blackhat.com}{}{}{Blackhat}
+      \hyperref{https://blackhat.com}{}{}{USA}}
+ }
+ 
  @inproceedings{HDWH12,
     author    = {Nadia Heninger and Zakir Durumeric and Eric Wustrow
                  and J. Alex Halderman},