get rid of merge conflict
[ach-master.git] / src / security.bib
index 3cdec94..6ad6f9b 100644 (file)
    note      = {Accessed 2013-12-06},
 }
 
+@book{katz2008introduction,
+  title={Introduction to modern cryptography},
+  author={Katz, J. and Lindell, Y.},
+  isbn={9781584885511},
+  lccn={2007017861},
+  series={Chapman and Hall/CRC Cryptography and Network Security Series},
+  url={http://books.google.at/books?id=WIc\_AQAAIAAJ},
+  year={2008},
+  publisher={Chapman \& Hall/CRC}
+}
+~