From f26b9070f28bb5a61644476fee7ba529874884e3 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Sun, 13 Oct 2013 04:06:58 -0700
Subject: [PATCH] Update PRNG fix code sample.

Google updated their code sample to account for restrictive
SELinux configurations on some devices.
---
 .../securesms/crypto/PRNGFixes.java           | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/crypto/PRNGFixes.java b/src/org/thoughtcrime/securesms/crypto/PRNGFixes.java
index aad1338285..3bdc0216c2 100644
--- a/src/org/thoughtcrime/securesms/crypto/PRNGFixes.java
+++ b/src/org/thoughtcrime/securesms/crypto/PRNGFixes.java
@@ -1,7 +1,18 @@
+/*
+ * This software is provided 'as-is', without any express or implied
+ * warranty.  In no event will Google be held liable for any damages
+ * arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, as long as the origin is not misrepresented.
+ */
+
 package org.thoughtcrime.securesms.crypto;
 
 import android.os.Build;
 import android.os.Process;
+import android.util.Log;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
@@ -25,7 +36,6 @@ import java.security.Security;
  * Since I still don't know exactly what the source of this bug was, I'm using
  * this class verbatim under the assumption that the Android team knows what
  * they're doing.  Although, at this point, that is perhaps a foolish assumption.
- *
  */
 
 /**
@@ -213,10 +223,13 @@ public final class PRNGFixes {
         }
         out.write(bytes);
         out.flush();
-        mSeeded = true;
       } catch (IOException e) {
-        throw new SecurityException(
-            "Failed to mix seed into " + URANDOM_FILE, e);
+        // On a small fraction of devices /dev/urandom is not writable.
+        // Log and ignore.
+        Log.w(PRNGFixes.class.getSimpleName(),
+              "Failed to mix seed into " + URANDOM_FILE);
+      } finally {
+        mSeeded = true;
       }
     }
 
@@ -267,15 +280,10 @@ public final class PRNGFixes {
       }
     }
 
-    private OutputStream getUrandomOutputStream() {
+    private OutputStream getUrandomOutputStream() throws IOException {
       synchronized (sLock) {
         if (sUrandomOut == null) {
-          try {
-            sUrandomOut = new FileOutputStream(URANDOM_FILE);
-          } catch (IOException e) {
-            throw new SecurityException("Failed to open "
-                                            + URANDOM_FILE + " for writing", e);
-          }
+          sUrandomOut = new FileOutputStream(URANDOM_FILE);
         }
         return sUrandomOut;
       }