5.0.7 release

kjur · Mar 5, 2016 · 147bf3b · 147bf3b
1 parent 274dbc8
commit 147bf3b
Show file tree

Hide file tree

Showing 14 changed files with 596 additions and 183 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,8 +1,12 @@
 
 ChangeLog for jsrsasign
 
-* Changes between 5.0.6 to next version
+* Changes between 5.0.6 to 5.0.7 (2016-Mar-05)
   - tool_csr.html fix for subject parameter.
+  - jsrsasign-latest-all-min wrong order in concatination.
+    This raise wrong PKCS#5/8 encrypted PEM private key 
+    generation in KEYUTIL.getPEM().
+  - sample_node/asn1extract added
 
 * Changes between 5.0.5 to 5.0.6 (2016-Feb-28)
   - bower.json name space fix

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "kjur-jsrsasign",
-  "version": "5.0.6",
+  "version": "5.0.7",
   "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",

diff --git a/jsrsasign-latest-all-min.js b/jsrsasign-latest-all-min.js
diff --git a/lib/jsrsasign-5.0.7-all-min.js b/lib/jsrsasign-5.0.7-all-min.js
diff --git a/npm/README.md b/npm/README.md
@@ -73,4 +73,8 @@ Sign string 'aaa' with the loaded private key:
     > sigVal
     'd764dcacb...'
 
+MORE TUTORIALS AND SAMPLES
+--------------------
+- [Tutorials in GitHub Wiki](https://github.com/kjur/jsrsasign/wiki)
+- [Sample Node Scripts](https://github.com/kjur/jsrsasign/tree/master/sample_node)
 
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": "5.0.6",
+  "version": "5.0.7",
   "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, CMS SignedData, TimeStamp and CAdES and JSON Web Signature(JWS)/Token(JWT)/Key(JWK). This node package based on jsrsasign 4.8.5 with minify fix",
   "main": "lib/jsrsasign.js",
   "scripts": {

diff --git a/sample_node/asn1extract b/sample_node/asn1extract
@@ -0,0 +1,55 @@
+#!/usr/bin/env node
+
+/*
+ * asn1extract - extract data at any position from ASN.1 structured data
+ *
+ * Copyright (c) 2015 Kenji Urushima ([email protected])
+ *
+ * This software is licensed under the terms of the MIT License.
+ * http://kjur.github.com/jsrsasign/license
+ *
+ * The above copyright and license notice shall be 
+ * included in all copies or substantial portions of the Software.
+ * 
+ * Please use '-h' option for this script usage.
+ */
+
+var program = require('commander');
+var rs = require('jsrsasign');
+var path = require('path');
+
+program
+  .version('1.0.0 (2015-Nov-26)')
+  .description('verify JWT/jWS file or string')
+  .usage('[options] <new extracted file> <ASN.1 DER file> <pos1...>')
+  .option('-a, --alltlv', 'extract whole ASN.1 TLV structure ')
+  .option('-v, --vonly', 'extract ASN.1 V value only')
+  .parse(process.argv);
+
+if (program.args.length < 3)
+  throw "wrong number of arguments";
+
+var outFile = program.args[0];
+var inFile = program.args[1];
+
+var hex;
+try {
+  hex = rs.readFileHexByBin(inFile);
+} catch(ex) {
+  throw "can't read file: " + inFile;
+}
+
+var idxList = program.args.slice(2);
+//console.log("idxList = %j", idxList);
+var parseInt10 = function(i) {return parseInt(i, 10);};
+var idxList2 = idxList.map(parseInt10);
+//console.log("idxList2 = %j", idxList2);
+
+var idx = rs.ASN1HEX.getDecendantIndexByNthList(hex, 0, idxList2);
+console.log("idx = %j", idx);
+var hExtract = rs.ASN1HEX.getHexOfTLV_AtObj(hex, idx);
+console.log(hExtract);
+console.log(rs.ASN1HEX.dump(hExtract));
+
+
+
diff --git a/test/qunit-do-dsa.html b/test/qunit-do-dsa.html
@@ -10,6 +10,20 @@
 <script src="http://code.jquery.com/qunit/qunit-1.11.0.js"></script>
 <link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-1.11.0.css" type="text/css" media="screen"/>
 
+<!-- jsrsasign keyutil external codes -->
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/core.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/x64-core.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/cipher-core.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/aes.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/tripledes.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/enc-base64.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/md5.js"></script>
+<!-- for PKCS5 PBKDF2 -->
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/sha1.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/hmac.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/pbkdf2.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/sha512.js"></script>
+
 <script language="JavaScript" type="text/javascript" src="../ext/jsbn.js"></script>
 <script language="JavaScript" type="text/javascript" src="../ext/jsbn2.js"></script>
 <script language="JavaScript" type="text/javascript" src="../ext/prng4.js"></script>
@@ -25,20 +39,6 @@
 <script src="http://yui.yahooapis.com/2.9.0/build/yahoo/yahoo-min.js"></script>
 <script language="JavaScript" type="text/javascript" src="../asn1-1.0.js"></script>
 
-<!-- jsrsasign keyutil external codes -->
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/core.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/x64-core.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/cipher-core.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/aes.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/tripledes.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/enc-base64.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/md5.js"></script>
-<!-- for PKCS5 PBKDF2 -->
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/sha1.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/hmac.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/pbkdf2.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/sha512.js"></script>
-
 <script src="../crypto-1.1.js"></script>
 <script src="../keyutil-1.0.js"></script>
 
@@ -105,12 +105,15 @@
 equal(dsa.verify("SHA1", s1, s2, "aaa", p, q, g, y), true, "aaa SHA1");
 });
 
+/*
+// This works only on FF. Fail on Chrome.
 test("variable assignment test1", function() {
 var [a, b] = [3, 5];
 expect(2);
 equal(a, 3, "a 3");
 equal(b, 5, "b 5");
 });
+ */
 
 test("parse signature", function() {
   var s = "302c02146e41015afd8597894f42f466dde2190ebba6f15e0214787f9380a3a33011c88bf877df7ac3b8a62b854c";

diff --git a/test/qunit-do-keyutil-csr.html b/test/qunit-do-keyutil-csr.html
@@ -10,6 +10,19 @@
 <script src="http://code.jquery.com/qunit/qunit-1.11.0.js"></script>
 <link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-1.11.0.css" type="text/css" media="screen"/>
 
+<!-- jsrsasign keyutil external codes -->
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/core.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/x64-core.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/cipher-core.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/aes.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/tripledes.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/enc-base64.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/md5.js"></script>
+<!-- for PKCS5 PBKDF2 -->
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/sha1.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/hmac.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/pbkdf2.js"></script>
+
 <script language="JavaScript" type="text/javascript" src="../ext/jsbn.js"></script>
 <script language="JavaScript" type="text/javascript" src="../ext/jsbn2.js"></script>
 <script language="JavaScript" type="text/javascript" src="../ext/base64.js"></script>

diff --git a/test/qunit-do-keyutil-getpem.html b/test/qunit-do-keyutil-getpem.html
@@ -10,6 +10,19 @@
 <script src="http://code.jquery.com/qunit/qunit-1.11.0.js"></script>
 <link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-1.11.0.css" type="text/css" media="screen"/>
 
+<!-- jsrsasign keyutil external codes -->
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/core.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/x64-core.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/cipher-core.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/aes.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/tripledes.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/enc-base64.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/md5.js"></script>
+<!-- for PKCS5 PBKDF2 -->
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/sha1.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/hmac.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/pbkdf2.js"></script>
+
 <script language="JavaScript" type="text/javascript" src="../ext/jsbn.js"></script>
 <script language="JavaScript" type="text/javascript" src="../ext/jsbn2.js"></script>
 <script language="JavaScript" type="text/javascript" src="../ext/prng4.js"></script>
@@ -34,19 +47,6 @@
 <script language="JavaScript" type="text/javascript" src="../asn1-1.0.js"></script>
 <script language="JavaScript" type="text/javascript" src="../asn1x509-1.0.js"></script>
 
-<!-- jsrsasign keyutil external codes -->
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/core.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/x64-core.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/cipher-core.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/aes.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/tripledes.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/enc-base64.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/md5.js"></script>
-<!-- for PKCS5 PBKDF2 -->
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/sha1.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/hmac.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/pbkdf2.js"></script>
-
 <script src="../dsa-modified-1.0.js"></script>
 <script src="../keyutil-1.0.js"></script>
 
@@ -310,6 +310,25 @@
 equal(key2.x.toString(16), "73b3538660ceac98a3bf48e53f88b4e124657c21", "");
 });
 
+// encripted PKCS#8 with generateKey============================================================
+test("aaa", function() {
+var kp = KEYUTIL.generateKeypair("RSA", 1024);
+var prvKey = kp.prvKeyObj;
+
+var pem1 = KEYUTIL.getPEM(prvKey, "PKCS5PRV", "passwd", "AES-128-CBC");
+//alert(pem1);
+var prvKey1 = KEYUTIL.getKey(pem1, "passwd");
+//alert(prvKey1.d.toString(16));
+
+var pem2 = KEYUTIL.getPEM(prvKey, "PKCS8PRV", "passwd2");
+//alert(pem2);
+var prvKey2 = KEYUTIL.getKey(pem2, "passwd2");
+//alert(prvKey2.d.toString(16));
+
+equal(prvKey1.d.toString(16), prvKey2.d.toString(16), "same d - " + prvKey2.d.toString(16));
+});
+
+
 });
 
 -->

diff --git a/test/qunit-do-keyutil-pub.html b/test/qunit-do-keyutil-pub.html
@@ -10,6 +10,19 @@
 <script src="http://code.jquery.com/qunit/qunit-1.11.0.js"></script>
 <link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-1.11.0.css" type="text/css" media="screen"/>
 
+<!-- jsrsasign keyutil external codes -->
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/core.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/x64-core.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/cipher-core.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/aes.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/tripledes.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/enc-base64.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/md5.js"></script>
+<!-- for PKCS5 PBKDF2 -->
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/sha1.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/hmac.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/pbkdf2.js"></script>
+
 <script language="JavaScript" type="text/javascript" src="../ext/jsbn.js"></script>
 <script language="JavaScript" type="text/javascript" src="../ext/jsbn2.js"></script>
 <script language="JavaScript" type="text/javascript" src="../ext/base64.js"></script>

diff --git a/test/qunit-do-pkcs5-eprv.html b/test/qunit-do-pkcs5-eprv.html
@@ -10,6 +10,19 @@
 <script src="http://code.jquery.com/qunit/qunit-1.11.0.js"></script>
 <link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-1.11.0.css" type="text/css" media="screen"/>
 
+<!-- jsrsasign pkcs5pkey external codes -->
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/core.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/x64-core.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/cipher-core.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/aes.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/tripledes.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/enc-base64.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/md5.js"></script>
+<!-- for PKCS5 PBKDF2 -->
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/sha1.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/hmac.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/pbkdf2.js"></script>
+
 <script language="JavaScript" type="text/javascript" src="../ext/jsbn.js"></script>
 <script language="JavaScript" type="text/javascript" src="../ext/jsbn2.js"></script>
 <script language="JavaScript" type="text/javascript" src="../ext/prng4.js"></script>
@@ -33,19 +46,6 @@
 <script src="http://yui.yahooapis.com/2.9.0/build/yahoo/yahoo-min.js"></script>
 <script language="JavaScript" type="text/javascript" src="../asn1-1.0.js"></script>
 
-<!-- jsrsasign pkcs5pkey external codes -->
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/core.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/x64-core.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/cipher-core.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/aes.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/tripledes.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/enc-base64.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/md5.js"></script>
-<!-- for PKCS5 PBKDF2 -->
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/sha1.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/hmac.js"></script>
-<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/pbkdf2.js"></script>
-
 <script src="../pkcs5pkey-1.0.js"></script>
 
 <script type="text/javascript">

diff --git a/test/qunit-do-pkcs5-pub.html b/test/qunit-do-pkcs5-pub.html
@@ -10,6 +10,19 @@
 <script src="http://code.jquery.com/qunit/qunit-1.11.0.js"></script>
 <link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-1.11.0.css" type="text/css" media="screen"/>
 
+<!-- jsrsasign pkcs5pkey external codes -->
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/core.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/x64-core.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/cipher-core.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/aes.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/tripledes.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/enc-base64.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/md5.js"></script>
+<!-- for PKCS5 PBKDF2 -->
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/sha1.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/hmac.js"></script>
+<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/pbkdf2.js"></script>
+
 <script language="JavaScript" type="text/javascript" src="../ext/jsbn.js"></script>
 <script language="JavaScript" type="text/javascript" src="../ext/jsbn2.js"></script>
 <script language="JavaScript" type="text/javascript" src="../ext/base64.js"></script>