7.1.2 release

kjur · Mar 20, 2017 · eb1cf7b · eb1cf7b
1 parent 9a76449
commit eb1cf7b
Show file tree

Hide file tree

Showing 11 changed files with 839 additions and 817 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,7 +1,17 @@
 
 ChangeLog for jsrsasign
 
-* Changes from 7.0.0 to 7.1.1 (2017-Mar-10)
+* Changes from 7.1.1 to 7.1.2 (2017-Mar-20)
+  - CRITICAL BUG FIX: KJUR.asn1.x509.AlgorithmIdentifier
+    default was wrong in algorithm parameter field.
+    For example "SHA1" AlgorithmIdentifier object
+    will be missing algorithm parameter field by
+    bug. This issue raised just only in 7.1.1 and
+    the issue was fixed.
+    - asn1x509 1.0.21 to 1.0.22
+      - AlgorithmIdentifier bug fix
+
+* Changes from 7.1.0 to 7.1.1 (2017-Mar-10)
   - CRITICAL BUG FIX: KJUR.asn1.x509.Certificate.sign() and
     KJUR.asn1.x509.X509Util.newCertPEM() have always 
     signed signatures with SHA1withRSA algorithm regardless

diff --git a/api/files.html b/api/files.html
@@ -576,7 +576,7 @@ <h2><a href="symbols/src/asn1x509-1.0.js.html">asn1x509-1.0.js</a></h2>
 
 
 						<dt class="heading">Version:</dt>
-							<dd>1.0.21 (2017-Mar-03)</dd>
+							<dd>1.0.22 (2017-Mar-20)</dd>
 
 
 

diff --git a/api/symbols/KJUR.asn1.x509.AlgorithmIdentifier.html b/api/symbols/KJUR.asn1.x509.AlgorithmIdentifier.html
@@ -528,8 +528,9 @@ <h1 class="classTitle">
 (OPTION)</li>
 <li>paramempty: set algorithm parameter to NULL by force.
 If paramempty is false, algorithm parameter will be set automatically.
-If algorithm name is "rsaEncryption" or "*withRSA" such as "SHA1withRSA", 
-algorithm parameter will be set to NULL by default.
+If paramempty is false and algorithm name is "*withDSA" or "withECDSA" parameter field of
+AlgorithmIdentifier will be ommitted otherwise
+it will be NULL by default.
 (OPTION, DEFAULT = false)</li>
 </ul>
 

diff --git a/api/symbols/src/asn1x509-1.0.js.html b/api/symbols/src/asn1x509-1.0.js.html
diff --git a/asn1x509-1.0.js b/asn1x509-1.0.js
@@ -1,4 +1,4 @@
-/*! asn1x509-1.0.21.js (c) 2013-2017 Kenji Urushima | kjur.github.com/jsrsasign/license
+/*! asn1x509-1.0.22.js (c) 2013-2017 Kenji Urushima | kjur.github.com/jsrsasign/license
  */
 /*
  * asn1x509.js - ASN.1 DER encoder classes for X.509 certificate
@@ -16,7 +16,7 @@
  * @fileOverview
  * @name asn1x509-1.0.js
  * @author Kenji Urushima kenji.urushima@gmail.com
- * @version 1.0.21 (2017-Mar-03)
+ * @version 1.0.22 (2017-Mar-20)
  * @since jsrsasign 2.1
  * @license <a href="http://kjur.github.io/jsrsasign/license/">MIT License</a>
  */
@@ -1995,8 +1995,9 @@ YAHOO.lang.extend(KJUR.asn1.x509.Time, KJUR.asn1.ASN1Object);
  * (OPTION)</li>
  * <li>paramempty: set algorithm parameter to NULL by force.
  * If paramempty is false, algorithm parameter will be set automatically.
- * If algorithm name is "rsaEncryption" or "*withRSA" such as "SHA1withRSA", 
- * algorithm parameter will be set to NULL by default.
+ * If paramempty is false and algorithm name is "*withDSA" or "withECDSA" parameter field of
+ * AlgorithmIdentifier will be ommitted otherwise
+ * it will be NULL by default.
  * (OPTION, DEFAULT = false)</li>
  * </ul>
  * @example
@@ -2042,13 +2043,16 @@ KJUR.asn1.x509.AlgorithmIdentifier = function(params) {
         }
     }
 
-    // set algorithm parameters to NULL for "*withRSA"
+    // set algorithm parameters will be ommitted for
+    // "*withDSA" or "*withECDSA" otherwise will be NULL.
     if (this.asn1Params === null &&
 	this.paramEmpty === false &&
-	this.nameAlg !== null &
-	(this.nameAlg.substr(-7, 7).toLowerCase() === "withrsa" ||
-	 this.nameAlg.toLowerCase() === "rsaencryption")) {
-        this.asn1Params = new KJUR.asn1.DERNull();
+	this.nameAlg !== null) {
+	var lcNameAlg = this.nameAlg.toLowerCase();
+	if (lcNameAlg.substr(-7, 7) !== "withdsa" &&
+	    lcNameAlg.substr(-9, 9) !== "withecdsa") {
+            this.asn1Params = new KJUR.asn1.DERNull();
+	}
     }
 };
 YAHOO.lang.extend(KJUR.asn1.x509.AlgorithmIdentifier, KJUR.asn1.ASN1Object);

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "kjur-jsrsasign",
-  "version": "7.1.1",
+  "version": "7.1.2",
   "main": "jsrsasign-latest-all-min.js",
   "description": "The 'jsrsasign' (RSA-Sign JavaScript Library) is an opensource free cryptography library supporting RSA/RSAPSS/ECDSA/DSA signing/validation, ASN.1, PKCS#1/5/8 private/public key, X.509 certificate, CRL, OCSP, CMS SignedData, TimeStamp, CAdES, JWS and JWT in pure JavaScript.",
   "license": "MIT",

diff --git a/jsrsasign-latest-all-min.js b/jsrsasign-latest-all-min.js
diff --git a/min/asn1x509-1.0.min.js b/min/asn1x509-1.0.min.js
diff --git a/npm/lib/jsrsasign.js b/npm/lib/jsrsasign.js
diff --git a/npm/package.json b/npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jsrsasign",
-  "version": "7.1.1",
+  "version": "7.1.2",
   "description": "opensource free pure JavaScript cryptographic library supports RSA/RSAPSS/ECDSA/DSA signing/validation, ASN.1, PKCS#1/5/8 private/public key, X.509 certificate, CRL, OCSP, CMS SignedData, TimeStamp and CAdES and JSON Web Signature(JWS)/Token(JWT)/Key(JWK).",
   "main": "lib/jsrsasign.js",
   "scripts": {

diff --git a/test/qunit-do-asn1x509.html b/test/qunit-do-asn1x509.html
@@ -232,6 +232,9 @@
 
   equal(new KJUR.asn1.x509.AlgorithmIdentifier({'name':'rsaEncryption'}).getEncodedHex(),
         "300d06092a864886f70d0101010500", "constructor name rsaEncryption");
+
+  equal(new KJUR.asn1.x509.AlgorithmIdentifier({'name':'sha1'}).getEncodedHex(),
+        "300906052b0e03021a0500", "constructor name sha1");
 });
 
 test("AlgorithmIdentifier SHA1withECDSA", function() {