74 files changed, 17 insertions, 60 deletions

diff --git a/.gitignore b/.gitignore
index 2bf6741..3f3d6ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 **/*.html
+
+**/.ipynb_checkpoints/*
diff --git a/sem1-projekt/mifare.md b/sem1-projekt/mifare.md
deleted file mode 100644
index 448292d..0000000
--- a/sem1-projekt/mifare.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# Vulnabilites
-
-Using the unsecure propreitary crypto1.
-Companies often do this however custom crypto often ends wrong.
-
-Ting der gør crypto1 usikker.
-
-- Kun 48 bits. Dette er et problem da crypto1 er fuldt reversed.
-- Random generator til 32 bit nounce er kun 16 bit entropy. 
-
-	Dette betyder at nouncene vil gentage sig rimelig hurtigt, og eftersom den starter i known state kan man time sig til en nounce man kender. 
-	
-	Dette er heldigvis fixet i senere versioner hvor man har lavet en bedre random generator.
-- Nested attack hvor man ud med en ud fra en sector key kan udlede 32 bit fra keystreamen. 
-
-	Her authentikator man til en sector, og laver derefter en nestet authentification. 
-	I denne nestet bliver sendt krypteret, men fordi man kan regne ud hvad den er kan man udlede keystream(du ved fordi xor).
-
-- Parity bits deler en keystream bit med den næste bit. Dette betyder at den kan udledes.
-
-	Denne fejl kan ikke fixes let ligesom den med nouncene.
-
-- Keystream fra fejl
-
-	Hvis man sender et forkert svar ved challenge-response, sender den en fejl **kryperet**.
-	
-	Eftersom man kender fejlkoden kan man få 4 bits fra keystream.
-
-	Denne fejl kan heldigvis fixes da læsere alligevel ikke bruger denne fejlbesked(de kan jo ikke læse den når den er krypteret).
-
-- LFSR rollback
-
-	Hvis man kan udlede LFSR på et eller andet tidspunkt kan man regne ud hvad den var fra i starten, hvis man har det data der er puttet ind.
-
-	Eftersom den starter med at være secret key kan man derfor udelede den.
-
-- Ulige bit filter
-
-	Noget med at filtret der feeder tilbage til LFSR kun bruger de ulige bits.
-
-	Dette betyder at man kan lettere kan komme tilbage til starten af LFSR.
-	Forstår ikke helt hvordan.
-
-## Angreb for key
-
-De starter med at hente en masse nounces ind med nestet attack.
-
-Ret avanceret. 
-Noget med propability. 
-De skriver noget med en sum function jeg ikke helt forstår.
-(edit kan se det står længere nede. Ved ikke helt om jeg læser det, der er ret meget. Vi ved der der).
-
-De får nogle forskellige keys det måske kan være.
-
-De kan tage og prøve at dekode alle nouncene med en key for at test den.
-De ved at key'en er god når parity passer. 
-
-Hvis parity ikke passer er der 1/2 change for at keyen er god.
diff --git a/sem1/BfCI/husk.txt b/sem3/BfCI/husk.txt
index e5a7b96..e5a7b96 100644
--- a/sem1/BfCI/husk.txt
+++ b/sem3/BfCI/husk.txt
diff --git a/sem1/BfCI/mm1.md b/sem3/BfCI/mm1.md
index 933086c..933086c 100644
--- a/sem1/BfCI/mm1.md
+++ b/sem3/BfCI/mm1.md
diff --git a/sem1/BfCI/mm3.md b/sem3/BfCI/mm3.md
index a0bb1b8..a0bb1b8 100644
--- a/sem1/BfCI/mm3.md
+++ b/sem3/BfCI/mm3.md
diff --git a/sem1/algo/.gitignore b/sem3/algo/.gitignore
index 38aee6d..38aee6d 100644
--- a/sem1/algo/.gitignore
+++ b/sem3/algo/.gitignore
diff --git a/sem1/algo/graph/Cargo.lock b/sem3/algo/graph/Cargo.lock
index 74fba54..74fba54 100644
--- a/sem1/algo/graph/Cargo.lock
+++ b/sem3/algo/graph/Cargo.lock
diff --git a/sem1/algo/graph/Cargo.toml b/sem3/algo/graph/Cargo.toml
index 896f437..896f437 100644
--- a/sem1/algo/graph/Cargo.toml
+++ b/sem3/algo/graph/Cargo.toml
diff --git a/sem1/algo/graph/src/graph.rs b/sem3/algo/graph/src/graph.rs
index cefd24f..cefd24f 100644
--- a/sem1/algo/graph/src/graph.rs
+++ b/sem3/algo/graph/src/graph.rs
diff --git a/sem1/algo/graph/src/main.rs b/sem3/algo/graph/src/main.rs
index 4f732e7..4f732e7 100644
--- a/sem1/algo/graph/src/main.rs
+++ b/sem3/algo/graph/src/main.rs
diff --git a/sem1/algo/lek1/merge.c b/sem3/algo/lek1/merge.c
index 997bcb8..997bcb8 100644
--- a/sem1/algo/lek1/merge.c
+++ b/sem3/algo/lek1/merge.c
diff --git a/sem1/algo/mm10/bfs.c b/sem3/algo/mm10/bfs.c
index 982ecef..982ecef 100644
--- a/sem1/algo/mm10/bfs.c
+++ b/sem3/algo/mm10/bfs.c
diff --git a/sem1/algo/mm12/Makefile b/sem3/algo/mm12/Makefile
index 7837354..7837354 100644
--- a/sem1/algo/mm12/Makefile
+++ b/sem3/algo/mm12/Makefile
diff --git a/sem1/algo/mm12/dijkstra.c b/sem3/algo/mm12/dijkstra.c
index 103c700..103c700 100644
--- a/sem1/algo/mm12/dijkstra.c
+++ b/sem3/algo/mm12/dijkstra.c
diff --git a/sem1/algo/mm12/graph.c b/sem3/algo/mm12/graph.c
index 299ea24..299ea24 100644
--- a/sem1/algo/mm12/graph.c
+++ b/sem3/algo/mm12/graph.c
diff --git a/sem1/algo/mm12/graph.h b/sem3/algo/mm12/graph.h
index e957c4d..e957c4d 100644
--- a/sem1/algo/mm12/graph.h
+++ b/sem3/algo/mm12/graph.h
diff --git a/sem1/algo/mm2/linked/Makefile b/sem3/algo/mm2/linked/Makefile
index 881143c..881143c 100644
--- a/sem1/algo/mm2/linked/Makefile
+++ b/sem3/algo/mm2/linked/Makefile
diff --git a/sem1/algo/mm2/linked/Readme.md b/sem3/algo/mm2/linked/Readme.md
index 679dcf3..679dcf3 100644
--- a/sem1/algo/mm2/linked/Readme.md
+++ b/sem3/algo/mm2/linked/Readme.md
diff --git a/sem1/algo/mm2/linked/llist.c b/sem3/algo/mm2/linked/llist.c
index 41ab892..41ab892 100644
--- a/sem1/algo/mm2/linked/llist.c
+++ b/sem3/algo/mm2/linked/llist.c
diff --git a/sem1/algo/mm2/linked/llist.h b/sem3/algo/mm2/linked/llist.h
index e52be89..e52be89 100644
--- a/sem1/algo/mm2/linked/llist.h
+++ b/sem3/algo/mm2/linked/llist.h
diff --git a/sem1/algo/mm2/linked/main.c b/sem3/algo/mm2/linked/main.c
index 72b62cc..72b62cc 100644
--- a/sem1/algo/mm2/linked/main.c
+++ b/sem3/algo/mm2/linked/main.c
diff --git a/sem1/algo/mm2/linked/node.c b/sem3/algo/mm2/linked/node.c
index cce1be0..cce1be0 100644
--- a/sem1/algo/mm2/linked/node.c
+++ b/sem3/algo/mm2/linked/node.c
diff --git a/sem1/algo/mm2/linked/node.h b/sem3/algo/mm2/linked/node.h
index 027926b..027926b 100644
--- a/sem1/algo/mm2/linked/node.h
+++ b/sem3/algo/mm2/linked/node.h
diff --git a/sem1/algo/mm2/queue.c b/sem3/algo/mm2/queue.c
index a93f76a..a93f76a 100644
--- a/sem1/algo/mm2/queue.c
+++ b/sem3/algo/mm2/queue.c
diff --git a/sem1/algo/mm3/multiply.c b/sem3/algo/mm3/multiply.c
index e454de3..e454de3 100644
--- a/sem1/algo/mm3/multiply.c
+++ b/sem3/algo/mm3/multiply.c
diff --git a/sem1/algo/mm3/opgaver.md b/sem3/algo/mm3/opgaver.md
index a6e560c..a6e560c 100644
--- a/sem1/algo/mm3/opgaver.md
+++ b/sem3/algo/mm3/opgaver.md
diff --git a/sem1/algo/mm6/Makefile b/sem3/algo/mm6/Makefile
index c157cef..c157cef 100644
--- a/sem1/algo/mm6/Makefile
+++ b/sem3/algo/mm6/Makefile
diff --git a/sem1/algo/mm6/main b/sem3/algo/mm6/main
index c666ee9..c666ee9 100755
--- a/sem1/algo/mm6/main
+++ b/sem3/algo/mm6/main
diff --git a/sem1/algo/mm6/main.c b/sem3/algo/mm6/main.c
index abc8d02..abc8d02 100644
--- a/sem1/algo/mm6/main.c
+++ b/sem3/algo/mm6/main.c
diff --git a/sem1/algo/mm6/tree.c b/sem3/algo/mm6/tree.c
index 47378f3..47378f3 100644
--- a/sem1/algo/mm6/tree.c
+++ b/sem3/algo/mm6/tree.c
diff --git a/sem1/algo/mm6/tree.h b/sem3/algo/mm6/tree.h
index 0d1c5c6..0d1c5c6 100644
--- a/sem1/algo/mm6/tree.h
+++ b/sem3/algo/mm6/tree.h
diff --git a/sem1/algo/mm9/Untitled.ipynb b/sem3/algo/mm9/Untitled.ipynb
index a2bd59e..a2bd59e 100644
--- a/sem1/algo/mm9/Untitled.ipynb
+++ b/sem3/algo/mm9/Untitled.ipynb
diff --git a/sem1/algo/workshop2/dfs/Makefile b/sem3/algo/workshop2/dfs/Makefile
index 790bb94..790bb94 100644
--- a/sem1/algo/workshop2/dfs/Makefile
+++ b/sem3/algo/workshop2/dfs/Makefile
diff --git a/sem1/algo/workshop2/dfs/dfs b/sem3/algo/workshop2/dfs/dfs
index 0d9ff14..0d9ff14 100755
--- a/sem1/algo/workshop2/dfs/dfs
+++ b/sem3/algo/workshop2/dfs/dfs
diff --git a/sem1/algo/workshop2/dfs/dfs.c b/sem3/algo/workshop2/dfs/dfs.c
index 1244895..1244895 100644
--- a/sem1/algo/workshop2/dfs/dfs.c
+++ b/sem3/algo/workshop2/dfs/dfs.c
diff --git a/sem1/algo/workshop2/dfs/graph.c b/sem3/algo/workshop2/dfs/graph.c
index 0f5048c..0f5048c 100644
--- a/sem1/algo/workshop2/dfs/graph.c
+++ b/sem3/algo/workshop2/dfs/graph.c
diff --git a/sem1/algo/workshop2/dfs/graph.h b/sem3/algo/workshop2/dfs/graph.h
index e169a8a..e169a8a 100644
--- a/sem1/algo/workshop2/dfs/graph.h
+++ b/sem3/algo/workshop2/dfs/graph.h
diff --git a/sem1/algo/workshop2/dijkstra/Makefile b/sem3/algo/workshop2/dijkstra/Makefile
index 7837354..7837354 100644
--- a/sem1/algo/workshop2/dijkstra/Makefile
+++ b/sem3/algo/workshop2/dijkstra/Makefile
diff --git a/sem1/algo/workshop2/dijkstra/dijkstra.c b/sem3/algo/workshop2/dijkstra/dijkstra.c
index 555a125..9609343 100644
--- a/sem1/algo/workshop2/dijkstra/dijkstra.c
+++ b/sem3/algo/workshop2/dijkstra/dijkstra.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include "graph.h"
 
 typedef struct list_item {
@@ -110,11 +111,19 @@ void dijkstra(graph_t *g, vertex_t *s) {
 
 int main() {
 
-	graph_from_dot(stdin, &g);
+	int count = graph_from_dot(stdin, &g);
 
+	clock_t start, end;
+	double cpu_time_used;
+
+	start = clock();
 	dijkstra(&g, graph_vertex(&g, "0"));
+	end = clock();
+	cpu_time_used = ((double) (end - start)) / CLOCKS_PER_SEC;
+
+	printf("%d;%f\n", count, cpu_time_used);
 
-	graph_to_dot(stdout, &g);
+	//graph_to_dot(stdout, &g);
 
 	return 0;
 }
diff --git a/sem1/algo/workshop2/dijkstra/graph.c b/sem3/algo/workshop2/dijkstra/graph.c
index 8f62981..3f24ccf 100644
--- a/sem1/algo/workshop2/dijkstra/graph.c
+++ b/sem3/algo/workshop2/dijkstra/graph.c
@@ -184,6 +184,7 @@ int graph_to_dot(FILE *f, graph_t *g) {
 int graph_from_dot(FILE *f, graph_t *g) {
 	char from[100], to[100];
 	int weight;
+	int count = 0;
 	// just fscanf it
 	for(;;) {
 		// Set first to zero
@@ -207,7 +208,10 @@ int graph_from_dot(FILE *f, graph_t *g) {
 		//printf("Creating edge from %s to %s with w: %d\n", from, to, weight);
 
 		graph_edge(g, from, to, weight);
+		count++;
 	}
+
+	return count;
 }
 
 vertex_t *graph_vertex(graph_t *g, char *ref) {
diff --git a/sem1/algo/workshop2/dijkstra/graph.h b/sem3/algo/workshop2/dijkstra/graph.h
index 5c078b8..5c078b8 100644
--- a/sem1/algo/workshop2/dijkstra/graph.h
+++ b/sem3/algo/workshop2/dijkstra/graph.h
diff --git a/sem1/module.c b/sem3/module.c
index 3a25d25..3a25d25 100644
--- a/sem1/module.c
+++ b/sem3/module.c
diff --git a/sem1/osc/miniproject/cnasm/Makefile b/sem3/osc/miniproject/cnasm/Makefile
index 9ace547..9ace547 100644
--- a/sem1/osc/miniproject/cnasm/Makefile
+++ b/sem3/osc/miniproject/cnasm/Makefile
diff --git a/sem1/osc/miniproject/cnasm/ast.c b/sem3/osc/miniproject/cnasm/ast.c
index 035b75d..035b75d 100644
--- a/sem1/osc/miniproject/cnasm/ast.c
+++ b/sem3/osc/miniproject/cnasm/ast.c
diff --git a/sem1/osc/miniproject/cnasm/ast.h b/sem3/osc/miniproject/cnasm/ast.h
index 61a8f4f..61a8f4f 100644
--- a/sem1/osc/miniproject/cnasm/ast.h
+++ b/sem3/osc/miniproject/cnasm/ast.h
diff --git a/sem1/osc/miniproject/cnasm/codegen.c b/sem3/osc/miniproject/cnasm/codegen.c
index c995df9..c995df9 100644
--- a/sem1/osc/miniproject/cnasm/codegen.c
+++ b/sem3/osc/miniproject/cnasm/codegen.c
diff --git a/sem1/osc/miniproject/cnasm/codegen.h b/sem3/osc/miniproject/cnasm/codegen.h
index 24ad6c4..24ad6c4 100644
--- a/sem1/osc/miniproject/cnasm/codegen.h
+++ b/sem3/osc/miniproject/cnasm/codegen.h
diff --git a/sem1/osc/miniproject/cnasm/regn.l b/sem3/osc/miniproject/cnasm/regn.l
index 00876d6..00876d6 100644
--- a/sem1/osc/miniproject/cnasm/regn.l
+++ b/sem3/osc/miniproject/cnasm/regn.l
diff --git a/sem1/osc/miniproject/cnasm/regn.y b/sem3/osc/miniproject/cnasm/regn.y
index b72d440..b72d440 100644
--- a/sem1/osc/miniproject/cnasm/regn.y
+++ b/sem3/osc/miniproject/cnasm/regn.y
diff --git a/sem1/osc/miniproject/cnasm/test.asm b/sem3/osc/miniproject/cnasm/test.asm
index 77a3572..77a3572 100644
--- a/sem1/osc/miniproject/cnasm/test.asm
+++ b/sem3/osc/miniproject/cnasm/test.asm
diff --git a/sem1/osc/mm1/.gitignore b/sem3/osc/mm1/.gitignore
index b18a498..b18a498 100644
--- a/sem1/osc/mm1/.gitignore
+++ b/sem3/osc/mm1/.gitignore
diff --git a/sem1/osc/mm1/mm1/Makefile b/sem3/osc/mm1/mm1/Makefile
index 13c8e62..13c8e62 100644
--- a/sem1/osc/mm1/mm1/Makefile
+++ b/sem3/osc/mm1/mm1/Makefile
diff --git a/sem1/osc/mm1/mm1/Readme.md b/sem3/osc/mm1/mm1/Readme.md
index fcc6cb3..fcc6cb3 100644
--- a/sem1/osc/mm1/mm1/Readme.md
+++ b/sem3/osc/mm1/mm1/Readme.md
diff --git a/sem1/osc/mm1/mm1/jmod.c b/sem3/osc/mm1/mm1/jmod.c
index a07077c..a07077c 100644
--- a/sem1/osc/mm1/mm1/jmod.c
+++ b/sem3/osc/mm1/mm1/jmod.c
diff --git a/sem1/osc/mm1/mm2/tprog.c b/sem3/osc/mm1/mm2/tprog.c
index 377555f..377555f 100644
--- a/sem1/osc/mm1/mm2/tprog.c
+++ b/sem3/osc/mm1/mm2/tprog.c
diff --git a/sem1/osc/mm10/Makefile b/sem3/osc/mm10/Makefile
index 99bd635..99bd635 100644
--- a/sem1/osc/mm10/Makefile
+++ b/sem3/osc/mm10/Makefile
diff --git a/sem1/osc/mm10/opg1.l b/sem3/osc/mm10/opg1.l
index b5cb478..b5cb478 100644
--- a/sem1/osc/mm10/opg1.l
+++ b/sem3/osc/mm10/opg1.l
diff --git a/sem1/osc/mm10/opg3.l b/sem3/osc/mm10/opg3.l
index 1c4b9c7..1c4b9c7 100644
--- a/sem1/osc/mm10/opg3.l
+++ b/sem3/osc/mm10/opg3.l
diff --git a/sem1/osc/mm10/opg4.l b/sem3/osc/mm10/opg4.l
index aeb73b1..aeb73b1 100644
--- a/sem1/osc/mm10/opg4.l
+++ b/sem3/osc/mm10/opg4.l
diff --git a/sem1/osc/mm10/opgaver.md b/sem3/osc/mm10/opgaver.md
index b8c8186..b8c8186 100644
--- a/sem1/osc/mm10/opgaver.md
+++ b/sem3/osc/mm10/opgaver.md
diff --git a/sem1/osc/mm10/stateMachine.png b/sem3/osc/mm10/stateMachine.png
index 08c5bf2..08c5bf2 100644
--- a/sem1/osc/mm10/stateMachine.png
+++ b/sem3/osc/mm10/stateMachine.png
diff --git a/sem1/osc/mm11/opgaver.md b/sem3/osc/mm11/opgaver.md
index 276236a..276236a 100644
--- a/sem1/osc/mm11/opgaver.md
+++ b/sem3/osc/mm11/opgaver.md
diff --git a/sem1/osc/mm11/regn/Makefile b/sem3/osc/mm11/regn/Makefile
index 442feba..442feba 100644
--- a/sem1/osc/mm11/regn/Makefile
+++ b/sem3/osc/mm11/regn/Makefile
diff --git a/sem1/osc/mm11/regn/regn.l b/sem3/osc/mm11/regn/regn.l
index bbaadb8..bbaadb8 100644
--- a/sem1/osc/mm11/regn/regn.l
+++ b/sem3/osc/mm11/regn/regn.l
diff --git a/sem1/osc/mm11/regn/regn.y b/sem3/osc/mm11/regn/regn.y
index d0f67eb..d0f67eb 100644
--- a/sem1/osc/mm11/regn/regn.y
+++ b/sem3/osc/mm11/regn/regn.y
diff --git a/sem1/osc/mm11/regn/symtab.c b/sem3/osc/mm11/regn/symtab.c
index 8103203..8103203 100644
--- a/sem1/osc/mm11/regn/symtab.c
+++ b/sem3/osc/mm11/regn/symtab.c
diff --git a/sem1/osc/mm11/regn/symtab.h b/sem3/osc/mm11/regn/symtab.h
index c61f3a8..c61f3a8 100644
--- a/sem1/osc/mm11/regn/symtab.h
+++ b/sem3/osc/mm11/regn/symtab.h
diff --git a/sem1/osc/mm11/regn2/Makefile b/sem3/osc/mm11/regn2/Makefile
index 9640aaa..9640aaa 100644
--- a/sem1/osc/mm11/regn2/Makefile
+++ b/sem3/osc/mm11/regn2/Makefile
diff --git a/sem1/osc/mm11/regn2/regn.l b/sem3/osc/mm11/regn2/regn.l
index 9988ddd..9988ddd 100644
--- a/sem1/osc/mm11/regn2/regn.l
+++ b/sem3/osc/mm11/regn2/regn.l
diff --git a/sem1/osc/mm11/regn2/regn.y b/sem3/osc/mm11/regn2/regn.y
index eac24c8..eac24c8 100644
--- a/sem1/osc/mm11/regn2/regn.y
+++ b/sem3/osc/mm11/regn2/regn.y
diff --git a/sem1/osc/mm3/opgaver.md b/sem3/osc/mm3/opgaver.md
index d9440f8..d9440f8 100644
--- a/sem1/osc/mm3/opgaver.md
+++ b/sem3/osc/mm3/opgaver.md
diff --git a/sem1/osc/mm8/mm8.ino b/sem3/osc/mm8/mm8.ino
index f47306d..f47306d 100644
--- a/sem1/osc/mm8/mm8.ino
+++ b/sem3/osc/mm8/mm8.ino
diff --git a/sem1/osc/mm9/opgaver.md b/sem3/osc/mm9/opgaver.md
index fe2ec99..fe2ec99 100644
--- a/sem1/osc/mm9/opgaver.md
+++ b/sem3/osc/mm9/opgaver.md
diff --git a/sem1/osc/noter.md b/sem3/osc/noter.md
index 6e13640..6e13640 100644
--- a/sem1/osc/noter.md
+++ b/sem3/osc/noter.md