10.1.11 release

kjur · Feb 19, 2021 · cb31c13 · cb31c13
1 parent dbd30e0
commit cb31c13
Show file tree

Hide file tree

Showing 16 changed files with 3,100 additions and 3,016 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,9 +1,13 @@
 
 ChangeLog for jsrsasign
 
-TBD
-* Changes from 10.1.10 to next release (2021-xx-xx)
-  - src/nodeutil.js
+update X509.getVersion and add jsrsasign-util saveFileJSON
+* Changes from 10.1.10 to 10.1.11 (2021-02-19)
+  - src/x509.js
+    - X509.getVersion supports other than 
+      empty(DEFAULT =v1) and [0] {INTEGER 2} (=v3).
+      Thus version checking is relaxed. (#471)
+  - src/nodeutil.js (jsrsasign-util 1.0.4)
     - add saveFileUTF8
     - saveFileJSON API document fix
 

diff --git a/api/files.html b/api/files.html
@@ -827,7 +827,7 @@ <h2><a href="symbols/src/nodeutil-1.0.js.html">nodeutil-1.0.js</a></h2>
 
 
 						<dt class="heading">Version:</dt>
-							<dd>jsrsasign-util 1.0.1 nodeutil 1.0.1 (2020-Oct-23)</dd>
+							<dd>jsrsasign-util 1.0.3 nodeutil 1.0.2 (2021-Feb-15)</dd>
 
 
 

diff --git a/api/symbols/global__.html b/api/symbols/global__.html
@@ -990,6 +990,16 @@ <h1 class="classTitle">
 							</td>
 						</tr>
 
+						<tr>
+							<td class="attributes">&nbsp;</td>
+							<td class="nameDescription">
+								<div class="fixedFont"><b><a href="../symbols/global__.html#saveFileUTF8">saveFileUTF8</a></b>(binFile, utf8String)
+								</div>
+								<div class="description">save UTF-8 string to file
+This function only works in Node.js.</div>
+							</td>
+						</tr>
+
 						<tr>
 							<td class="attributes">&nbsp;</td>
 							<td class="nameDescription">
@@ -3625,7 +3635,7 @@ <h1 class="classTitle">
 
 
 					<pre class="code">var rsu = require("jsrsasign-util");
-rsu.saveJSONC("aaa.jsonc", json);</pre>
+rsu.saveFileJSON("aaa.jsonc", json);</pre>
 
 
 
@@ -3660,6 +3670,52 @@ <h1 class="classTitle">
 
 
 
+					<hr />
+
+					<a name="saveFileUTF8"> </a>
+					<div class="fixedFont">
+
+
+					<b>saveFileUTF8</b>(binFile, utf8String)
+
+					</div>
+					<div class="description">
+						save UTF-8 string to file
+This function only works in Node.js.
+
+							<br />
+							<i>Defined in: </i> <a href="../symbols/src/nodeutil-1.0.js.html">nodeutil-1.0.js</a>.
+
+
+					</div>
+
+
+
+
+							<dl class="detailList">
+							<dt class="heading">Parameters:</dt>
+
+								<dt>
+									<span class="light fixedFont">{String}</span> <b>binFile</b>
+
+								</dt>
+								<dd>file name to save contents.</dd>
+
+								<dt>
+									<span class="light fixedFont">{String}</span> <b>utf8String</b>
+
+								</dt>
+								<dd>string contents to be saved.</dd>
+
+							</dl>
+
+
+
+
+
+
+
+
 					<hr />
 
 					<a name="stob64"> </a>

diff --git a/api/symbols/src/nodeutil-1.0.js.html b/api/symbols/src/nodeutil-1.0.js.html
diff --git a/api/symbols/src/x509-1.1.js.html b/api/symbols/src/x509-1.1.js.html
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "kjur-jsrsasign",
-  "version": "10.1.10",
+  "version": "10.1.11",
   "main": "jsrsasign-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-all-min.js b/jsrsasign-all-min.js
diff --git a/jsrsasign-jwths-min.js b/jsrsasign-jwths-min.js
diff --git a/jsrsasign-rsa-min.js b/jsrsasign-rsa-min.js
diff --git a/min/x509-1.1.min.js b/min/x509-1.1.min.js
diff --git a/npm/lib/jsrsasign-all-min.js b/npm/lib/jsrsasign-all-min.js
diff --git a/npm/lib/jsrsasign-jwths-min.js b/npm/lib/jsrsasign-jwths-min.js
diff --git a/npm/lib/jsrsasign-rsa-min.js b/npm/lib/jsrsasign-rsa-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": "10.1.10",
+  "version": "10.1.11",
   "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/src/x509-1.1.js b/src/x509-1.1.js
@@ -107,6 +107,7 @@ function X509(params) {
 	_getIdxbyList = _ASN1HEX.getIdxbyList,
 	_getIdxbyListEx = _ASN1HEX.getIdxbyListEx,
 	_getVidx = _ASN1HEX.getVidx,
+	_getInt = _ASN1HEX.getInt,
 	_oidname = _ASN1HEX.oidname,
 	_hextooidstr = _ASN1HEX.hextooidstr,
 	_X509 = X509,
@@ -150,15 +151,20 @@ function X509(params) {
 	if (this.hex === null || this.version !== 0) return this.version;
 
 	// check if the first item of tbsCertificate "[0] { INTEGER 2 }"
-	if (_getTLVbyList(this.hex, 0, [0, 0]) !==
-	    "a003020102") {
+	var hFirstObj = _getTLVbyList(this.hex, 0, [0, 0]);
+	if (hFirstObj.substr(0, 2) == "a0") {
+	    var hVersionTLV = _getTLVbyList(hFirstObj, 0, [0]);
+	    var iVersion = _getInt(hVersionTLV, 0);
+	    if (iVersion < 0 || 2 < iVersion) {
+		throw new Error("malformed version field");
+	    }
+	    this.version = iVersion + 1;
+	    return this.version;
+	} else {
 	    this.version = 1;
 	    this.foffset = -1;
 	    return 1;
 	}
-
-	this.version = 3;
-	return 3;
     };
 
     /**
Original file line number	Diff line number	Diff line change
Expand Up		@@ -827,7 +827,7 @@ <h2><a href="symbols/src/nodeutil-1.0.js.html">nodeutil-1.0.js</a></h2>


		<dt class="heading">Version:</dt>
		<dd>jsrsasign-util 1.0.1 nodeutil 1.0.1 (2020-Oct-23)</dd>
		<dd>jsrsasign-util 1.0.3 nodeutil 1.0.2 (2021-Feb-15)</dd>



Expand Down