Skip to content

Commit

Permalink
comment update
Browse files Browse the repository at this point in the history
  • Loading branch information
kjur committed Jun 18, 2020
1 parent 12fdf1b commit 108c7df
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 7 deletions.
4 changes: 4 additions & 0 deletions ChangeLog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
ChangeLog for jsrsasign

* Changes from 8.0.16 to next version
- src/asn1x509.js
- allow alternative algorithms to sign CRLs (#440)
- src/asn1cms.js
- improve CMSUtil.newSignedData helper with detached signatures (#441)
- sample_node
- pemtobin was fixed for pemtohex function

Expand Down
26 changes: 23 additions & 3 deletions src/asn1cms-1.0.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* asn1cms-1.0.5.js (c) 2013-2017 Kenji Urushima | kjur.github.io/jsrsasign/license
/* asn1cms-1.0.6.js (c) 2013-2020 Kenji Urushima | kjur.github.io/jsrsasign/license
*/
/*
* asn1cms.js - ASN.1 DER encoder and verifier classes for Cryptographic Message Syntax(CMS)
*
* Copyright (c) 2013-2017 Kenji Urushima ([email protected])
* Copyright (c) 2013-2020 Kenji Urushima ([email protected])
*
* This software is licensed under the terms of the MIT License.
* https://kjur.github.io/jsrsasign/license
Expand All @@ -16,7 +16,7 @@
* @fileOverview
* @name asn1cms-1.0.js
* @author Kenji Urushima [email protected]
* @version 1.0.5 (2017-Sep-15)
* @version jsrsasign 8.0.17 asn1cms 1.0.6 (2020-Jun-19)
* @since jsrsasign 4.2.4
* @license <a href="https://kjur.github.io/jsrsasign/license/">MIT License</a>
*/
Expand Down Expand Up @@ -983,6 +983,26 @@ KJUR.asn1.cms.CMSUtil = new function() {
* @description
* This method provides more easy way to genereate
* CMS SignedData ASN.1 structure by JSON data.
* <br>
* Here is major parameters:
* <ul>
* <li>content - to specify data to be signed in eContent field.</li>
* <li>certs - a list of certificate PEM strings to specify
* certificate field</li>
* <li>detached - 'true' or 'false' to specify detached signature or not.
* The default is 'false'</li>
* <li>signerInfos - array of signerInfo parameters.
* SignerInfo parameters listed here:
* <ul>
* <li>hashAlg - string of messageDigest hash algorithm name</li>
* <li>sAttr - list of signedAttribute parameters</li>
* <li>signerCert - string of signer certificate PEM</li>
* <li>sigAlg - string of signature algorithm name</li>
* <li>signerPrvKey - string of PEM signer private key</li>
* </ul>
* </li>
* </ul>
*
* @example
* var sd = KJUR.asn1.cms.CMSUtil.newSignedData({
* content: {str: "jsrsasign"},
Expand Down
7 changes: 3 additions & 4 deletions src/asn1x509-1.0.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* asn1x509-1.1.8.js (c) 2013-2020 Kenji Urushima | kjur.github.com/jsrsasign/license
/* asn1x509-1.1.9.js (c) 2013-2020 Kenji Urushima | kjur.github.com/jsrsasign/license
*/
/*
* asn1x509.js - ASN.1 DER encoder classes for X.509 certificate
Expand All @@ -16,7 +16,7 @@
* @fileOverview
* @name asn1x509-1.0.js
* @author Kenji Urushima [email protected]
* @version jsrsasign 8.0.16 asn1x509 1.1.8 (2020-May-25)
* @version jsrsasign 8.0.17 asn1x509 1.1.9 (2020-Jun-19)
* @since jsrsasign 2.1
* @license <a href="https://kjur.github.io/jsrsasign/license/">MIT License</a>
*/
Expand Down Expand Up @@ -1337,8 +1337,7 @@ YAHOO.lang.extend(KJUR.asn1.x509.IssuerAltName, KJUR.asn1.x509.Extension);
* NOTE: 'params' can be omitted.
* <h4>EXAMPLE</h4>
* @example
* var prvKey = new RSAKey(); // CA's private key
* prvKey.readPrivateKeyFromASN1HexString("3080...");
* var prvKey = KEYUTIL.getKEY("-----BEGIN PRIVATE..."); // CA's private key
* var crl = new KJUR.asn1x509.CRL({'tbsobj': tbs, 'prvkeyobj': prvKey});
* crl.sign(); // issue CRL by CA's private key
* var hCRL = crl.getEncodedHex();
Expand Down

0 comments on commit 108c7df

Please sign in to comment.