10.1.5 release

kjur · Jan 17, 2021 · 6a21d96 · 6a21d96
1 parent 373b150
commit 6a21d96
Show file tree

Hide file tree

Showing 26 changed files with 3,495 additions and 3,238 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,8 +1,26 @@
 
 ChangeLog for jsrsasign
 
-* Changes from 10.1.4 to next release
-  - crypto.js
+CAdES-T support update and fix
+* Changes from 10.1.4 to 10.1.5 release (2021-01-17)
+  - tool/tool_cades.html fix (#465)
+    - now works fine again for CAdES-T demo
+  - src/asn1cms.js
+    - SignerInfo class
+      - unsigned attribute support again
+    - Attribute class 
+      - add signaturePolicyIdentifier support
+      - add signatureTimeStamp support
+    - CMSParser class
+      - add signaturePolicyIdentifier support
+      - add setSignaturePolicyIdentifier method
+  - src/asn1cades.js
+    - CAdESUtil class
+      - parseSignedDataForAddingUnsigned modified to use CMSParser
+      - addSigTS removed since it was empty method
+      - parseSignerInfoForAddingUnsigned is deprecated since
+        parseSignedDataForAddingUnsigned will not call it.
+  - src/crypto.js
     - Mac API document fix (#466)
 
 getPKIStatusInfo bugfix

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,7 +1,7 @@
 
 The 'jsrsasign'(RSA-Sign JavaScript Library) License
 
-Copyright (c) 2010-2020 Kenji Urushima
+Copyright (c) 2010-2021 Kenji Urushima
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -138,5 +138,3 @@ https://github.com/bitcoinjs/bitcoinjs-lib
 LICENSE: MIT License
 FILES: src/ecdsa-modified.js src/ec-patch.js
 ----
-
-
diff --git a/Makefile b/Makefile
@@ -41,7 +41,7 @@ ext/%-min.js: ext/%.js
 	yuicmp $^ -o $@
 
 gitadd-all-doc:
-	git add api/*.html api/symbols/*.html api/symbols/src/*.html
+	git add api/*.html api/symbols/*.html api/symbols/src/*.html LICENSE.txt
 
 gitadd-release:
 	git add ChangeLog.txt Makefile bower.json jsrsasign-*-min.js min/*.js src/*.js npm/package.json npm/lib/jsrsasign*.js npm/lib/{header,footer,lib}.js src/*.js test/qunit-do-*.html test/x509crl.html README.md npm/README.md tool/*.html npm_util/*.* npm_util/lib/*.* npm/test/t_*.js

diff --git a/api/files.html b/api/files.html
@@ -540,7 +540,7 @@ <h2><a href="symbols/src/asn1cades-1.0.js.html">asn1cades-1.0.js</a></h2>
 
 
 						<dt class="heading">Version:</dt>
-							<dd>jsrsasign 10.0.0 asn1cades 2.0.0 (2020-Sep-22)</dd>
+							<dd>jsrsasign 10.0.5 asn1cades 2.0.1 (2021-Jan-17)</dd>
 
 
 
@@ -559,7 +559,7 @@ <h2><a href="symbols/src/asn1cms-1.0.js.html">asn1cms-1.0.js</a></h2>
 
 
 						<dt class="heading">Version:</dt>
-							<dd>jsrsasign 10.1.2 asn1cms 2.0.3 (2020-Nov-21)</dd>
+							<dd>jsrsasign 10.1.5 asn1cms 2.0.4 (2021-Jan-17)</dd>
 
 
 

diff --git a/api/symbols/KJUR.asn1.cades.CAdESUtil.html b/api/symbols/KJUR.asn1.cades.CAdESUtil.html
@@ -589,7 +589,7 @@ <h1 class="classTitle">
 							<td class="nameDescription">
 								<div class="fixedFont">KJUR.asn1.cades.CAdESUtil.<b><a href="../symbols/KJUR.asn1.cades.CAdESUtil.html#.parseSignerInfoForAddingUnsigned">parseSignerInfoForAddingUnsigned</a></b>(hex)
 								</div>
-								<div class="description">parse SignerInfo to add unsigned attributes
+								<div class="description">parse SignerInfo to add unsigned attributes (DEPRECATED)
 This method will parse a hexadecimal string of 
 SignerInfo to add a attribute
 to unsigned attributes field in a signerInfo field.</div>
@@ -661,25 +661,27 @@ <h1 class="classTitle">
 This method will parse a hexadecimal string of 
 ContentInfo with CMS SignedData to add a attribute
 to unsigned attributes field in a signerInfo field.
-Parsed result will be an associative array which has
-following properties:
-<ul>
-<li>version - hex of CMSVersion ASN.1 TLV</li>
-<li>algs - hex of DigestAlgorithms ASN.1 TLV</li>
-<li>encapcontent - hex of EncapContentInfo ASN.1 TLV</li>
-<li>certs - hex of Certificates ASN.1 TLV</li>
-<li>revs - hex of RevocationInfoChoices ASN.1 TLV</li>
-<li>si[] - array of SignerInfo properties</li>
-<li>obj - parsed KJUR.asn1.cms.SignedData object</li>
-</ul>
 
 
 					</div>
 
 
 
-					<pre class="code">info = KJUR.asn1.cades.CAdESUtil.parseSignedDataForAddingUnsigned(beshex);
-sd = info.obj;</pre>
+					<pre class="code">param = KJUR.asn1.cades.CAdESUtil.parseSignedDataForAddingUnsigned(beshex);
+&rarr;
+{
+  version: 1,
+  hashalgs: ["sha256"],
+  econtent: ...,
+  sinfos: [{
+    version: 1
+    id: ...
+    hashalg: "sha256",
+    sattrs: {array: [...]},
+    sigalg: "SHA256withRSA",
+    sighex: ...
+  }]
+}</pre>
 
 
 
@@ -708,6 +710,15 @@ <h1 class="classTitle">
 
 
 
+							<dl class="detailList">
+							<dt class="heading">See:</dt>
+
+								<dd><a href="../symbols/KJUR.asn1.cms.CMSParser.html#getCMSSignedData">KJUR.asn1.cms.CMSParser#getCMSSignedData</a></dd>
+
+								<dd><a href="../symbols/KJUR.asn1.cms.SignedData.html">KJUR.asn1.cms.SignedData</a></dd>
+
+							</dl>
+
 
 					<hr />
 
@@ -719,7 +730,7 @@ <h1 class="classTitle">
 
 					</div>
 					<div class="description">
-						parse SignerInfo to add unsigned attributes
+						parse SignerInfo to add unsigned attributes (DEPRECATED)
 This method will parse a hexadecimal string of 
 SignerInfo to add a attribute
 to unsigned attributes field in a signerInfo field.
@@ -757,6 +768,13 @@ <h1 class="classTitle">
 							</dl>
 
 
+							<dl class="detailList">
+							<dt class="heading">Deprecated:</dt>
+							<dt>
+								since jsrsasign 10.1.5 no more necessary becase parseSignedDataForAddingUnsigned don't call this
+							</dt>
+							</dl>
+
 
 
 

diff --git a/api/symbols/KJUR.asn1.cades.SignaturePolicyIdentifier.html b/api/symbols/KJUR.asn1.cades.SignaturePolicyIdentifier.html
@@ -659,6 +659,8 @@ <h1 class="classTitle">
 
 							<dd><a href="../symbols/KJUR.asn1.cms.AttributeList.html">KJUR.asn1.cms.AttributeList</a></dd>
 
+							<dd><a href="../symbols/KJUR.asn1.cms.CMSParser.html#setSignaturePolicyIdentifier">KJUR.asn1.cms.CMSParser#setSignaturePolicyIdentifier</a></dd>
+
 							<dd><a href="../symbols/KJUR.asn1.cades.SignaturePolicyId.html">KJUR.asn1.cades.SignaturePolicyId</a></dd>
 
 							<dd><a href="../symbols/KJUR.asn1.cades.OtherHashAlgAndValue.html">KJUR.asn1.cades.OtherHashAlgAndValue</a></dd>

diff --git a/api/symbols/KJUR.asn1.cms.AttributeList.html b/api/symbols/KJUR.asn1.cms.AttributeList.html
@@ -617,7 +617,8 @@ <h1 class="classTitle">
   array: [{
     attr: "contentType",
     type: "data"
-  }]
+  }],
+  sortflag: false
 })</pre>
 
 

diff --git a/api/symbols/KJUR.asn1.cms.CMSParser.html b/api/symbols/KJUR.asn1.cms.CMSParser.html
@@ -781,6 +781,18 @@ <h1 class="classTitle">
 							</td>
 						</tr>
 
+						<tr>
+							<td class="attributes">&nbsp;</td>
+							<td class="nameDescription">
+								<div class="fixedFont"><b><a href="../symbols/KJUR.asn1.cms.CMSParser.html#setSignaturePolicyIdentifier">setSignaturePolicyIdentifier</a></b>(pAttr)
+								</div>
+								<div class="description">set SignaturePolicyIdentifier attribute<br/>
+This sets an attribute as SignaturePolicyIdentifier defined in
+<a href="https://tools.ietf.org/html/rfc5126#section-5.8.1">
+RFC 5126 CAdES section 5.8.1</a>.</div>
+							</td>
+						</tr>
+
 						<tr>
 							<td class="attributes">&nbsp;</td>
 							<td class="nameDescription">
@@ -2017,6 +2029,75 @@ <h1 class="classTitle">
 							</dl>
 
 
+					<hr />
+
+					<a name="setSignaturePolicyIdentifier"> </a>
+					<div class="fixedFont">
+
+
+					<b>setSignaturePolicyIdentifier</b>(pAttr)
+
+					</div>
+					<div class="description">
+						set SignaturePolicyIdentifier attribute<br/>
+This sets an attribute as SignaturePolicyIdentifier defined in
+<a href="https://tools.ietf.org/html/rfc5126#section-5.8.1">
+RFC 5126 CAdES section 5.8.1</a>.
+
+
+					</div>
+
+
+
+					<pre class="code">parser = new KJUR.asn1.cms.CMSParser();
+pAttr = {
+  attr: "signaturePolicyIdentifier"
+  valhex: '...'
+};
+parser.setSignaturePolicyIdentifier(pAttr);
+pAttr &rarr; {
+  attr: "signaturePolicyIdentifier",
+  oid: "1.2.3.4.5",
+  alg: "sha1",
+  hash: "1a2b..."
+}</pre>
+
+
+
+
+							<dl class="detailList">
+							<dt class="heading">Parameters:</dt>
+
+								<dt>
+									<span class="light fixedFont">{Array}</span> <b>pAttr</b>
+
+								</dt>
+								<dd>JSON object of attribute parameter</dd>
+
+							</dl>
+
+
+
+							<dl class="detailList">
+							<dt class="heading">Since:</dt>
+								<dd>jsrsasign 10.1.5 asn1cms 2.0.4</dd>
+							</dl>
+							</dl>
+
+
+
+
+
+							<dl class="detailList">
+							<dt class="heading">See:</dt>
+
+								<dd><a href="../symbols/KJUR.asn1.cms.CMSParser.html#getAttribute">KJUR.asn1.cms.CMSParser#getAttribute</a></dd>
+
+								<dd><a href="../symbols/KJUR.asn1.cades.SignaturePolicyIdentifier.html">KJUR.asn1.cades.SignaturePolicyIdentifier</a></dd>
+
+							</dl>
+
+
 					<hr />
 
 					<a name="setSigningCertificate"> </a>