Skip to content

Commit

Permalink
5.0.15 release
Browse files Browse the repository at this point in the history
  • Loading branch information
kjur committed Aug 27, 2016
1 parent ca99fab commit 02a00c3
Show file tree
Hide file tree
Showing 38 changed files with 1,507 additions and 3,386 deletions.
10 changes: 9 additions & 1 deletion ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@

ChangeLog for jsrsasign

* Changes between 5.0.14 to next version
* Changes between 5.0.14 to 5.0.15 (2016-Aug-26)
- pemtojwk and jwktopkcs8 added to sample node scripts
- asn1 1.0.9 to 1.0.10
- ASN1Util.getPEMStringFromHex modified not to use
CryptoJS.
- test/qunit-do-*.html
- test case reference fix
- remove ext/{md5,ripemd160,sha1,sha256,sha512}.js,
ext/THIRDPARTY_LICENSE.pjhash.txt for
Paul Johnston's Hash Algorithm JavaScript

* Changes between 5.0.13 to 5.0.14
- keyutil 1.0.12 to 1.0.13
Expand Down
2 changes: 1 addition & 1 deletion api/files.html
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ <h2><a href="symbols/src/asn1-1.0.js.html">asn1-1.0.js</a></h2>


<dt class="heading">Version:</dt>
<dd>asn1 1.0.9 (2015-Nov-26)</dd>
<dd>asn1 1.0.10 (2016-Aug-27)</dd>



Expand Down
6 changes: 4 additions & 2 deletions api/symbols/KJUR.asn1.ASN1Util.html
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,8 @@ <h1 class="classTitle">
<div class="fixedFont">KJUR.asn1.ASN1Util.<b><a href="../symbols/KJUR.asn1.ASN1Util.html#.getPEMStringFromHex">getPEMStringFromHex</a></b>(dataHex, pemHeader)
</div>
<div class="description">get PEM string from hexadecimal data and header string
</div>
This method converts a hexadecimal string to a PEM string with
a specified header.</div>
</td>
</tr>

Expand Down Expand Up @@ -589,7 +590,8 @@ <h1 class="classTitle">
</div>
<div class="description">
get PEM string from hexadecimal data and header string

This method converts a hexadecimal string to a PEM string with
a specified header. Its line break will be CRLF("\r\n").


</div>
Expand Down
2,827 changes: 1,413 additions & 1,414 deletions api/symbols/src/asn1-1.0.js.html

Large diffs are not rendered by default.

13 changes: 6 additions & 7 deletions asn1-1.0.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*! asn1-1.0.9.js (c) 2013-2015 Kenji Urushima | kjur.github.com/jsrsasign/license
/*! asn1-1.0.10.js (c) 2013-2016 Kenji Urushima | kjur.github.com/jsrsasign/license
*/
/*
* asn1.js - ASN.1 DER encoder classes
*
* Copyright (c) 2013-2015 Kenji Urushima ([email protected])
* Copyright (c) 2013-2016 Kenji Urushima ([email protected])
*
* This software is licensed under the terms of the MIT License.
* http://kjur.github.com/jsrsasign/license
Expand All @@ -16,7 +16,7 @@
* @fileOverview
* @name asn1-1.0.js
* @author Kenji Urushima [email protected]
* @version asn1 1.0.9 (2015-Nov-26)
* @version asn1 1.0.10 (2016-Aug-27)
* @since jsrsasign 2.1
* @license <a href="http://kjur.github.io/jsrsasign/license/">MIT License</a>
*/
Expand Down Expand Up @@ -140,6 +140,8 @@ KJUR.asn1.ASN1Util = new function() {
* @param {String} pemHeader PEM header string (ex. 'RSA PRIVATE KEY')
* @return {String} PEM formatted string of input data
* @description
* This method converts a hexadecimal string to a PEM string with
* a specified header. Its line break will be CRLF("\r\n").
* @example
* var pem = KJUR.asn1.ASN1Util.getPEMStringFromHex('616161', 'RSA PRIVATE KEY');
* // value of pem will be:
Expand All @@ -148,10 +150,7 @@ KJUR.asn1.ASN1Util = new function() {
* -----END PRIVATE KEY-----
*/
this.getPEMStringFromHex = function(dataHex, pemHeader) {
//var dataB64 = hextob64(dataHex);
var ns1 = KJUR.asn1;
var dataWA = CryptoJS.enc.Hex.parse(dataHex);
var dataB64 = CryptoJS.enc.Base64.stringify(dataWA);
var dataB64 = hextob64(dataHex);
var pemBody = dataB64.replace(/(.{64})/g, "$1\r\n");
pemBody = pemBody.replace(/\r\n$/, '');
return "-----BEGIN " + pemHeader + "-----\r\n" +
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kjur-jsrsasign",
"version": "5.0.14",
"version": "5.0.15",
"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 CMS SignedData, TimeStamp, CAdES, JWS and JWT in pure JavaScript.",
"license": "MIT",
Expand Down
27 changes: 0 additions & 27 deletions ext/THIRDPARTY_LICENSE.pjhash.txt

This file was deleted.

Loading

0 comments on commit 02a00c3

Please sign in to comment.