Fix style.

Fix indentation, only use ascii, and align code style.

Author: davidlehn

lib/asn1.js

@@ -1185,69 +1185,69 @@ asn1.validate = function(obj, v, capture, errors) {
  if(obj.constructed === v.constructed ||
  typeof(v.constructed) === 'undefined') {
  rval = true;
-// Replace existing inner loop with this code
-if (v.value && forge.util.isArray(v.value)) {
- var j = 0;
- for (var i = 0; rval && i < v.value.length; ++i) {
- var schemaItem = v.value[i];
- rval = schemaItem.optional || false;
-
- // current child in the object
- var objChild = obj.value[j];
-
- // if there is no child left to match
- if (!objChild) {
- // if optional, ok (rval already true), else fail below
- if (!schemaItem.optional) {
- rval = false;
- if (errors) {
- errors.push('[' + v.name + '] missing required element: expected tagClass "' +
-  schemaItem.tagClass + '", type "' + schemaItem.type + '"');
- }
- }
- continue;
- }
+ // Replace existing inner loop with this code
+ if(v.value && forge.util.isArray(v.value)) {
+  var j = 0;
+  for(var i = 0; rval && i < v.value.length; ++i) {
+  var schemaItem = v.value[i];
+  rval = schemaItem.optional || false;
+
+  // current child in the object
+  var objChild = obj.value[j];
+
+  // if there is no child left to match
+  if(!objChild) {
+  // if optional, ok (rval already true), else fail below
+  if(!schemaItem.optional) {
+  rval = false;
+  if(errors) {
+  errors.push('[' + v.name + '] missing required element: expected tagClass "' +
+ schemaItem.tagClass + '", type "' + schemaItem.type + '"');
+  }
+  }
+  continue;
+  }
 
- // If schema explicitly specifies tagClass/type, do a quick structural check
- // to avoid unnecessary recursion/side-effects when tags clearly don't match.
- var schemaHasTag = (typeof schemaItem.tagClass !== 'undefined' &&
- typeof schemaItem.type !== 'undefined');
-
- if (schemaHasTag &&
- (objChild.tagClass !== schemaItem.tagClass || objChild.type !== schemaItem.type)) {
- // Tags do not match.
- if (schemaItem.optional) {
- // Skip this schema element (don't consume objChild; don't call recursive validate).
- rval = true;
- continue;
- } else {
- // Required schema item mismatched — fail.
- rval = false;
- if (errors) {
- errors.push('[' + v.name + '] Tag mismatch: expected (' +
- schemaItem.tagClass + ',' + schemaItem.type + ') got (' +
- objChild.tagClass + ',' + objChild.type + ')');
+ // If schema explicitly specifies tagClass/type, do a quick structural check
+ // to avoid unnecessary recursion/side-effects when tags clearly don't match.
+ var schemaHasTag = (typeof schemaItem.tagClass !== 'undefined' &&
+ typeof schemaItem.type !== 'undefined');
+
+ if(schemaHasTag &&
+ (objChild.tagClass !== schemaItem.tagClass || objChild.type !== schemaItem.type)) {
+ // Tags do not match.
+ if(schemaItem.optional) {
+ // Skip this schema element (don't consume objChild; don't call recursive validate).
+ rval = true;
+ continue;
+ } else {
+ // Required schema item mismatched - fail.
+ rval = false;
+ if(errors) {
+ errors.push('[' + v.name + '] Tag mismatch: expected (' +
+ schemaItem.tagClass + ',' + schemaItem.type + ') got (' +
+ objChild.tagClass + ',' + objChild.type + ')');
+ }
+ break;
+ }
+ }
+
+ // Tags are compatible (or schema did not declare tags) - dive into recursive validate.
+ var childRval = asn1.validate(objChild, schemaItem, capture, errors);
+ if(childRval) {
+ ++j; // consume this child
+ rval = true;
+ } else if(schemaItem.optional) {
+ // validation failed but element is optional => skip schema item (don't consume child)
+ rval = true;
+ } else {
+ // required item failed
+ rval = false;
+ // errors should already be populated by recursive call; keep failing
+ break;
+ }
  }
- break;
  }
- }
-
- // Tags are compatible (or schema did not declare tags) — dive into recursive validate.
- var childRval = asn1.validate(objChild, schemaItem, capture, errors);
- if (childRval) {
- ++j; // consume this child
- rval = true;
- } else if (schemaItem.optional) {
- // validation failed but element is optional => skip schema item (don't consume child)
- rval = true;
- } else {
- // required item failed
- rval = false;
- // errors should already be populated by recursive call; keep failing
- break;
- }
- }
-}
 
  if(rval && capture) {
  if(v.capture) {

lib/pkcs12.js

@@ -474,7 +474,7 @@ p12.pkcs12FromAsn1 = function(obj, strict, password) {
  if(macValue.getBytes() !== capture.macDigest) {
  throw new Error('PKCS#12 MAC could not be verified. Invalid password?');
  }
- } else if (Array.isArray(obj.value) && obj.value.length > 2) {
+ } else if(Array.isArray(obj.value) && obj.value.length > 2) {
  /* This is pfx data that should ahve mac and verify macDigest */
  throw new Error('Invalid PKCS#12. macData field present but MAC was not validated.');
  }