From 039a4ca2724123ab9f44ab07aacfa9d7ee619d22 Mon Sep 17 00:00:00 2001
From: Ben Adida <ben@adida.net>
Date: Tue, 6 Sep 2011 11:56:17 -0700
Subject: [PATCH] updated tests to match new jwcrypto and ca calls
---
browserid/lib/ca.js | 2 +-
browserid/tests/cert-emails-test.js | 18 +++---------------
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/browserid/lib/ca.js b/browserid/lib/ca.js
index e4f096a03..608bc22b7 100644
--- a/browserid/lib/ca.js
+++ b/browserid/lib/ca.js
@@ -96,7 +96,7 @@ function verifyChain(certChain) {
// raw certs
return jwcert.JWCert.verifyChain(certChain, function(issuer) {
// for now we only do browserid.org issued keys
- if (issuer != "browserid2.org")
+ if (issuer != "browserid.org")
return null;
return PUBLIC_KEY;
diff --git a/browserid/tests/cert-emails-test.js b/browserid/tests/cert-emails-test.js
index fbd5ab9cf..d86493c7c 100755
--- a/browserid/tests/cert-emails-test.js
+++ b/browserid/tests/cert-emails-test.js
@@ -127,10 +127,7 @@ suite.addBatch({
assert.strictEqual(r.code, 200);
},
"returns a proper cert": function(r, err) {
- var cert = new jwcert.JWCert();
- cert.parse(r.body);
-
- assert.isTrue(ca.verifyChain([cert]).equals(kp.publicKey));
+ assert.isTrue(kp.publicKey.equals(ca.verifyChain([r.body])));
},
"generate an assertion": {
topic: function(r) {
@@ -149,20 +146,11 @@ suite.addBatch({
},
"assertion verifies": {
topic: function(full_assertion) {
- // check that the assertion is verified by the public key in the chain cert
- var cert_chain = [];
- for (var i=0; i<full_assertion.certificates.length; i++) {
- var cert = new jwcert.JWCert();
- cert.parse(full_assertion.certificates[i]);
- cert_chain[cert_chain.length] = cert;
- }
-
// extract public key at the tail of the chain
- var pk = ca.verifyChain(cert_chain);
-
+ return ca.verifyChain(full_assertion.certificates);
},
"verifies": function(result) {
- assert.isTrue(result);
+ assert.notEqual(result, null);
}
}
}
--
GitLab