node-forge 0.7.2 → 0.7.6

package/lib/form.js

@@ -17,7 +17,7 @@ var form = module.exports = forge.form = forge.form || {};
 /**
  * Regex for parsing a single name property (handles array brackets).
  */
-var _regex = /(.*?)\[(.*?)\]/g;
+var _regex = /([^\[]*?)\[(.*?)\]/g;
 
 /**
  * Parses a single name property into an array with the name and any

package/lib/index.js

@@ -12,6 +12,7 @@ require('./asn1');
 require('./cipher');
 require('./debug');
 require('./des');
+require('./ed25519');
 require('./hmac');
 require('./kem');
 require('./log');

package/lib/pkcs7.js

@@ -328,8 +328,11 @@ p7.createSignedData = function() {
 
     /**
      * Signs the content.
+     * @param options Options to apply when signing:
+     *    [detached] boolean. If signing should be done in detached mode. Defaults to false.
      */
-    sign: function() {
+    sign: function(options) {
+      options = options || {};
       // auto-generate content info
       if(typeof msg.content !== 'object' || msg.contentInfo === null) {
         // use Data ContentInfo
@@ -349,12 +352,16 @@ p7.createSignedData = function() {
             content = forge.util.encodeUtf8(msg.content);
           }
 
-          msg.contentInfo.value.push(
-            // [0] EXPLICIT content
-            asn1.create(asn1.Class.CONTEXT_SPECIFIC, 0, true, [
-              asn1.create(asn1.Class.UNIVERSAL, asn1.Type.OCTETSTRING, false,
-                content)
-            ]));
+          if (options.detached) {
+            msg.detachedContent = asn1.create(asn1.Class.UNIVERSAL, asn1.Type.OCTETSTRING, false, content);
+          } else {
+            msg.contentInfo.value.push(
+              // [0] EXPLICIT content
+              asn1.create(asn1.Class.CONTEXT_SPECIFIC, 0, true, [
+                asn1.create(asn1.Class.UNIVERSAL, asn1.Type.OCTETSTRING, false,
+                  content)
+              ]));
+          }
         }
       }
 
@@ -437,10 +444,22 @@ p7.createSignedData = function() {
   }
 
   function addSignerInfos(mds) {
-    // Note: ContentInfo is a SEQUENCE with 2 values, second value is
-    // the content field and is optional for a ContentInfo but required here
-    // since signers are present
-    if(msg.contentInfo.value.length < 2) {
+    var content;
+
+    if (msg.detachedContent) {
+      // Signature has been made in detached mode.
+      content = msg.detachedContent;
+    } else {
+      // Note: ContentInfo is a SEQUENCE with 2 values, second value is
+      // the content field and is optional for a ContentInfo but required here
+      // since signers are present
+      // get ContentInfo content
+      content = msg.contentInfo.value[1];
+      // skip [0] EXPLICIT content wrapper
+      content = content.value[0];
+    }
+
+    if(!content) {
       throw new Error(
         'Could not sign PKCS#7 message; there is no content to sign.');
     }
@@ -448,11 +467,6 @@ p7.createSignedData = function() {
     // get ContentInfo content type
     var contentType = asn1.derToOid(msg.contentInfo.value[0].value);
 
-    // get ContentInfo content
-    var content = msg.contentInfo.value[1];
-    // skip [0] EXPLICIT content wrapper
-    content = content.value[0];
-
     // serialize content
     var bytes = asn1.toDer(content);
 

package/lib/util.js

@@ -3,17 +3,20 @@
  *
  * @author Dave Longley
  *
- * Copyright (c) 2010-2014 Digital Bazaar, Inc.
+ * Copyright (c) 2010-2018 Digital Bazaar, Inc.
  */
 var forge = require('./forge');
+var baseN = require('./baseN');
 
 /* Utilities API */
 var util = module.exports = forge.util = forge.util || {};
 
 // define setImmediate and nextTick
 (function() {
-  // use native nextTick
-  if(typeof process !== 'undefined' && process.nextTick) {
+  // use native nextTick (unless we're in webpack)
+  // webpack (or better node-libs-browser polyfill) sets process.browser.
+  // this way we can detect webpack properly
+  if(typeof process !== 'undefined' && process.nextTick && !process.browser) {
     util.nextTick = process.nextTick;
     if(typeof setImmediate === 'function') {
       util.setImmediate = setImmediate;
@@ -159,14 +162,18 @@ function ByteStringBuffer(b) {
   if(typeof b === 'string') {
     this.data = b;
   } else if(util.isArrayBuffer(b) || util.isArrayBufferView(b)) {
-    // convert native buffer to forge buffer
-    // FIXME: support native buffers internally instead
-    var arr = new Uint8Array(b);
-    try {
-      this.data = String.fromCharCode.apply(null, arr);
-    } catch(e) {
-      for(var i = 0; i < arr.length; ++i) {
-        this.putByte(arr[i]);
+    if(typeof Buffer !== 'undefined' && b instanceof Buffer) {
+      this.data = b.toString('binary');
+    } else {
+      // convert native buffer to forge buffer
+      // FIXME: support native buffers internally instead
+      var arr = new Uint8Array(b);
+      try {
+        this.data = String.fromCharCode.apply(null, arr);
+      } catch(e) {
+        for(var i = 0; i < arr.length; ++i) {
+          this.putByte(arr[i]);
+        }
       }
     }
   } else if(b instanceof ByteStringBuffer ||
@@ -1541,6 +1548,9 @@ var _base64Idx = [
    39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51
 ];
 
+// base58 characters (Bitcoin alphabet)
+var _base58 = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
+
 /**
  * Base64 encodes a 'binary' encoded string of bytes.
  *
@@ -1646,7 +1656,12 @@ util.decodeUtf8 = function(str) {
 util.binary = {
   raw: {},
   hex: {},
-  base64: {}
+  base64: {},
+  base58: {},
+  baseN : {
+    encode: baseN.encode,
+    decode: baseN.decode
+  }
 };
 
 /**
@@ -1803,9 +1818,15 @@ util.binary.base64.decode = function(input, output, offset) {
   }
 
   // make sure result is the exact decoded length
-  return output ?
-         (j - offset) :
-         out.subarray(0, j);
+  return output ? (j - offset) : out.subarray(0, j);
+};
+
+// add support for base58 encoding/decoding with Bitcoin alphabet
+util.binary.base58.encode = function(input, maxline) {
+  return util.binary.baseN.encode(input, _base58, maxline);
+};
+util.binary.base58.decode = function(input, maxline) {
+  return util.binary.baseN.decode(input, _base58, maxline);
 };
 
 // text encoding/decoding tools

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-forge",
-  "version": "0.7.2",
+  "version": "0.7.6",
   "description": "JavaScript implementations of network transports, cryptography, ciphers, PKI, message digests, and various utilities.",
   "homepage": "https://github.com/digitalbazaar/forge",
   "author": {
@@ -34,11 +34,11 @@
     "karma-sauce-launcher": "^1.2.0",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-tap-reporter": "0.0.6",
-    "karma-webpack": "^2.0.12",
+    "karma-webpack": "^2.0.13",
     "mocha": "^5.0.1",
     "mocha-lcov-reporter": "^1.2.0",
     "nodejs-websocket": "^1.7.1",
-    "nyc": "^11.4.1",
+    "nyc": "^11.5.0",
     "opts": "^1.2.2",
     "webpack": "^3.11.0"
   },