4.8.2 release

sramos30 · Jun 6, 2015 · ba26f4a · ba26f4a
1 parent f204fe7
commit ba26f4a
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 35 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,6 +1,14 @@
 
 ChangeLog for jsrsasign
 
+* Changes between 4.8.1 to 4.8.2
+  - keyutil 1.0.8 to 1.0.9
+    - getKey EC private/public key bug #69 fix
+  - node npm module officially released at npmjs.com
+  - ** 4.8.2 updated files
+    - ChangeLog.txt
+    - keyutil-1.0*.js
+
 * Changes between 4.8.0 to 4.8.1
   - keyutil 1.0.7 to 1.0.8
     - RFC 7517 JSON Web Key(JWK) support 

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 jsrsasign
 =========
 
-The 'jsrsasign' (RSA-Sign JavaScript Library) is an 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 and CRL, CMS SignedData, RFC 3161 TimeStamp and RFC 5126 CAdES Long Term Signature, JSON Web Signature/Token.
+The 'jsrsasign' is an 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).
 
 Public page is http://kjur.github.com/jsrsasign .
 

diff --git a/index.html b/index.html
@@ -4,7 +4,7 @@
 <head>
 <meta charset='utf-8' />
 <meta http-equiv="X-UA-Compatible" content="chrome=1" />
-<meta name="description" content="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" />
+<meta name="description" content="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)" />
 <link rel="stylesheet" type="text/css" media="screen" href="stylesheets/stylesheet.css">
 <title>jsrsasign - cryptography library in JavaScript</title>
 </head>
@@ -17,7 +17,7 @@
 <a id="forkme_banner" href="https://github.com/kjur/jsrsasign">Fork Me on GitHub</a>
 
 <h1 id="project_title">jsrsasign</h1>
-<h2 id="project_tagline">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, CAdES and JSON Web Signature/Token</h2>
+<h2 id="project_tagline">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, CAdES and JSON Web Signature(JWS)/Token(JWT)/Key(JWK)</h2>
 
 <section id="downloads">
 <a class="zip_download_link" href="https://github.com/kjur/jsrsasign/zipball/master">Download this project as a .zip file</a>
@@ -52,16 +52,26 @@ <h3>FEATURES</h3>
 <li><a href="api/symbols/ASN1HEX.html">simple ASN.1 data parser</a></li>
 <li><a href="api/symbols/X509.html">simple X.509 certificate parser/reader</a></li>
 <li><a href="api/symbols/KEYUTIL.html">KEYUTIL</a> - loading RSA/EC/DSA private/public key from PEM formatted PKCS#1/5/8 and X.509 certificate</li>
-<li><a href="api/symbols/KJUR.jws.JWS.html">JSON Web Siguature and JSON Web Token</a></li>
+<li><a href="api/symbols/KJUR.jws.JWS.html">JSON Web Siguature(JWS)</a>,
+<a href="https://kjur.github.io/jsrsasign/api/symbols/KJUR.jws.JWS.html#.verifyJWT">JSON Web Token(JWT)</a> and
+<a href="https://kjur.github.io/jsrsasign/api/symbols/KEYUTIL.html#.getKey">JSON Web Key(JWK)</a></li>
 <li>Supported formats and algorithms are listed <a href="index_alg.html">here</a>.</li>
 
 </ul>
 
 <h3>NEWS</h3>
 <dl>
+<dt><b>2015-Jun-06</b>:
+<dd><a href="https://github.com/kjur/jsrsasign/releases/tag/4.8.2">Release 4.8.2</a> is now available.
+Small fix in 
+<a href="https://kjur.github.io/jsrsasign/api/symbols/KEYUTIL.html#.getKey">KEYUTIL.getKey</a> and
+<a href="https://www.npmjs.com/package/jsrsasign">npm jsrsasign</a> officially released.  
+
+
 <dt><b>2015-Jun-03</b>:
 <dd><a href="https://github.com/kjur/jsrsasign/releases/tag/4.8.1">Release 4.8.1</a> is now available. 
-<a href="http://kjur.github.io/jsrsasign/api/symbols/KJUR.jws.KEYUTIL.html#.getKey">KEYUTIL.getKey method</a> now supports RFC 7517 JSON Web Key(JWK) loading for RSA/ECC private/public key.
+<a href="https://kjur.github.io/jsrsasign/api/symbols/KEYUTIL.html#.getKey">KEYUTIL.getKey method</a>
+now supports RFC 7517 JSON Web Key(JWK) loading for RSA/ECC private/public key.
 
 <dt><b>2015-Jun-01</b>:
 <dd><a href="https://github.com/kjur/jsrsasign/releases/tag/4.8.0">Release 4.8.0</a> is now available. Now <a href="http://kjur.github.io/jsjws">jsjws</a> is

diff --git a/keyutil-1.0.js b/keyutil-1.0.js
@@ -1,4 +1,4 @@
-/*! keyutil-1.0.8.js (c) 2013-2015 Kenji Urushima | kjur.github.com/jsrsasign/license
+/*! keyutil-1.0.9.js (c) 2013-2015 Kenji Urushima | kjur.github.com/jsrsasign/license
  */
 /*
  * keyutil.js - key utility for PKCS#1/5/8 PEM, RSA/DSA/ECDSA key object
@@ -15,7 +15,7 @@
  * @fileOverview
  * @name keyutil-1.0.js
  * @author Kenji Urushima [email protected]
- * @version keyutil 1.0.8 (2015-Jul-02)
+ * @version keyutil 1.0.9 (2015-Jul-04)
  * @since jsrsasign 4.1.4
  * @license <a href="http://kjur.github.io/jsrsasign/license/">MIT License</a>
  */
@@ -1258,8 +1258,8 @@ KEYUTIL.getKey = function(param, passcode, hextype) {
 
     // 2. by key spec
     // 2.1. ECC private key
-    if (param.xy !== undefined && param.curve !== undefined) {
-        return new KJUR.crypto.ECDSA({prv: param.xy, curve: param.curve});
+    if (param.d !== undefined && param.curve !== undefined) {
+        return new KJUR.crypto.ECDSA({prv: param.d, curve: param.curve});
     }
     // 2.2. bare RSA private key
     if (param.n !== undefined &&
@@ -1285,8 +1285,8 @@ KEYUTIL.getKey = function(param, passcode, hextype) {
     }
 
     // 2.4. ECC public key
-    if (param.d !== undefined && param.curve !== undefined) {
-        return new KJUR.crypto.ECDSA({pub: param.d, curve: param.curve});
+    if (param.xy !== undefined && param.d === undefined && param.curve !== undefined) {
+        return new KJUR.crypto.ECDSA({pub: param.xy, curve: param.curve});
     }
     // 2.5. bare RSA public key
     if (param.kty === undefined && param.n !== undefined && param.e) {

diff --git a/keyutil-1.0.min.js b/keyutil-1.0.min.js
diff --git a/npm/Makefile b/npm/Makefile
@@ -5,9 +5,6 @@ aaa:
 	cat \
 	lib/header.js \
 	../jsrsasign-latest-all-min.js \
-	../../../../jsjws/_gitpg/jsjws/ext/json-sans-eval-min.js \
-	../../../../jsjws/_gitpg/jsjws/jws-3.0.min.js \
-	../../../../jsjws/_gitpg/jsjws/jwsjs-2.0.min.js \
 	lib/footer.js \
 	> lib/jsrsasign.js
 
diff --git a/npm/lib/footer.js b/npm/lib/footer.js
@@ -8,6 +8,7 @@ exports.MessageDigest = KJUR.crypto.MessageDigest;
 exports.Mac = KJUR.crypto.Mac;
 exports.KEYUTIL = KEYUTIL;
 exports.ASN1HEX = ASN1HEX;
+exports.X509 = X509;
 
 // ext/base64.js
 exports.b64tohex = b64tohex;

diff --git a/npm/package.json b/npm/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jsrsasign",
-  "version": "0.0.3",
-  "description": "pure JavaScript cryptographic library(jsrsasign) and JSON Web Token (JWT) and JSON Web Signature (JWS) library (jsjws) bundle",
+  "version": "4.8.2.1",
+  "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.2",
   "main": "lib/jsrsasign.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -11,27 +11,20 @@
     "url": "https://github.com/kjur/jsrsasign.git"
   },
   "keywords": [
-    "RSA",
-    "ECDSA",
-    "DSA",
-    "RSAPSS",
-    "PKCS1",
-    "PKCS5",
-    "PKCS8",
+    "RSA", "ECDSA", "DSA", "RSAPSS",
+    "PKCS#1", "PKCS#5", "PKCS#8", "private key", "public key",
     "hash function",
     "HMac",
     "ASN.1",
-    "X.509",
-    "Signature",
+    "certificate", "X.509",
+    "RFC 3161", "Digital Timestamp", "Timestamp", "Time Stamp Token",
+    "CMS", "Cryptgraphic Message Syntax", "PKCS#7",   
+    "Signature", "Digital Signature", "signing",
     "Message Digest",
-    "signing",
-    "certificate",
-    "JSON Web Token",
-    "JSON Web Signature",
-    "JWT",
-    "JWS",
-    "JOSE",
-    "JWA"
+    "JSON Web Token", "JWT",
+    "JSON Web Signature", "JWS",
+    "JSON Web Key", "JWK", 
+    "JOSE", "JWA",
   ],
   "author": "Kenji Urushima",
   "licenses": [