From e1fcc51d0eeacead3d5e2f9ae8cd0d448755fe02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Obernd=C3=B6rfer?= <toberndo@yarkon.de>
Date: Wed, 12 Mar 2014 21:24:52 +0100
Subject: [PATCH] OP-01-015 EME-PKCS1-v1_5 padding uses Math.random()
 (Critical)

---
 src/crypto/pkcs1.js  | 25 +++++++++++++++++++++----
 src/crypto/random.js | 10 ----------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/crypto/pkcs1.js b/src/crypto/pkcs1.js
index a311c627..88083a8c 100644
--- a/src/crypto/pkcs1.js
+++ b/src/crypto/pkcs1.js
@@ -28,7 +28,7 @@
 /**
  * ASN1 object identifiers for hashes (See {@link http://tools.ietf.org/html/rfc4880#section-5.2.2})
  */
-hash_headers = [];
+var hash_headers = [];
 hash_headers[1] = [0x30, 0x20, 0x30, 0x0c, 0x06, 0x08, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x02, 0x05, 0x05, 0x00, 0x04,
     0x10
 ];
@@ -53,6 +53,25 @@ var crypto = require('./crypto.js'),
   BigInteger = require('./public_key/jsbn.js'),
   hash = require('./hash');
 
+/**
+ * Create padding with secure random data
+ * @private
+ * @param  {Integer} length Length of the padding in bytes
+ * @return {String}        Padding as string
+ */
+function getPkcs1Padding(length) {
+  var result = '';
+  var randomByte;
+  while (result.length < length) {
+    randomByte = random.getSecureRandomOctet();
+    if (randomByte !== 0) {
+      result += String.fromCharCode(randomByte);
+    }
+  }
+  return result;
+}
+
+
 module.exports = {
   eme: {
     /**
@@ -67,9 +86,7 @@ module.exports = {
       var result = "";
       result += String.fromCharCode(0);
       result += String.fromCharCode(2);
-      for (var i = 0; i < length - message.length - 3; i++) {
-        result += String.fromCharCode(random.getPseudoRandom(1, 255));
-      }
+      result += getPkcs1Padding(length - message.length - 3);
       result += String.fromCharCode(0);
       result += message;
       return result;
diff --git a/src/crypto/random.js b/src/crypto/random.js
index cbe76bd5..d81eba55 100644
--- a/src/crypto/random.js
+++ b/src/crypto/random.js
@@ -43,16 +43,6 @@ module.exports = {
     return result;
   },
 
-  /**
-   * Return a pseudo-random number in the specified range
-   * @param {Integer} from Min of the random number
-   * @param {Integer} to Max of the random number (max 32bit)
-   * @return {Integer} A pseudo random number
-   */
-  getPseudoRandom: function(from, to) {
-    return Math.round(Math.random() * (to - from)) + from;
-  },
-
   /**
    * Return a secure random number in the specified range
    * @param {Integer} from Min of the random number