updated bingo page

1 files changed, 15 insertions, 27 deletions

diff --git a/app/views/pages/about-us/news/2012/security-bingo/en.haml b/app/views/pages/about-us/news/2012/security-bingo/en.haml
index 134b205..0bb7bb5 100644
--- a/app/views/pages/about-us/news/2012/security-bingo/en.haml
+++ b/app/views/pages/about-us/news/2012/security-bingo/en.haml
@@ -1,10 +1,10 @@
-- @title = "Let's play security bingo!"
+- @title = "Let's play security bingo! (Updated)"
 - @author = "Elijah"
 - @posted_at = "2012-08-28"
 - @more = true
 - @preview = capture_haml do
   :textile
-    To be honest, this is might be the least satisfying game of bingo ever--but let's play anyway. The rules are simple: draw a grid, label the columns for different platforms, and label the rows for important communication toolsets. In each cell, put the name of an open source software package with reasonable security properties. If this exercise doesn't make you break down in tears, then you have won.
+    To be honest, this is might be the least satisfying game of bingo ever--but let's play anyway. The rules are simple: make a grid cross referencing OS platform and communication toolset. In each cell, put the name of an open source software package with reasonable security properties. If this exercise doesn't make you break down in tears, then you have won.
 
 %style
   :sass
@@ -46,17 +46,11 @@
       %td #{link 'Cryptocat' => 'https://crypto.cat'}
     %tr
       %td Long Message
-      %td{:colspan => 3} (#{link 'Thunderbird' => 'https://www.mozilla.org/en-US/thunderbird'} + #{link 'Enigmail' => 'http://enigmail.mozdev.org/'})
-      %td
-      %td (#{link 'K-9' => 'https://code.google.com/p/k9mail/'} + #{link 'AGP' => 'http://www.thialfihar.org/projects/apg/'})
-      %td
-    -# %tr
-      %td Social Networking
-      %td
-      %td
-      %td
-      %td
+      %td #{link 'Enigmail' => 'http://enigmail.mozdev.org/'}, #{link 'Gpg4win' => 'http://www.gpg4win.org/about.html'}
+      %td #{link 'Enigmail' => 'http://enigmail.mozdev.org/'}, #{link 'GPGMail' => 'https://www.gpgtools.org/gpgmail/index.html'}
+      %td #{link 'Enigmail' => 'http://enigmail.mozdev.org/'}
       %td
+      %td #{link 'AGP' => 'http://www.thialfihar.org/projects/apg/'}
       %td
   %tbody
     %tr
@@ -64,9 +58,9 @@
       %td Storage
       %td #{link 'DiskCryptor' => 'http://diskcryptor.net'}
       %td
-      %td EncFS, DMCrypt
+      %td #{link 'EncFS' => 'http://www.arg0.net/encfs'}, #{link 'eCryptfs' => 'http://ecryptfs.org/'}, #{link 'DMCrypt' => 'http://en.wikipedia.org/wiki/Dm-crypt'}
       %td
-      %td (#{link 'AOSP' => 'http://source.android.com/'}, #{link 'Cryptonite' => 'https://code.google.com/p/cryptonite/'})
+      %td #{link 'AOSP' => 'http://source.android.com/'}, #{link 'Cryptonite' => 'https://code.google.com/p/cryptonite/'}
       %td #{link 'SafeWith.me' => 'https://SafeWith.me'}
     %tr
       %td Backup
@@ -78,7 +72,7 @@
       %td
     %tr
       %td Synchronization
-      %td{:colspan => 3} (#{link 'Syncany' => 'http://www.syncany.org/'}, #{link 'git-annex' => 'http://git-annex.branchable.com/assistant/'})
+      %td{:colspan => 3} #{link 'Syncany' => 'http://www.syncany.org/'}, #{link 'git-annex' => 'http://git-annex.branchable.com/assistant/'}, #{link 'SparkleShare' => 'http://sparkleshare.org/'}
       %td
       %td
       %td
@@ -102,15 +96,15 @@
     %tr
       %td.section{:rowspan => 3} Audio/Video
       %td Direct Calling
-      %td{:colspan => 3} (#{link 'Jitsi' => 'https://jitsi.org/'})
+      %td{:colspan => 3} #{link 'Jitsi' => 'https://jitsi.org/'}
       %td
       %td #{link 'RedPhone' => 'https://github.com/WhisperSystems/RedPhone'}, #{link 'CSimpleSip' => 'https://code.google.com/p/csipsimple/'}
       %td
     %tr
       %td Conference
-      %td{:colspan => 3} (#{link 'Mumble' => 'http://mumble.sourceforge.net/'})
+      %td{:colspan => 3} #{link 'Mumble' => 'http://mumble.sourceforge.net/'}
       %td
-      %td (#{link 'Mumble' => 'http://mumble.sourceforge.net/'})
+      %td #{link 'Mumble' => 'http://mumble.sourceforge.net/'}
       %td
     %tr
       %td Capture & Reporting
@@ -128,7 +122,7 @@
       %td N/A
     %tr
       %td Confidentiality & Anonymity
-      %td{:colspan => 5} #{link 'Tor' => 'https://torproject.org'}, (#{link 'OpenVPN' => 'http://openvpn.net'})
+      %td{:colspan => 5} #{link 'Tor' => 'https://torproject.org'}, #{link 'OpenVPN' => 'http://openvpn.net'}
       %td N/A
   %tbody
     %tr
@@ -140,7 +134,7 @@
       %td
     %tr
       %td Validation
-      %td{:colspan => 6} (OpenPGP, #{link 'OTR' => 'http://www.cypherpunks.ca/otr/'})
+      %td{:colspan => 6} OpenPGP, #{link 'OTR' => 'http://www.cypherpunks.ca/otr/'}
     %tr
       %td Authentication
       %td{:colspan => 6} #{link 'Mozilla Persona' => 'https://login.persona.org/'}, #{link 'WebID' => 'http://www.w3.org/2005/Incubator/webid/spec/'}
@@ -182,13 +176,7 @@
       %td
 
 :textile
-  Looking at this table, two things are immediately obvious: first, I don't know much about Mac or iOS; second, there are a lot of missing cells, and most of the filled cells are dubious in nature.
-
-  I put cells in parenthesis whenever I felt that the cell contents were egregiously doubtful. This could be for any number of reasons:
-
-  # *Not ready*: Some software shows promise, but there is not really any code that is ready to be used. For example, Syncany and git-annex.
-  # *Security problems*: Some software has notable security problems. Mumble, for example, only supports variable bit-rate encoding and is thus not suited to prevent eavesdropping by a skilled adversary.
-  # *Hostile to users*: Much of the available software exemplifies a painful user experience. For example, Jitsi, OpenVPN, or OpenPGP.
+  Looking at this table, it is immediately obvious that there are a lot of empty cells. Unfortunately, most of the cells that are filled in contain software that is unfriendly or even sadistic toward the user. Trying to use many of these tools can feel like developing a BDSM relationship with your computer, and you are not the Dom.
 
   What is missing might be more revealing than what is listed. These toolsets are entirely absent from my 'security bingo' game card: