OpenSecEd · dbosk · Mar 19, 2020 · Mar 19, 2020 · Mar 19, 2020 · Mar 19, 2020
diff --git a/.gitmodules b/.gitmodules
@@ -31,7 +31,7 @@
 	url = https://github.com/OpenSecEd/trustcomp.git
 	branch = master
 [submodule "modules/fverif"]
-	path = modules/proto/proto
+	path = modules/proto/protocols
 	url = https://github.com/OpenSecEd/fverif.git
 	branch = master
 [submodule "modules/auth"]
@@ -59,9 +59,6 @@
 [submodule "bibedu"]
 	path = bibedu
 	url = https://github.com/dbosk/bibedu.git
-[submodule "modules/privacy"]
-	path = modules/privacy/privacy
-	url = https://github.com/OpenSecEd/privacy.git
 [submodule "modules/intro/ethics"]
 	path = modules/intro/ethics
 	url = https://github.com/OpenSecEd/ethics.git
diff --git a/bibedu b/bibedu
diff --git a/bibsp b/bibsp
diff --git a/makefiles b/makefiles
diff --git a/modules/ac/Makefile b/modules/ac/Makefile
@@ -9,7 +9,8 @@ PUB_GROUP?= 	svn
 .PHONY: all
 all: ${PUB_FILES}
 
-ac.html: video.html reading.html session.html
+#ac.html: video.html reading.html session.html
+ac.html: session.html
 	pandoc -s \
 		--metadata pagetitle="Access control" \
 		--metadata title="" \

diff --git a/modules/ac/ac b/modules/ac/ac
diff --git a/modules/ac/session.md b/modules/ac/session.md
@@ -1,9 +1,10 @@
-# Interactive learning session
-
 There is one interactive session for this module, see the [schedule][schedule] 
 for date and time.
-Watch the videos linked above before the session.
-During the session we will summarize (together) the most important parts, 
-discuss the most difficult/ambiguous/strange/counter-intuitive parts.
+Watch the videos in the [Access Control module][SL-ac] in ScalableLearning 
+before the session.
+There are also reading instructions in the [study guide][studyguide], Section 
+3.7.
 
-[schedule]: https://portal.miun.se/web/student/schedule
+[schedule]: https://miun.se/schema
+[studyguide]: https://ver.miun.se/courses/security/infosakc/studyguide.pdf
+[SL-ac]: https://www.scalable-learning.com/#/courses/3659/modules/16793/courseware
diff --git a/modules/accountability/Makefile b/modules/accountability/Makefile
@@ -10,7 +10,8 @@ PUB_GROUP?= 	svn
 all: ${PUB_FILES}
 
 
-accountability.html: video.html reading.html session.html
+#accountability.html: video.html reading.html session.html
+accountability.html: session.html
 	pandoc -s \
 		--metadata pagetitle="Accountability" \
 		--metadata title="" \
@@ -21,7 +22,6 @@ video.md: accountability/logging/README.md
 
 video.md:
 	${RM} $@
-	echo "# Non-interactive sessions\n" >> $@
 	for f in $^; do ${CAT} $$f >> $@; echo >> $@; done
 
 reading.html: reading.md accountability.bib
@@ -33,6 +33,7 @@ reading.html: reading.md accountability.bib
 #	${RM} $@
 #	for f in $^; do ${CAT} $$f >> $@; echo >> $@; done
 
+accountability.bib: bibliography.bib
 accountability.bib: accountability/book-keeping/book-keeping.bib
 accountability.bib: accountability/logging/logging.bib
 

diff --git a/modules/accountability/accountability b/modules/accountability/accountability
diff --git a/modules/accountability/accountability.tex b/modules/accountability/accountability.tex
@@ -1,9 +1,14 @@
+\emph{Summary:}
 The need for accountability has been apparent in civilisations for as long as 
 they have existed.
 One of today's institutions which is historically renowned for keeping strict 
 accounts is the state tax office, another is, of course, the banks.
 We will explore some principles in keeping accounts and discuss ways to 
 implement it in different, sometimes challenging, environments.
+We will also see how these principles are applied in \acp{DLT}, such as 
+Bitcoin.
+
+\emph{Intended learning outcomes:}
 In particular, the \acp{ILO} are that you are able to:
 \begin{itemize}
   \item \emph{evaluate} advantages and disadvantages of different levels of 
@@ -12,13 +17,19 @@
     in particular, with privacy considerations.
 \end{itemize}
 
+\emph{Reading:}
 Anderson describes accountability through his experience from banks in Chapter 
 10 \enquote{Banking and Bookkeeping} in 
 \citetitle{Anderson2008sea}~\cite{Anderson2008sea}.
+
 We will also use the secure logging system of 
 \citeauthor{schneier1999secure}~\cite{schneier1999secure} as an example of how 
 to achieve secure logging in a challenging environment.
 The construction described therein is a method to safely store audit logs in an 
 untrusted machine; in the scheme, all log entries generated prior to 
 a compromise will be impossible for the attacker to read, modify, or destroy 
 undetectably.
+The core principle is a blockchain.
+
+We will look into \acp{DLT} (blockchains).
+This is covered by \textcite[Sect.~3, 4]{NISTblockchainOverview}.
diff --git a/modules/accountability/bibliography.bib b/modules/accountability/bibliography.bib
@@ -0,0 +1,8 @@
+@techreport{NISTblockchainOverview,
+  author = {Dylan Yaga and Peter Mell and Nik Roby and Karen Scarfone},
+  title = {Blockchain Technology Overview},
+  institution = {NIST},
+  year = 2018,
+  month = 10,
+  url = {https://csrc.nist.gov/publications/detail/nistir/8202/final},
+}
diff --git a/modules/accountability/session.md b/modules/accountability/session.md
@@ -1,9 +1,10 @@
-# Interactive learning session
+There is one interactive session for this module (see the [schedule][schedule] 
+for date and time).
 
-There is one interactive session for this module, see the [schedule][schedule] 
-for date and time.
-Watch the videos linked above before the session.
-During the session we will summarize (together) the most important parts, 
-discuss the most difficult/ambiguous/strange/counter-intuitive parts.
+Watch the videos in the [Accountability module][SL-accountability] on Scalable 
+Learning before the session. You can find the reading material in Section 3.8 
+in the [study guide][studyguide].
 
 [schedule]: https://portal.miun.se/web/student/schedule
+[SL-accountability]: https://www.scalable-learning.com/#/courses/3659/modules/16794/courseware
+[studyguide]: https://ver.miun.se/courses/security/infosakc/studyguide.pdf
diff --git a/modules/auth/Makefile b/modules/auth/Makefile
@@ -11,7 +11,8 @@ PUB_GROUP?= 	svn
 all: ${PUB_FILES}
 
 
-auth.html: video.html reading.html session.html labs.html
+#auth.html: video.html reading.html session.html labs.html
+auth.html: session.html labs.html
 	pandoc -s \
 		--metadata pagetitle="Authentication" \
 		--metadata title="" \

diff --git a/modules/auth/auth b/modules/auth/auth
diff --git a/modules/auth/labs.md b/modules/auth/labs.md
@@ -1,9 +1,7 @@
-# Seminar/workshop sessions
-
 [Evaluating and designing authentication][pwdeval] is a lab/seminar which 
 focuses on evaluating the usability and security of common authentication 
 methods. It also looks towards better alternatives. This is spread over two 
 sessions. (See the [schedule][schedule] for date and time.)
 
 [pwdeval]: https://ver.miun.se/courses/security/infosakc/pwdeval.pdf
-[schedule]: https://portal.miun.se/web/student/schedule
+[schedule]: https://miun.se/schema
diff --git a/modules/auth/session.md b/modules/auth/session.md
@@ -1,10 +1,9 @@
-# Interactive learning session
-
 There is one interactive session for this module, see the [schedule][schedule] 
-for date and time.
-Watch the videos linked above before the session.
-During the session we will [summarize (together) the most important parts, 
-discuss the most difficult/ambiguous/strange/counter-intuitive 
-parts](https://ver.miun.se/courses/security/infosakc/auth-session.pdf).
+for date and time. Before that session, work through [this][SL-auth] module on
+ScalableLearning. There are also reading instructions in the [study 
+guide][studyguide] (Section 3.5).
+
+[schedule]: https://miun.se/schema
+[studyguide]: https://ver.miun.se/courses/security/infosakc/studyguide.pdf
+[SL-auth]: https://www.scalable-learning.com/#/courses/4573/modules/18022/courseware
 
-[schedule]: https://portal.miun.se/web/student/schedule
diff --git a/modules/conclusion/projects b/modules/conclusion/projects
diff --git a/modules/crypto/.gitignore b/modules/crypto/.gitignore
@@ -4,3 +4,12 @@ reading.html
 session.html
 video.html
 video.md
+
+crypto.pdf
+infotheory-applications.pdf
+one-way.pdf
+pub-key.pdf
+shannon-entropy.pdf
+shared-key.pdf
+sidechannels.pdf
+zkp-smc.pdf
diff --git a/modules/crypto/Makefile b/modules/crypto/Makefile
@@ -1,20 +1,47 @@
-PUB_FILES+= 	crypto.html
+PUB_FILES+= 	crypto.html ${SLIDES}
 
 PUB_SERVER?= 	ver.miun.se
 PUB_DIR?= 		/srv/web/svn/courses/security/infosakc
 PUB_USER?=
 PUB_GROUP?= 	svn
 
 
+SLIDES+=	shannon-entropy.pdf
+SLIDES+=	infotheory-applications.pdf
+SLIDES+=	crypto.pdf
+SLIDES+=	shared-key.pdf
+SLIDES+=	one-way.pdf
+SLIDES+=	pub-key.pdf
+SLIDES+=	zkp-smc.pdf
+SLIDES+=	sidechannels.pdf
+
+shannon-entropy.pdf: infotheory/shannon-entropy/shannon-entropy.pdf
+infotheory-applications.pdf: infotheory/applications/applications.pdf
+
+crypto.pdf: appliedcrypto/intro/intro-slides.pdf
+shared-key.pdf: appliedcrypto/shared-key/shared-key-slides.pdf
+one-way.pdf: appliedcrypto/one-way/one-way-slides.pdf
+pub-key.pdf: appliedcrypto/pub-key/pub-key-slides.pdf
+zkp-smc.pdf: appliedcrypto/zkp-smc/zkp-smc-slides.pdf
+sidechannels.pdf: appliedcrypto/sidechannels/sidechannels-slides.pdf
+
+${SLIDES}:
+	${LN} $< $@
+
+
 .PHONY: all
 all: ${PUB_FILES}
 
-crypto.html: video.html reading.html session.html
+#crypto.html: video.html reading.html session.html
+crypto.html: session.html
 	pandoc -s \
 		--metadata pagetitle="Crypto" \
 		--metadata title="" \
 		-o $@ $^
 
+session.html: session.md
+	${CONVERT.md.html}
+
 CRYPTO_MODULES+= appliedcrypto/intro
 CRYPTO_MODULES+= appliedcrypto/shared-key
 CRYPTO_MODULES+= appliedcrypto/one-way

diff --git a/modules/crypto/appliedcrypto b/modules/crypto/appliedcrypto
diff --git a/modules/crypto/session.md b/modules/crypto/session.md
@@ -1,10 +1,37 @@
-# Interactive learning session
+There are two interactive sessions for this part. See the [schedule][schedule] 
+for date and time for the various sessions.
 
-There is one interactive session for this module, see the [schedule][schedule] 
-for date and time.
-Watch the videos linked above before the session.
-During the session we will [summarize (together) the most important parts, 
-discuss the most difficult/ambiguous/strange/counter-intuitive 
-parts](https://ver.miun.se/courses/security/infosakc/foundations-session.pdf).
+For the first, you should work through the [Information Theory 
+Module][SL-infotheory] in ScalableLearning. You'll find the slides from the 
+videos here:
 
-[schedule]: https://portal.miun.se/web/student/schedule
+  - [Shannon entropy][entropy]
+  - [Some applications of info theory][infotheory-applications]
+
+The second session covers the [Crypto Module][SL-crypto] in ScalableLearning. 
+You'll find the slides from the videos here:
+
+  - [Intro to crypto][intro-crypto]
+  - [Shared-key crypto][shared-key]
+  - [One-way functions][one-way]
+  - [Public-key crypto][pub-key]
+  - [Zero-knowledge and multiparty computation][zkp-smc]
+  - [Side channels][sidechannels]
+
+The reading material is covered in Section 3.4 in the [study 
+guide][studyguide].
+
+
+[schedule]: https://miun.se/schema
+[studyguide]: https://ver.miun.se/courses/security/infosakc/studyguide.pdf
+[SL-infotheory]: https://www.scalable-learning.com/#/courses/3659/modules/16785/courseware
+[SL-crypto]: https://www.scalable-learning.com/#/courses/3659/modules/16784/courseware
+
+[entropy]: https://ver.miun.se/courses/security/infosakc/shannon-entropy.pdf
+[infotheory-applications]: https://ver.miun.se/courses/security/infosakc/infotheory-applications.pdf
+[intro-crypto]: https://ver.miun.se/courses/security/infosakc/crypto.pdf
+[shared-key]: https://ver.miun.se/courses/security/infosakc/shared-key.pdf
+[one-way]: https://ver.miun.se/courses/security/infosakc/one-way.pdf
+[pub-key]: https://ver.miun.se/courses/security/infosakc/pub-key.pdf
+[zkp-smc]: https://ver.miun.se/courses/security/infosakc/zkp-smc.pdf
+[sidechannels]: https://ver.miun.se/courses/security/infosakc/sidechannels.pdf
diff --git a/modules/foundations/.gitignore b/modules/foundations/.gitignore
@@ -1,8 +1,11 @@
 foundations.html
+foundations.md
 foundations.tex
 foundations.bib
 foundations-session.pdf
-video.md
-video.html
-reading.html
-session.html
+
+attacking-humans.md
+psychology.md
+scientific-method.md
+security.md
+
diff --git a/modules/foundations/Makefile b/modules/foundations/Makefile
@@ -10,24 +10,26 @@ PUB_GROUP?= 	svn
 .PHONY: all
 all: ${PUB_FILES}
 
-foundations.html: video.html reading.html session.html
+foundations.html: foundations.md
 	pandoc -s \
 		--metadata pagetitle="Foundations" \
 		--metadata title="" \
 		-o $@ $^
 
-video.md: security/security/README.md
-video.md: security/scientific-method/README.md
-video.md: usability/attacking-humans/README.md
-video.md: usability/psychology/README.md
+foundations.md: session.md
 
-video.md:
+foundations.md:
 	${RM} $@
-	echo "# Non-interactive learning sessions\n" >> $@
-	for f in $^; do ${CAT} $$f >> $@; echo >> $@; done
+	for f in $^; do ${CAT} $$f >> $@; echo '\n\n' >> $@; done
+
+security.md: security/security/README.md
+scientific-method.md: security/scientific-method/README.md
+attacking-humans.md: usability/attacking-humans/README.md
+psychology.md: usability/psychology/README.md
+
+security.md scientific-method.md attacking-humans.md psychology.md:
+	${LN} $< $@
 
-reading.html: reading.md foundations.bib
-	pandoc -s --bibliography=foundations.bib -o $@ $<
 
 .PHONY: all
 all: foundations.tex foundations.bib
@@ -50,24 +52,25 @@ foundations.tex:
 
 foundations.bib: security/security/security.bib
 foundations.bib: security/scientific-method/scientific-method.bib
-foundations.bib: usability/attacking-humans/attacking-humans.bib
-foundations.bib: usability/psychology/psychology.bib
+foundations.bib: usability/attacking-humans/bibliography.bib
+foundations.bib: usability/psychology/bibliography.bib
 
 foundations.bib:
 	${BIBTOOL} ${BIBTOOLFLAGS} -o $@ $^
 
 foundations-session.pdf: session/slides.pdf
 	${LN} $^ $@
 
+
 session/% security/% usability/%:
 	${MAKE} -C $(dir $@) $(notdir $@)
 
 
 .PHONY: clean
 clean:
-	${RM} foundations.html
+	${RM} foundations.html foundations.md
+	${RM} security.md scientific-method.md attacking-humans.md psychology.md
 	${RM} foundations.tex foundations.bib
-	${RM} video.md video.html reading.html session.html
 	${RM} foundations-session.pdf
 	${MAKE} -C security clean
 	${MAKE} -C usability clean

diff --git a/modules/foundations/security b/modules/foundations/security
+14 −0		.gitignore
+3 −0		.gitmodules
+9 −0		CONTRIBUTING.md
+21 −0		LICENSE
+22 −0		Makefile
+7 −19		README.md
+0 −11		assessment.bib
+0 −2		assessment.mk
+0 −9		assessment.sty
+175 −0		bibedu.bib
+31 −15		bibedu.mk
+539 −0		bibedu.nw
+49 −0		bibedu.sty
+0 −21		didactics.bib
+0 −2		didactics.mk
+0 −3		didactics.sty
+0 −6		learning.bib
+0 −2		learning.mk
+0 −9		learning.sty
+1 −0		makefiles
+145 −0		auth.bib
+27 −0		auth.mk
+1 −0		bibsp.mk
+215 −64		bibsp.sty
+25 −0		crypto.bib
+3 −0		crypto.mk
+52 −0		society.bib
+5 −0		society.mk
+19 −0		sybil.bib
+3 −0		sybil.mk
+2 −0		.gitignore
+1 −1		Dockerfile
+1 −1		LICENSE
+32 −76		Makefile
+177 −0		Makefile.nw
+64 −51		doc.mk
+101 −67		doc.mk.nw
+7 −6		intro.tex
+8 −2		makefiles.tex
+65 −34		noweb.mk
+137 −83		noweb.mk.nw
+3 −3		portability.mk
+5 −5		portability.mk.nw
+39 −36		tex.mk
+81 −79		tex.mk.nw
+0 −2		.gitignore
+0 −17		README.md
+1 −0		book-keeping/.gitignore
+14 −1		book-keeping/Makefile
+28 −3		book-keeping/README.md
+5 −8		book-keeping/abstract.tex
+5 −0		book-keeping/video.md
+14 −1		logging/Makefile
+33 −2		logging/README.md
+11 −12		logging/abstract.tex
+ −		logging/slides.pdf.xoj
+ −		logging/slides.pdf.xopp
+5 −0		logging/video.md
+1 −1		makefiles
+2 −3		Makefile
+23 −32		README.md
+1 −1		bibsp
+1 −1		bitcoin/bitcoin.tex
+1 −0		intro/.gitignore
+14 −0		intro/Makefile
+13 −3		intro/README.md
+3 −1		intro/abstract.tex
+1 −1		intro/preamble.tex
+3 −0		intro/video.md
+1 −1		makefiles
+1 −0		one-way/.gitignore
+14 −2		one-way/Makefile
+19 −4		one-way/README.md
+10 −9		one-way/abstract.tex
+31 −9		one-way/contents.tex
+4 −1		one-way/preamble.tex
+38 −0		one-way/questions.tex
+3 −0		one-way/video.md
+1 −0		pub-key/.gitignore
+14 −2		pub-key/Makefile
+27 −5		pub-key/README.md
+13 −7		pub-key/abstract.tex
+43 −24		pub-key/contents.tex
+7 −1		pub-key/preamble.tex
+96 −0		pub-key/questions.tex
+3 −0		pub-key/video.md
+1 −0		shared-key/.gitignore
+14 −0		shared-key/Makefile
+26 −3		shared-key/README.md
+9 −9		shared-key/abstract.tex
+21 −21		shared-key/contents.tex
+8 −1		shared-key/preamble.tex
+13 −0		shared-key/shared-key.bib
+3 −0		shared-key/video.md
+2 −0		sidechannels/.gitignore
+14 −1		sidechannels/Makefile
+31 −5		sidechannels/README.md
+12 −7		sidechannels/abstract.tex
+3 −0		sidechannels/video.md
+7 −4		spuriouslab/spuriouslab.tex
+1 −0		zkp-smc/.gitignore
+16 −1		zkp-smc/Makefile
+20 −6		zkp-smc/README.md
+8 −3		zkp-smc/abstract.tex
+1 −1		zkp-smc/preamble.tex
+53 −0		zkp-smc/questions.tex
+3 −0		zkp-smc/video.md
+2 −28		README.md
+1 −0		scientific-method/.gitignore
+18 −1		scientific-method/Makefile
+30 −2		scientific-method/README.md
+9 −5		scientific-method/abstract.tex
+3 −0		scientific-method/video.md
+1 −0		security/.gitignore
+14 −1		security/Makefile
+31 −2		security/README.md
+11 −8		security/abstract.tex
+4 −0		security/video.md