summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cardiff2015/images/email-usage.jpgbin0 -> 12112 bytes
-rw-r--r--cardiff2015/images/letter-and-postcard.jpgbin0 -> 8822 bytes
-rw-r--r--cardiff2015/images/many-encr-mails.jpgbin0 -> 15437 bytes
-rw-r--r--cardiff2015/images/metadata.jpgbin0 -> 27093 bytes
-rw-r--r--cardiff2015/images/metadata2.jpgbin0 -> 20593 bytes
-rw-r--r--cardiff2015/images/metadata3.jpgbin0 -> 24402 bytes
-rw-r--r--cardiff2015/images/one-encr-mail.jpgbin0 -> 15390 bytes
-rw-r--r--cardiff2015/images/pix-architecture.pngbin0 -> 92785 bytes
-rw-r--r--cardiff2015/images/pix-architecture2.pngbin0 -> 110206 bytes
-rw-r--r--cardiff2015/images/pix-logo-with-text.jpgbin0 -> 10083 bytes
-rw-r--r--cardiff2015/images/pix-useragent.pngbin0 -> 109539 bytes
-rw-r--r--cardiff2015/images/social-graph.jpgbin0 -> 17286 bytes
-rw-r--r--cardiff2015/slides.haml58
13 files changed, 45 insertions, 13 deletions
diff --git a/cardiff2015/images/email-usage.jpg b/cardiff2015/images/email-usage.jpg
new file mode 100644
index 0000000..4495ac5
--- /dev/null
+++ b/cardiff2015/images/email-usage.jpg
Binary files differ
diff --git a/cardiff2015/images/letter-and-postcard.jpg b/cardiff2015/images/letter-and-postcard.jpg
new file mode 100644
index 0000000..409fe20
--- /dev/null
+++ b/cardiff2015/images/letter-and-postcard.jpg
Binary files differ
diff --git a/cardiff2015/images/many-encr-mails.jpg b/cardiff2015/images/many-encr-mails.jpg
new file mode 100644
index 0000000..ce4bb9d
--- /dev/null
+++ b/cardiff2015/images/many-encr-mails.jpg
Binary files differ
diff --git a/cardiff2015/images/metadata.jpg b/cardiff2015/images/metadata.jpg
new file mode 100644
index 0000000..320d71c
--- /dev/null
+++ b/cardiff2015/images/metadata.jpg
Binary files differ
diff --git a/cardiff2015/images/metadata2.jpg b/cardiff2015/images/metadata2.jpg
new file mode 100644
index 0000000..ff014d9
--- /dev/null
+++ b/cardiff2015/images/metadata2.jpg
Binary files differ
diff --git a/cardiff2015/images/metadata3.jpg b/cardiff2015/images/metadata3.jpg
new file mode 100644
index 0000000..a52a86a
--- /dev/null
+++ b/cardiff2015/images/metadata3.jpg
Binary files differ
diff --git a/cardiff2015/images/one-encr-mail.jpg b/cardiff2015/images/one-encr-mail.jpg
new file mode 100644
index 0000000..2618818
--- /dev/null
+++ b/cardiff2015/images/one-encr-mail.jpg
Binary files differ
diff --git a/cardiff2015/images/pix-architecture.png b/cardiff2015/images/pix-architecture.png
new file mode 100644
index 0000000..fb1ba31
--- /dev/null
+++ b/cardiff2015/images/pix-architecture.png
Binary files differ
diff --git a/cardiff2015/images/pix-architecture2.png b/cardiff2015/images/pix-architecture2.png
new file mode 100644
index 0000000..4d2bdcb
--- /dev/null
+++ b/cardiff2015/images/pix-architecture2.png
Binary files differ
diff --git a/cardiff2015/images/pix-logo-with-text.jpg b/cardiff2015/images/pix-logo-with-text.jpg
new file mode 100644
index 0000000..459ecd1
--- /dev/null
+++ b/cardiff2015/images/pix-logo-with-text.jpg
Binary files differ
diff --git a/cardiff2015/images/pix-useragent.png b/cardiff2015/images/pix-useragent.png
new file mode 100644
index 0000000..ecaf258
--- /dev/null
+++ b/cardiff2015/images/pix-useragent.png
Binary files differ
diff --git a/cardiff2015/images/social-graph.jpg b/cardiff2015/images/social-graph.jpg
new file mode 100644
index 0000000..43d763b
--- /dev/null
+++ b/cardiff2015/images/social-graph.jpg
Binary files differ
diff --git a/cardiff2015/slides.haml b/cardiff2015/slides.haml
index 8ae641d..77e0b91 100644
--- a/cardiff2015/slides.haml
+++ b/cardiff2015/slides.haml
@@ -119,24 +119,59 @@
%li Cloud synchronized for high availability on multiple devices.
%li No cleartext is ever written to disk.
-%section(data-background="images/pixelated-white-small.svg" data-background-size="50%")
+%section(data-background="./images/pix-logo-with-text.jpg" data-background-size="50%")
%section
%h1 Our goals:
%ul
- %li increase the cost of dragnet surveillance
- %li mass adoption
+ %li Mass adoption
+ %li Increase the cost of dragnet surveillance
+
+%section(data-background="./images/one-encr-mail.jpg" data-background-size="50%")
+
+%section(data-background="./images/many-encr-mails.jpg" data-background-size="50%")
+
+%section
+ %h1 Pixelated Useragent
+ %ul
+ %li Bitmask client and Email Client combined.
+ %li Modern, good looking UI.
+ %li Integrated search, search index encrypted
+ %li Tagging
+
+%section(data-background="./images/pix-useragent.png" data-background-size="75%")
+
+%section
+ %h1 Activist Setup
+ %ul
+ %li Private Keys on local device
+ %li Useragent needs to get installed locally
+
+%section
+ %h1 Organisation Setup
+ %ul
+ %li Private Keys on the server
+ %li No Installation, access via browser
+ %li Activist Setup possible on individual choice
+
+%section(data-background="./images/pix-architecture2.png" data-background-size="75%")
+
%section
- %h1 Web Interface
+ %h1 Metadata
%ul
- %li Potentially hosted by third party.
- %li Think "Bitmask client" but hosted in the cloud.
- %li Good looking.
- %li Search and tagging.
- %li Keys on the server, no browser crypto.
+ %li Simple Mail Transfer Protocol from 1982 (!)
+ %li Email exposes lots of metadata (Date:, From:, To:, Subject:, Useragent:)
+
+%section(data-background="./images/metadata.jpg" data-background-size="50%")
-%section(data-background="images/webmail.png" data-background-size="100%")
+%section(data-background="./images/metadata2.jpg" data-background-size="50%")
+
+%section(data-background="./images/metadata3.jpg" data-background-size="50%")
+
+%section
+ %ul
+ %li
%section
.left
@@ -147,9 +182,6 @@
%li
Bitmask App @bitmasknet
%a(href="https://bitmask.net") https://bitmask.net
- %li
- elijah@leap.se @ecsparrow<br/>
- 06A2 B8EE B5A4 E27D 3F57 14AC 544E E176 B3AE 7759
%p &nbsp;
%p &nbsp;
%ul.plain