updated jwcrypto and now using jwk

browserid/lib/ca.js

@@ -37,6 +37,7 @@
 // certificate authority
 
 var jwcert = require('../../lib/jwcrypto/jwcert'),
+    jwk = require('../../lib/jwcrypto/jwk'),
     jws = require('../../lib/jwcrypto/jws'),
     configuration = require('../../libs/configuration'),
     path = require("path"),
@@ -54,10 +55,7 @@ function loadSecretKey(name, dir) {
   }
 
   // parse it
-  // it should be a JSON structure with alg and serialized key
-  // {alg: <ALG>, value: <SERIALIZED_KEY>}
-  var key = JSON.parse(secret);
-  return jws.getByAlg(key.alg).SecretKey.deserialize(key.value);
+  return jwk.SecretKey.deserialize(secret);
 }
 
 function loadPublicKey(name, dir) {
@@ -74,15 +72,14 @@ function loadPublicKey(name, dir) {
   // parse it
   // it should be a JSON structure with alg and serialized key
   // {alg: <ALG>, value: <SERIALIZED_KEY>}
-  var key = JSON.parse(secret);
-  return jws.getByAlg(key.alg).PublicKey.deserialize(key.value);
+  return jwk.PublicKey.deserialize(secret);
 }
 
 var SECRET_KEY = loadSecretKey('root', configuration.get('var_path'));
 var PUBLIC_KEY = loadPublicKey('root', configuration.get('var_path'));
 
 function parsePublicKey(serializedPK) {
-  return jws.getByAlg("RS").PublicKey.deserialize(serializedPK);
+  return jwk.PublicKey.deserialize(serializedPK);
 }
 
 function parseCert(serializedCert) {

browserid/tests/ca-test.js

@@ -44,6 +44,7 @@ wsapi = require('./lib/wsapi.js'),
 email = require('../lib/email.js'),
 ca = require('../lib/ca.js'),
 jwcert = require('../../lib/jwcrypto/jwcert'),
+jwk = require('../../lib/jwcrypto/jwk'),
 jws = require('../../lib/jwcrypto/jws');
 
 var suite = vows.describe('ca');
@@ -52,7 +53,7 @@ var suite = vows.describe('ca');
 suite.options.error = false;
 
 // generate a public key
-var kp = jws.getByAlg("RS").KeyPair.generate(64);
+var kp = jwk.KeyPair.generate("RS",64);
 
 var email_addr = "foo@foo.com";
 

browserid/tests/cert-emails-test.js

@@ -44,6 +44,7 @@ wsapi = require('./lib/wsapi.js'),
 email = require('../lib/email.js'),
 ca = require('../lib/ca.js'),
 jwcert = require('../../lib/jwcrypto/jwcert'),
+jwk = require('../../lib/jwcrypto/jwk'),
 jws = require('../../lib/jwcrypto/jws');
 
 var suite = vows.describe('cert-emails');
@@ -104,7 +105,7 @@ var cert_key_url = "/wsapi/cert_key";
 
 // generate a keypair, we'll use this to sign assertions, as if
 // this keypair is stored in the browser localStorage
-var kp = jws.getByAlg("RS").KeyPair.generate(64);
+var kp = jwk.KeyPair.generate("RS",64);
 
 suite.addBatch({
   "cert key with no parameters": {

jwcrypto @ 36562ebe

-Subproject commit 9aaa4c075c9b4f6188b5f0098e641f21f2c30a2a
+Subproject commit 36562ebe7ed0ad0823206167ee1fa11ecc3c682d