ma: Small formatting fixes

 * Fix title-case inconsistencies
 * Remove printed URLs from most bibliography entries

2 files changed, 337 insertions, 326 deletions

diff --git a/ma/safety_reset.bib b/ma/safety_reset.bib
index ff753cc..79e6e94 100644
--- a/ma/safety_reset.bib
+++ b/ma/safety_reset.bib
@@ -42,240 +42,240 @@
 	urldate = {2019-09-19},
 	year = {2019}
 }
-
-@online{bmwi1,
-	author = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik} and {Bundesministerium f{\"u}r Wirtschaft und Energie}},
-	month = jan,
-	publisher = {Bundesministerium f{\"u}r Wirtschaft und Energie},
-	title = {Standardisierungsstrategie zur sektor{\"u}bergreifenden Digitalisierung nach dem Gesetz zur Digitalisierung der Energiewende},
-	url = {https://web.archive.org/web/20190919100713/https://www.bmwi.de/Redaktion/DE/Downloads/S-T/standardisierungsstrategie.pdf?__blob=publicationFile&v=4},
-	urldate = {2019-09-19},
-	year = {2019}
-}
-
-@online{bsi-tr-03109,
-	author = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	booktitle = {Technische Richtlinie BSI TR-03109},
-	month = nov,
-	organization = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	title = {Technische Richtlinie BSI TR-03109},
-	url = {https://web.archive.org/web/20190919102010/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR03109.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=3},
-	urldate = 2019-09-19,
-	year = {2015}
-}
-
-@online{bsi-tr-03109-1,
-	author = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	booktitle = {Technische Richtlinie BSI TR-03109},
-	month = jan,
-	number = {v1.0.1},
-	organization = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	title = {TR-03109-1: Anforderungen an die Interoperabilit{\"a}t der Kommunikationseinheit eines intelligenten Messsystems},
-	url = {https://web.archive.org/web/20190919102217/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR03109-1.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=3},
-	urldate = 2019-09-19,
-	year = {2019}
-}
-
-@online{bsi-tr-03109-6,
-	author = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	booktitle = {Technische Richtlinie BSI TR-03109},
-	month = nov,
-	number = {v1.0},
-	organization = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	title = {TR-03109-6: Smart Meter Gateway Administration},
-	url = {https://web.archive.org/web/20190919102651/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-6-Smart_Meter_Gateway_Administration.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=4},
-	urldate = 2019-09-19,
-	year = {2015}
-}
-
-@online{bsi-tr-03109-4,
-	author = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	booktitle = {Technische Richtlinie BSI TR-03109},
-	month = aug,
-	number = {v1.2.1},
-	organization = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	title = {TR-03109-4: Public Key Infrastruktur f{\"u}r Smart Meter Gateways},
-	url = {https://web.archive.org/web/20190919102649/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-4_PKI.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=3},
-	urldate = 2019-09-19,
-	year = {2017}
-}
-
-@online{bsi-tr-03109-2,
-	author = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	booktitle = {Technische Richtlinie BSI TR-03109},
-	month = dec,
-	number = {v1.1},
-	organization = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	title = {TR-03109-2: Smart Meter Gateway - Anforderungen an die Funktionalit{\"a}t und Interoperabilit{\"a}t des Sicherheitsmoduls},
-	url = {https://web.archive.org/web/20190919102644/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-2-Anforderungen_an_die_Funktionalitaet.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=3},
-	urldate = 2019-09-19,
-	year = {2014}
-}
-
-@online{bsi-tr-03109-3,
-	author = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	booktitle = {Technische Richtlinie BSI TR-03109},
-	month = apr,
-	organization = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	title = {TR-03109-3: Kryptographische Vorgaben f{\"u}r die Infrastruktur von intelligenten Messsystemen},
-	url = {https://web.archive.org/web/20190919102648/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-3_Kryptographische_Vorgaben.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=1},
-	urldate = 2019-09-19,
-	year = {2014}
-}
-
-@online{bsi-tr-03109-1-I,
-	author = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	booktitle = {Technische Richtlinie BSI TR-03109},
-	edition = {v1.0},
-	month = mar,
-	organization = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	title = {TR-03109-1 Anlage I: CMS-Datenformat f{\"u}r die Inhaltsdatenverschl{\"u}sselung und -signatur},
-	url = {https://web.archive.org/web/20190919104234/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-1\_Anlage\_CMS.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2\_cid351?\_\_blob=publicationFile\&v=2},
-	urldate = 2019-09-19,
-	year = {2013}
-}
-
-@online{bsi-tr-03109-1-II,
-	author = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	booktitle = {Technische Richtlinie BSI TR-03109},
-	edition = {v1.0},
-	month = mar,
-	organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},
-	title = {TR-03109-1 Anlage II: COSEM/HTTP Webservices},
-	url = {https://web.archive.org/web/20190919104234/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-1\_Anlage\_CMS.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2\_cid351?\_\_blob=publicationFile\&v=2},
-	urldate = 2019-09-19,
-	year = {2012}
-}
-
-@online{bsi-tr-03109-1-IIIb,
-	author = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	booktitle = {Technische Richtlinie BSI TR-03109},
-	edition = {v1.0},
-	month = mar,
-	organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},
-	title = {TR-03109-1 Anlage III: Feinspezifikation "Drahtlose LMN-Schnittstelle" Teil b: "OMS Technical Report Security"},
-	url = {https://web.archive.org/web/20190919110101/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-1_Anlage_Feinspezifikation_Drahtlose_LMN-Schnittstelle-Teil2.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=2},
-	urldate = 2019-09-19,
-	year = {2013}
-}
-
-@online{bsi-tr-03109-1-IIIa,
-	author = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	booktitle = {Technische Richtlinie BSI TR-03109},
-	edition = {v1.0},
-	month = mar,
-	organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},
-	title = {TR-03109-1 Anlage III: Feinspezifikation "Drahtlose LMN-Schnittstelle" Teil a: "OMS Specification Volume 2, Primary Communication"},
-	url = {https://web.archive.org/web/20190919110054/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-1_Anlage_Feinspezifikation_Drahtlose_LMN-Schnittstelle.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=2},
-	urldate = 2019-09-19,
-	year = {2013}
-}
-
-@online{bsi-tr-03109-1-IVa,
-	author = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	booktitle = {Technische Richtlinie BSI TR-03109},
-	edition = {v1.0},
-	month = mar,
-	organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},
-	title = {TR-03109-1 Anlage IV: Feinspezifikation "Drahtgebundene LMN-Schnittstelle" Teil a: "HDLC f{\"u}r LMN"},
-	url = {https://web.archive.org/web/20190919110101/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-1_Anlage_Feinspezifikation_Drahtlose_LMN-Schnittstelle-Teil2.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=2},
-	urldate = 2019-09-19,
-	year = {2013}
-}
-
-@online{bsi-tr-03109-1-IVb,
-	author = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	booktitle = {Technische Richtlinie BSI TR-03109},
-	edition = {v1.0},
-	month = mar,
-	organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},
-	title = {TR-03109-1 Anlage IV: Feinspezifikation "Drahtgebundene LMN-Schnittstelle" Teil b: "SML Smart Message Language"},
-	url = {https://web.archive.org/web/20190919110756/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-1\_Anlage\_Feinspezifikation\_Drahtgebundene\_LMN-Schnittstelle\_Teilb.pdf jsessionid=BD197BE4CB44C76EE7945640B8703844.2\_cid351?\_\_blob=publicationFile\&v=2},
-	urldate = 2019-09-19,
-	year = {2013}
-}
-
-@online{bsi-tr-03109-1-VI,
-	author = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	booktitle = {Technische Richtlinie BSI TR-03109},
-	edition = {v1.0},
-	month = mar,
-	organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},
-	title = {TR-03109-1 Anlage VI: Betriebsprozesse},
-	url = {https://web.archive.org/web/20190919111203/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-1_Anlage_Betriebsprozesse.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=1},
-	urldate = 2019-09-19,
-	year = {2013}
-}
-
-@online{bsi-tr-03109-1-VII,
-	author = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	booktitle = {Technische Richtlinie BSI TR-03109},
-	edition = {v1.0},
-	month = jan,
-	organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},
-	title = {TR-03109-1 Anlage VII: Interoperabilit{\"a}tsmodell und Ger{\"a}teprofile f{\"u}r Smart-Meter- Gateways},
-	url = {https://web.archive.org/web/20190919111350/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-1_Anlage_Interop-Modell-Geraeteprofile.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=2},
-	urldate = 2019-09-19,
-	year = {2019}
-}
-
-@online{bsi-tr-03109-2-a,
-	author = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	booktitle = {Technische Richtlinie BSI TR-03109},
-	edition = {v1.1},
-	month = dec,
-	organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},
-	title = {TR-03109-2 Anhang A: Smart Meter Gateway Sicherheitsmodul Use Cases},
-	url = {https://web.archive.org/web/20190919111540/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-2-Sicherheitsmodul_Use_Cases.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=2},
-	urldate = 2019-09-19,
-	year = {2014}
-}
-
-@online{bsi-tr-03109-2-b,
-	author = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	booktitle = {Technische Richtlinie BSI TR-03109},
-	edition = {v1.0},
-	month = jun,
-	organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},
-	title = {TR-03109-2 Anhang B: Smart Meter Mini-HSM Anforderungen an die Funktionalit{\"a}t und Interoperabilit{\"a}t des Sicherheitsmoduls},
-	url = {https://web.archive.org/web/20190919111832/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-2_Anhang_B_Smart_Meter_Mini_HSM.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=3},
-	urldate = 2019-09-19,
-	year = {2017}
-}
-
-@online{bsi-tr-03116-3,
-	author = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	booktitle = {Technische Richtlinie BSI TR-03116 Kryptographische Vorgaben f{\"u}r Projekte der Bundesregierung},
-	month = jan,
-	organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},
-	title = {TR-03116-3: Intelligente Messsysteme},
-	url = {https://web.archive.org/web/20190919112052/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03116/BSI-TR-03116-3.pdf; jsessionid=CB56FC0D3137C5624CA697AB9E57671F.1_cid360?__blob=publicationFile&v=9},
-	urldate = 2019-09-19,
-	year = {2019}
-}
-
-@online{bsi-tr-03109-ts-1,
-	author = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	booktitle = {Technische Richtlinie BSI TR-03109},
-	edition = {00.91},
-	month = jan,
-	organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},
-	title = {TR-03109-TS-1: Testkonzept zu BSI TR-03109-1},
-	url = {https://web.archive.org/web/20190919112310/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-TS-1_Testkonzept.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=1},
-	urldate = 2019-09-19,
-	year = {2015}
-}
-
-@online{bsi-tr-pruefstellen,
-	author = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	edition = {v1.5},
-	month = jan,
-	organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},
-	title = {TR-Pr{\"u}fstellen: Anforderungen an Antragsteller zur Anerkennung als Pr{\"u}fstelle im Bereich Technischer Richtlinien},
-	url = {https://web.archive.org/web/20190919112552/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Zertifizierung/TR-Pruefstellen.pdf; jsessionid=A6B4CB8AD2C038741C656276CE874B61.2_cid369?__blob=publicationFile&v=10},
-	urldate = 2019-09-19,
-	year = {2019}
-}
+

+@Online{bmwi1,

+  author    = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik} and {Bundesministerium f{\"u}r Wirtschaft und Energie}},

+  title     = {Standardisierungsstrategie zur sektor{\"u}bergreifenden Digitalisierung nach dem Gesetz zur Digitalisierung der Energiewende},

+  url       = {https://web.archive.org/web/20190919100713/https://www.bmwi.de/Redaktion/DE/Downloads/S-T/standardisierungsstrategie.pdf},

+  urldate   = {2019-09-19},

+  month     = jan,

+  publisher = {Bundesministerium f{\"u}r Wirtschaft und Energie},

+  year      = {2019},

+}

+

+@Misc{bsi-tr-03109,

+  author       = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  title        = {Technische Richtlinie BSI TR-03109},

+  organization = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  url          = {https://web.archive.org/web/20190919102010/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR03109.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=3},

+  urldate      = {2019-09-19},

+  booktitle    = {Technische Richtlinie BSI TR-03109},

+  month        = nov,

+  year         = {2015},

+}

+

+@Misc{bsi-tr-03109-1,

+  author       = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  title        = {TR-03109-1: Anforderungen an die Interoperabilit{\"a}t der Kommunikationseinheit eines intelligenten Messsystems},

+  organization = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  url          = {https://web.archive.org/web/20190919102217/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR03109-1.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=3},

+  urldate      = {2019-09-19},

+  booktitle    = {Technische Richtlinie BSI TR-03109},

+  month        = jan,

+  number       = {v1.0.1},

+  year         = {2019},

+}

+

+@Misc{bsi-tr-03109-6,

+  author       = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  title        = {TR-03109-6: Smart Meter Gateway Administration},

+  organization = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  url          = {https://web.archive.org/web/20190919102651/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-6-Smart_Meter_Gateway_Administration.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=4},

+  urldate      = {2019-09-19},

+  booktitle    = {Technische Richtlinie BSI TR-03109},

+  month        = nov,

+  number       = {v1.0},

+  year         = {2015},

+}

+

+@Misc{bsi-tr-03109-4,

+  author       = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  title        = {TR-03109-4: Public Key Infrastruktur f{\"u}r Smart Meter Gateways},

+  organization = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  url          = {https://web.archive.org/web/20190919102649/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-4_PKI.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=3},

+  urldate      = {2019-09-19},

+  booktitle    = {Technische Richtlinie BSI TR-03109},

+  month        = aug,

+  number       = {v1.2.1},

+  year         = {2017},

+}

+

+@Misc{bsi-tr-03109-2,

+  author       = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  title        = {TR-03109-2: Smart Meter Gateway - Anforderungen an die Funktionalit{\"a}t und Interoperabilit{\"a}t des Sicherheitsmoduls},

+  organization = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  url          = {https://web.archive.org/web/20190919102644/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-2-Anforderungen_an_die_Funktionalitaet.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=3},

+  urldate      = {2019-09-19},

+  booktitle    = {Technische Richtlinie BSI TR-03109},

+  month        = dec,

+  number       = {v1.1},

+  year         = {2014},

+}

+

+@Misc{bsi-tr-03109-3,

+  author       = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  title        = {TR-03109-3: Kryptographische Vorgaben f{\"u}r die Infrastruktur von intelligenten Messsystemen},

+  organization = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  url          = {https://web.archive.org/web/20190919102648/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-3_Kryptographische_Vorgaben.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=1},

+  urldate      = {2019-09-19},

+  booktitle    = {Technische Richtlinie BSI TR-03109},

+  month        = apr,

+  year         = {2014},

+}

+

+@Misc{bsi-tr-03109-1-I,

+  author       = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  title        = {TR-03109-1 Anlage I: CMS-Datenformat f{\"u}r die Inhaltsdatenverschl{\"u}sselung und -signatur},

+  organization = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  url          = {https://web.archive.org/web/20190919104234/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-1\_Anlage\_CMS.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2\_cid351?\_\_blob=publicationFile\&v=2},

+  urldate      = {2019-09-19},

+  booktitle    = {Technische Richtlinie BSI TR-03109},

+  edition      = {v1.0},

+  month        = mar,

+  year         = {2013},

+}

+

+@Misc{bsi-tr-03109-1-II,

+  author       = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  title        = {TR-03109-1 Anlage II: COSEM/HTTP Webservices},

+  organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},

+  url          = {https://web.archive.org/web/20190919104234/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-1\_Anlage\_CMS.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2\_cid351?\_\_blob=publicationFile\&v=2},

+  urldate      = {2019-09-19},

+  booktitle    = {Technische Richtlinie BSI TR-03109},

+  edition      = {v1.0},

+  month        = mar,

+  year         = {2012},

+}

+

+@Misc{bsi-tr-03109-1-IIIb,

+  author       = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  title        = {TR-03109-1 Anlage III: Feinspezifikation "Drahtlose LMN-Schnittstelle" Teil b: "OMS Technical Report Security"},

+  organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},

+  url          = {https://web.archive.org/web/20190919110101/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-1_Anlage_Feinspezifikation_Drahtlose_LMN-Schnittstelle-Teil2.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=2},

+  urldate      = {2019-09-19},

+  booktitle    = {Technische Richtlinie BSI TR-03109},

+  edition      = {v1.0},

+  month        = mar,

+  year         = {2013},

+}

+

+@Misc{bsi-tr-03109-1-IIIa,

+  author       = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  title        = {TR-03109-1 Anlage III: Feinspezifikation "Drahtlose LMN-Schnittstelle" Teil a: "OMS Specification Volume 2, Primary Communication"},

+  organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},

+  url          = {https://web.archive.org/web/20190919110054/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-1_Anlage_Feinspezifikation_Drahtlose_LMN-Schnittstelle.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=2},

+  urldate      = {2019-09-19},

+  booktitle    = {Technische Richtlinie BSI TR-03109},

+  edition      = {v1.0},

+  month        = mar,

+  year         = {2013},

+}

+

+@Misc{bsi-tr-03109-1-IVa,

+  author       = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  title        = {TR-03109-1 Anlage IV: Feinspezifikation "Drahtgebundene LMN-Schnittstelle" Teil a: "HDLC f{\"u}r LMN"},

+  organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},

+  url          = {https://web.archive.org/web/20190919110101/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-1_Anlage_Feinspezifikation_Drahtlose_LMN-Schnittstelle-Teil2.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=2},

+  urldate      = {2019-09-19},

+  booktitle    = {Technische Richtlinie BSI TR-03109},

+  edition      = {v1.0},

+  month        = mar,

+  year         = {2013},

+}

+

+@Misc{bsi-tr-03109-1-IVb,

+  author       = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  title        = {TR-03109-1 Anlage IV: Feinspezifikation "Drahtgebundene LMN-Schnittstelle" Teil b: "SML Smart Message Language"},

+  organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},

+  url          = {https://web.archive.org/web/20190919110756/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-1\_Anlage\_Feinspezifikation\_Drahtgebundene\_LMN-Schnittstelle\_Teilb.pdf jsessionid=BD197BE4CB44C76EE7945640B8703844.2\_cid351?\_\_blob=publicationFile\&v=2},

+  urldate      = {2019-09-19},

+  booktitle    = {Technische Richtlinie BSI TR-03109},

+  edition      = {v1.0},

+  month        = mar,

+  year         = {2013},

+}

+

+@Misc{bsi-tr-03109-1-VI,

+  author       = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  title        = {TR-03109-1 Anlage VI: Betriebsprozesse},

+  organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},

+  url          = {https://web.archive.org/web/20190919111203/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-1_Anlage_Betriebsprozesse.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=1},

+  urldate      = {2019-09-19},

+  booktitle    = {Technische Richtlinie BSI TR-03109},

+  edition      = {v1.0},

+  month        = mar,

+  year         = {2013},

+}

+

+@Misc{bsi-tr-03109-1-VII,

+  author       = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  title        = {TR-03109-1 Anlage VII: Interoperabilit{\"a}tsmodell und Ger{\"a}teprofile f{\"u}r Smart-Meter- Gateways},

+  organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},

+  url          = {https://web.archive.org/web/20190919111350/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-1_Anlage_Interop-Modell-Geraeteprofile.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=2},

+  urldate      = {2019-09-19},

+  booktitle    = {Technische Richtlinie BSI TR-03109},

+  edition      = {v1.0},

+  month        = jan,

+  year         = {2019},

+}

+

+@MvBook{bsi-tr-03109-2-a,

+  author       = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  title        = {TR-03109-2 Anhang A: Smart Meter Gateway Sicherheitsmodul Use Cases},

+  edition      = {v1.1},

+  url          = {https://web.archive.org/web/20190919111540/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-2-Sicherheitsmodul_Use_Cases.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=2},

+  urldate      = {2019-09-19},

+  booktitle    = {Technische Richtlinie BSI TR-03109},

+  month        = dec,

+  organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},

+  year         = {2014},

+}

+

+@Misc{bsi-tr-03109-2-b,

+  author       = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  title        = {TR-03109-2 Anhang B: Smart Meter Mini-HSM Anforderungen an die Funktionalit{\"a}t und Interoperabilit{\"a}t des Sicherheitsmoduls},

+  organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},

+  url          = {https://web.archive.org/web/20190919111832/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-2_Anhang_B_Smart_Meter_Mini_HSM.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=3},

+  urldate      = {2019-09-19},

+  booktitle    = {Technische Richtlinie BSI TR-03109},

+  edition      = {v1.0},

+  month        = jun,

+  year         = {2017},

+}

+

+@Misc{bsi-tr-03116-3,

+  author       = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  title        = {TR-03116-3: Intelligente Messsysteme},

+  organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},

+  url          = {https://web.archive.org/web/20190919112052/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03116/BSI-TR-03116-3.pdf; jsessionid=CB56FC0D3137C5624CA697AB9E57671F.1_cid360?__blob=publicationFile&v=9},

+  urldate      = {2019-09-19},

+  booktitle    = {Technische Richtlinie BSI TR-03116 Kryptographische Vorgaben f{\"u}r Projekte der Bundesregierung},

+  month        = jan,

+  year         = {2019},

+}

+

+@Misc{bsi-tr-03109-ts-1,

+  author       = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  title        = {TR-03109-TS-1: Testkonzept zu BSI TR-03109-1},

+  organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},

+  url          = {https://web.archive.org/web/20190919112310/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Publikationen/TechnischeRichtlinien/TR03109/TR-03109-TS-1_Testkonzept.pdf; jsessionid=BD197BE4CB44C76EE7945640B8703844.2_cid351?__blob=publicationFile&v=1},

+  urldate      = {2019-09-19},

+  booktitle    = {Technische Richtlinie BSI TR-03109},

+  edition      = {00.91},

+  month        = jan,

+  year         = {2015},

+}

+

+@Misc{bsi-tr-pruefstellen,

+  author       = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  title        = {TR-Pr{\"u}fstellen: Anforderungen an Antragsteller zur Anerkennung als Pr{\"u}fstelle im Bereich Technischer Richtlinien},

+  organization = {Bundesamt f{\"u}r Sicherheit in der Informationstechnik},

+  url          = {https://web.archive.org/web/20190919112552/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Zertifizierung/TR-Pruefstellen.pdf; jsessionid=A6B4CB8AD2C038741C656276CE874B61.2_cid369?__blob=publicationFile&v=10},

+  urldate      = {2019-09-19},

+  edition      = {v1.5},

+  month        = jan,

+  year         = {2019},

+}

 
 @article{mo01,
 	author = {Yilin Mo and Tiffany Hyun-Jin Kim and Kenneth Brancik and Dona Dickinson and Heejo Lee and Adrian Perrig and Bruno Sinopoli},
@@ -441,33 +441,33 @@
 	x-color = {#7a783b},
 	year = {2015}
 }
-
-@techreport{bsi01,
-	author = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	edition = {v1.0},
-	month = jan,
-	organization = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},
-	title = {Marktanalyse zur Feststellung der technischen M{\"o}glichkeit zum Einbau intelligenter Messsysteme nach {\S} 30 MsbG},
-	url = {https://web.archive.org/web/20190919124052/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/SmartMeter/Marktanalysen/Marktanalyse_nach_Para_30_MsbG.pdf?__blob=publicationFile&v=8},
-	urldate = 2019-09-19,
-	x-color = {#009966},
-	year = {2019}
-}
-
-@inproceedings{czechowski01,
-	author = {R. {Czechowski} and A. M. {Kosek}},
-	booktitle = {2016 Joint Workshop on Cyber- Physical Security and Resilience in Smart Grids (CPSR-SG)},
-	doi = {10.1109/CPSRSG.2016.7684098},
-	issn = {},
-	keywords = {power consumption; power engineering computing; power system measurement; power system security; security of data; smart meters; energy theft techniques; power energy consumption; electric energy distribution; electricity theft detection; energy consumers; cyber security; smart metering; low voltage network; Energy consumption; Security; Energy measurement; Companies; Power systems; Wheels; Smart Grid; energy theft; cyber-physical security; digital data flow; energy hacking},
-	month = {April},
-	organization = {IEEE},
-	pages = {1--7},
-	title = {The most frequent energy theft techniques and hazards in present power energy consumption},
-	url = {https://project-sparks.eu/wp-content/uploads/2016/04/czechowski-cpsr-sg-paper-four.pdf},
-	x-color = {#009966},
-	year = {2016}
-}
+

+@Online{bsi01,

+  author       = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  title        = {Marktanalyse zur Feststellung der technischen M{\"o}glichkeit zum Einbau intelligenter Messsysteme nach {\S} 30 MsbG},

+  url          = {https://web.archive.org/web/20190919124052/https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/SmartMeter/Marktanalysen/Marktanalyse_nach_Para_30_MsbG.pdf?__blob=publicationFile&v=8},

+  organization = {{Bundesamt f{\"u}r Sicherheit in der Informationstechnik}},

+  urldate      = {2019-09-19},

+  edition      = {v1.0},

+  month        = jan,

+  x-color      = {#009966},

+  year         = {2019},

+}

+

+@InProceedings{czechowski01,

+  author       = {R. {Czechowski} and A. M. {Kosek}},

+  booktitle    = {2016 Joint Workshop on Cyber- Physical Security and Resilience in Smart Grids (CPSR-SG)},

+  date         = {2016},

+  title        = {The most frequent energy theft techniques and hazards in present power energy consumption},

+  doi          = {10.1109/CPSRSG.2016.7684098},

+  organization = {IEEE},

+  pages        = {1--7},

+  url          = {https://project-sparks.eu/wp-content/uploads/2016/04/czechowski-cpsr-sg-paper-four.pdf},

+  keywords     = {power consumption; power engineering computing; power system measurement; power system security; security of data; smart meters; energy theft techniques; power energy consumption; electric energy distribution; electricity theft detection; energy consumers; cyber security; smart metering; low voltage network; Energy consumption; Security; Energy measurement; Companies; Power systems; Wheels; Smart Grid; energy theft; cyber-physical security; digital data flow; energy hacking},

+  month        = {April},

+  x-color      = {#009966},

+  year         = {2016},

+}

 
 @datasheet{st-db3636,
 	author = {{ST Microelectronics}},
@@ -481,16 +481,17 @@
 	x-color = {#009966},
 	year = {2018}
 }
-
-@slides{dalheimer01,
-	author = {Mathias Dalheimer},
-	eventtitle = {Gulaschprogrammiernacht 2014},
-	title = {Smartin Meter-Einf{\"u}hrung Deutschland},
-	url = {https://entropia.de/images/2/2c/GPN14-SmartMeterEinf%C3%BChrung.pdf}
-}
+

+@Online{dalheimer01,

+  author     = {Mathias Dalheimer},

+  date       = {2014},

+  title      = {Smart Meter-Einf{\"u}hrung Deutschland},

+  url        = {https://entropia.de/images/2/2c/GPN14-SmartMeterEinf%C3%BChrung.pdf},

+  eventtitle = {Gulaschprogrammiernacht 2014},

+}

 

 @Online{heise01,

-  author = {Heise Medien},

+  author = {Leo Becker},

   editor = {{Heise Online}},

   date   = {2019-09-27},

   title  = {checkm8: Boot-Exploit soll neuere iPhones knacken},

@@ -542,15 +543,16 @@
 	volume = {4},
 	year = {1982}
 }
-
-@incollection{blaze01,
-	author = {Matt Blaze and Joan Feigenbaum and John Ioannidis and Angelos D Keromytis},
-	booktitle = {Secure Internet Programming},
-	pages = {185--210},
-	publisher = {Springer},
-	title = {The role of trust management in distributed systems security},
-	year = {1999}
-}
+

+@InCollection{blaze01,

+  author    = {Matt Blaze and Joan Feigenbaum and John Ioannidis and Angelos D Keromytis},

+  booktitle = {Secure Internet Programming},

+  date      = {1999},

+  title     = {The role of trust management in distributed systems security},

+  pages     = {185--210},

+  publisher = {Springer},

+  year      = {1999},

+}

 
 @article{lee01,
 	author = {Robert M. Lee and Michael J. Assante and Tim Conway},
@@ -722,7 +724,7 @@
   url          = {https://www.researchgate.net/profile/Inigo_Berganza/publication/224236306_Evolution_of_powerline_communications_for_smart_distribution_From_ripple_control_to_OFDM/links/5c658800299bf1d14cc74cbd/Evolution-of-powerline-communications-for-smart-distribution-From-ripple-control-to-OFDM.pdf},

 }

 

-@WWW{hovi01,

+@Online{hovi01,

   author       = {Jochen Fritz and Alexander Hovi},

   date         = {2020},

   title        = {Transkommando-System},

@@ -761,6 +763,7 @@
 @InProceedings{buchmann01,

   author       = {Buchmann, Johannes and Dahmen, Erik and Ereth, Sarah and H{\"u}lsing, Andreas and R{\"u}ckert, Markus},

   booktitle    = {International Conference on Cryptology in Africa},

+  date         = {2011},

   title        = {On the security of the Winternitz one-time signature scheme},

   organization = {Springer},

   pages        = {363--378},

@@ -776,12 +779,17 @@
   year         = {1989},

 }

 

-@InProceedings{dods01,

+@InBook{dods01,

   author       = {Dods, Chris and Smart, Nigel P and Stam, Martijn},

-  booktitle    = {IMA International Conference on Cryptography and Coding},

+  booktitle    = {Post-Quantum Cryptography},

+  date         = {2009},

   title        = {Hash based digital signature schemes},

-  organization = {Springer},

+  doi          = {https://doi.org/10.1007/978-3-540-88702-7_3},

+  editor       = {Bernstein, D. J. and Buchmann, J. and Dahmen, E.},

+  isbn         = {978-3-540-88701-0},

   pages        = {96--115},

+  publisher    = {Springer},

+  organization = {Springer},

   year         = {2005},

 }

 

@@ -936,7 +944,7 @@
 @TechReport{ayoub01,

   author      = {Mohammed W. Ayoub and Francis V. P. Robinson},

   date        = {2013},

-  institution = {Dubai Aluminium},

+  institution = {{Dubai Aluminium}},

   title       = {A comparative study between diode and thyristor based AC to DC converters for aluminium smelting process},

   doi         = {https://doi.org/10.1109/IEEEGCC.2013.6705851},

   url         = {https://purehost.bath.ac.uk/ws/files/134381670/a_comparative_study_between_diode_and_thyristor_based_AC_to_DC_converters_for_aluminium_smelting_process.pdf},

@@ -956,7 +964,7 @@
   title       = {Application Note 200-2: Fundamentals of Quartz Oscillators},

 }

 

-@WWW{netze01,

+@Online{netze01,

   author       = {Adrian Cramer},

   date         = {2015},

   title        = {Bedienhandbuch "Smart Meter"},

@@ -972,11 +980,11 @@
   publisher = {De Gruyter},

 }

 

-@TechReport{bmwe01,

+@Online{bmwe01,

   date        = {2019},

-  institution = {Bundesministeriums f{\"u}r Wirtschaft und Energie},

   title       = {Gutachten Digitalisierung der Energiewende},

   url         = {https://www.bmwi.de/Redaktion/DE/Publikationen/Studien/digitalisierung-der-energiewende-thema-1.pdf?__blob=publicationFile&v=4},

+  institution = {Bundesministeriums f{\"u}r Wirtschaft und Energie},

 }

 

 @Misc{easymeter01,

@@ -992,7 +1000,7 @@
   url    = {https://www.elstersolutions.com/assets/products/products_elster_files/SEADSNAEN001017REX2.pdf},

 }

 

-@WWW{ifixit01,

+@Online{ifixit01,

   author       = {Miro Djuric},

   date         = {2011},

   title        = {Elster REX2 Smart Meter Teardown},

@@ -1009,7 +1017,7 @@
   type        = {resreport},

 }

 

-@WWW{destatis01,

+@Online{destatis01,

   editor  = {Statistisches Bundesamt DeStatis},

   date    = {2020-03-06},

   title   = {Erzeugung - Bilanz - Monatsbericht über die Elektrizitätsversorgung},

@@ -1050,14 +1058,14 @@
   year   = {1997},

 }

 

-@WWW{kamstrup01,

+@Online{kamstrup01,

   author  = {{Kamstrup A/S}},

   title   = {STS prepayment meter},

   url     = {https://www.kamstrup.com/en-en/electricity-solutions/smart-electricity-meters/sts-prepayment-meter},

   urldate = {2020-05-11},

 }

 

-@Unpublished{itron01,

+@Online{itron01,

   author  = {{Itron Inc}},

   date    = {2012},

   title   = {Benutzerhandbuch Smart Meter EM 214},

@@ -1065,7 +1073,7 @@
   urldate = {2020-05-11},

 }

 

-@Unpublished{hager01,

+@Online{hager01,

   author  = {{Hager Group}},

   date    = {2017},

   title   = {Hager Smart Meter EHZ363 Betriebsanleitung},

@@ -1090,11 +1098,11 @@
   issue        = {12},

 }

 

-@TechReport{bmwi03,

+@Online{bmwi03,

   author  = {{Bundesministerium f{\"u}r Wirtschaft und Energie} and {Ernst and Young}},

   date    = {2013},

   title   = {Kosten-Nutzen-Analyse für einen flächendeckenden Einsatz intelligenter Zähler},

-  url     = {https://www.bmwi.de/Redaktion/DE/Publikationen/Studien/kosten-nutzen-analyse-fuer-flaechendeckenden-einsatz-intelligenterzaehler.pdf?__blob=publicationFile&v=5},

+  url     = {https://www.bmwi.de/Redaktion/DE/Publikationen/Studien/kosten-nutzen-analyse-fuer-flaechendeckenden-einsatz-intelligenterzaehler.pdf},

   urldate = {2020-05-12},

 }

 

@@ -1151,8 +1159,8 @@
   year         = {2015},

 }

 

-@WWW{silabs01,

-  author = {Vivek Mohan, {Silicon Labs}},

+@Online{silabs01,

+  author = {Vivek Mohan and {Silicon Labs}},

   date   = {2015},

   title  = {An Introduction to Wireless M-Bus},

   url    = {http://pages.silabs.com/rs/634-SLU-379/images/introduction-to-wireless-mbus.pdf},

@@ -1193,7 +1201,7 @@
   year        = {2015},

 }

 

-@WWW{entsoe05,

+@Online{entsoe05,

   author  = {ENTSO-E},

   date    = {2019},

   title   = {ENTSO-E Initial Dynamic Model of Continental Europe},

@@ -1214,8 +1222,8 @@
   year      = {2019},

 }

 

-@WWW{kamstrup01,

-  author  = {Kamstrup A/S},

+@Online{kamstrup01,

+  author  = {{Kamstrup A/S}},

   date    = {2018},

   title   = {STS prepayment meter},

   url     = {https://www.kamstrup.com/en-en/electricity-solutions/smart-electricity-meters/sts-prepayment-meter},

@@ -1297,7 +1305,8 @@
   urldate     = {2020-05-18},

 }

 

-@WWW{delaw01,

+@Online{delaw01,

+  date    = {2019-03-14},

   title   = {Stromgrundversorgungsverordnung StromGVV § 19 Unterbrechung der Versorgung},

   url     = {http://www.gesetze-im-internet.de/stromgvv/__19.html},

   urldate = {2020-05-18},

@@ -1313,8 +1322,8 @@
   pages           = {269-293},

 }

 

-@WWW{ec04,

-  editor  = {The European Commission},

+@Online{ec04,

+  editor  = {{The European Commission}},

   date    = {2012},

   title   = {The Energy Efficiency Directive},

   url     = {https://ec.europa.eu/energy/topics/energy-efficiency/targets-directive-and-rules/energy-efficiency-directive_en},

@@ -1362,17 +1371,17 @@
   urldate   = {2020-05-18},

 }

 

-@Misc{abdallah01,

+@Book{abdallah01,

   author    = {Asmaa Abdallah},

-  editor    = {Xuemin Shen},

   title     = {Security and Privacy in Smart Grid},

-  url       = {http://dx.doi.org/10.1007/978-3-319-93677-2},

-  address   = {Cham},

+  editor    = {Xuemin Shen},

   isbn      = {9783319936772},

   pagetotal = {1 Online-Ressource (XIV, 126 p. 30 illus., 23 illus. in color)},

-  ppn_gvk   = {1028034970},

   publisher = {Springer International Publishing},

   series    = {SpringerBriefs in Electrical and Computer Engineering},

+  url       = {http://dx.doi.org/10.1007/978-3-319-93677-2},

+  address   = {Cham},

+  ppn_gvk   = {1028034970},

   year      = {2018},

 }

 

@@ -1429,7 +1438,7 @@
   title  = {The Age of Surveillance Capitalism},

 }

 

-@WWW{bmwi04,

+@Online{bmwi04,

   author  = {{Bundesministerium f{\"u}r Wirtschaft und Energie}},

   date    = {2020-04-14},

   title   = {Häufig gestellte Fragen rund um Smart Meter},

diff --git a/ma/safety_reset.tex b/ma/safety_reset.tex
index bb0d46d..544d095 100644
--- a/ma/safety_reset.tex
+++ b/ma/safety_reset.tex
@@ -6,7 +6,7 @@
     backend=biber,
     style=numeric,
     natbib=true,
-%    url=true, 
+    url=false, 
     doi=true,
     eprint=false
     ]{biblatex}
@@ -163,6 +163,8 @@ performance under real-world conditions. Based on these simulations we implement
 proposed safety reset controller as part of a realistic smart meter demonstrator. Finally we experimentally validate our
 results and give an outline of further steps towards practical implementation.
 
+\chapter{Fundamentals}
+
 \section{Structure and operation of the electrical grid}
 
 Since this thesis is filed under \emph{computer science} we will provide a very brief overview of some basic aspects of
@@ -803,10 +805,10 @@ Since thorough formal verification of code is not yet within reach for either la
 heavy in side-effects such as embedded firmware or industrial control software\cite{pariente01} the two most effective
 measures for embedded security is reducing the amount of code on one hand, and labour-intensively checking and
 double-checking this code on the other hand. A smart electricity manufacturer does not have a say in the former since it
-is bound by the official regulations it has to comply with, and will almost certainly not have sufficient
-resources for the latter. We are left with an impasse: Manufacturers in this field likely do not have the saftey
-resources to keep up with complex standards requirements. At the same time they have no option to reduce the scope of
-their implementation to alleviate the burden on firmware security.
+is bound by the official regulations it has to comply with, and will likely not have sufficient resources for the
+latter. We are left with an impasse: Manufacturers in this field likely do not have the saftey resources to keep up with
+complex standards requirements. At the same time they have no option to reduce the scope of their implementation to
+alleviate the burden on firmware security.
 
 \subsection{Attack avenues in the smart grid}
 
@@ -1091,7 +1093,7 @@ simple to reduce attack surface there.
 \subsection{Regulatory and economical constraints}
 %FIXME
 
-\subsection{Safety vs. Security: Opting for restoration instead of prevention}
+\subsection{Safety vs. security: Opting for restoration instead of prevention}
 
 By implementing our reset system as a physically separate microcontroller we sidestep most security issues around the
 main application microcontroller.  There are some simple measures that can be taken to harden this firmware.
@@ -1573,7 +1575,7 @@ corresponding key must not be re-used for other signatures. This is intutively c
 part of the private key as the signature, and if we were to publish a signature for another message an attacker could
 derive additional signatures by ``mixing'' the two published signatures.
 
-\subsubsection{Winternitz Signatures}
+\subsubsection{Winternitz signatures}
 
 An improvement to basic Lamport signatures as described above are Winternitz signatures as detailed in
 \textcite{merkle01} and \textcite{dods01}. Winternitz signatures reduce public key length as well as signature length
@@ -1640,7 +1642,7 @@ amplitude as well as parameters of our modulation scheme we need a frequency spe
 (that is $\mathcal F\left(f(V(t))\right)$: Taking mains frequency $f(x)$ as a variable, the frequency spectrum of that
 variable, as opposed to the frequency spectrum of mains voltage $V(t)$ itself).
 
-\subsection{Grid Frequency Estimation}
+\subsection{Grid frequency estimation}
 \label{frequency_estimation}
 
 In commercial power systems Phasor Measurement Units (PMUs) are used to precisely measure parameters of a mains voltage
@@ -2559,43 +2561,43 @@ correctly configure than it is to simply use separate hardware and secure the in
 \includenotebook{Frequency sensor clock stability analysis}{gps_clock_jitter_analysis}
 \includenotebook{DSSS modulation experiments}{dsss_experiments-ber}
 
-\chapter{Frequency Sensor Schematics}
-\fancyhead[C]{Frequency Sensor Schematics (1/3)}
+\chapter{Frequency sensor schematics}
+\fancyhead[C]{Frequency sensor schematics (1/3)}
 \fancyfoot[C]{}
 \fancyhead[R]{\thepage}
 \includepdf[fitpaper,landscape,pagecommand={\thispagestyle{fancy}}]{resources/platform-export-pg1.pdf}
-\fancyhead[C]{Frequency Sensor Schematics (2/3)}
+\fancyhead[C]{Frequency sensor schematics (2/3)}
 \includepdf[fitpaper,pagecommand={\thispagestyle{fancy}}]{resources/platform-export-pg2.pdf}
-\fancyhead[C]{Frequency Sensor Schematics (3/3)}
+\fancyhead[C]{Frequency sensor schematics (3/3)}
 \includepdf[fitpaper,landscape,pagecommand={\thispagestyle{fancy}}]{resources/platform-export-pg3.pdf}
 \fancyfoot[C]{\thepage}
 
-\chapter{Firmware Source Code Excerpts}
+\chapter{Firmware source code excerpts}
 \section{DMA-backed ADC capture (adc.c)}
 \inputminted[fontsize=\footnotesize,linenos,firstline=18,lastline=115,breaklines]{C}{../gm_platform/fw/adc.c}
 
-\section{Frequency Sensor Packetized Serial Interface}
+\section{Frequency sensor packetized serial interface}
 \subsection{serial.c}
 \inputminted[fontsize=\footnotesize,linenos,breaklines]{C}{../gm_platform/fw/serial.c}
 \subsection{packet\_interface.c}
 \inputminted[fontsize=\footnotesize,linenos,breaklines]{C}{../gm_platform/fw/packet_interface.c}
 \subsection{cobs.c}
 \inputminted[fontsize=\footnotesize,linenos,breaklines]{C}{../gm_platform/fw/cobs.c}
-\subsection{Client application (tw\_test.py)}
+\subsection{Host data logging utility (tw\_test.py)}
 \inputminted[fontsize=\footnotesize,linenos,breaklines]{python}{../gm_platform/fw/tw_test.py}
 
-\section{Frequency Estimation (freq\_meas.c)}
+\section{Frequency estimation (freq\_meas.c)}
 \inputminted[fontsize=\footnotesize,linenos,breaklines]{C}{../controller/fw/src/freq_meas.c}
-\section{DSSS Demodulation (dsss\_demod.c)}
+\section{DSSS demodulation (dsss\_demod.c)}
 \inputminted[fontsize=\footnotesize,linenos,breaklines]{C}{../controller/fw/src/dsss_demod.c}
-\section{Cryptographic Protocol Handling}
+\section{Cryptographic protocol handling}
 \subsection{protocol.c}
 \inputminted[fontsize=\footnotesize,linenos,breaklines]{C}{../controller/fw/src/protocol.c}
 \subsection{crypto.c}
 \inputminted[fontsize=\footnotesize,linenos,breaklines]{C}{../controller/fw/src/crypto.c}
 
 
-\chapter{Demonstrator Firmware Symbol Size Map}
+\chapter{Demonstrator firmware symbol size map}
 \label{symbol_size_chart}
 \includepdf[fitpaper]{resources/safetyreset-symbol-sizes.pdf}