Fix make bundle-test and keyring unit-tests

.gitattributes

@@ -1 +1,2 @@
 resources/openpgp*.js binary
+resources/keyring*.js binary

Makefile

@@ -37,10 +37,10 @@ bundle:
 	@browserify -x openpgp -r ./src/keyring/:keyring > ./resources/keyring_nodebug.js
 
 bundle-test:
-	@browserify -d -r ./test/test-all.js:unittests > ./test/lib/test-bundle.js
+	@browserify -d -x openpgp -x keyring -r ./test/test-all.js:unittests > ./test/lib/test-bundle.js
 
 bundle-ci-test:
-	@browserify -d -x openpgp -r ./test/ci-tests-all.js:ci-tests > ./test/lib/ci-tests-bundle.js
+	@browserify -d -x openpgp -x keyring -r ./test/ci-tests-all.js:ci-tests > ./test/lib/ci-tests-bundle.js
 
 test:
 	@echo to be implemented

src/cleartext.js

@@ -90,7 +90,7 @@ CleartextMessage.prototype.verify = function(publicKeys) {
       if (publicKeyPacket) {
         var verifiedSig = {};
         verifiedSig.keyid = signatureList[i].issuerKeyId;
-        verifiedSig.status = signatureList[i].verify(publicKeyPacket, literalDataPacket);
+        verifiedSig.valid = signatureList[i].verify(publicKeyPacket, literalDataPacket);
         result.push(verifiedSig);
         break;
       }

src/keyring/keyring.js

@@ -59,8 +59,8 @@ var keyring = function() {
       if (openpgp.util.hexstrdump(keyids[i].write()) == id) {
         return true;
       }
-      return false;
     }
+    return false;
   }
 
   function checkForIdentityAndKeyTypeMatch(keys, identityFunction, identityInput, keyType) {

src/message.js

@@ -220,7 +220,7 @@ Message.prototype.verify = function(publicKeys) {
       if (publicKeyPacket) {
         var verifiedSig = {};
         verifiedSig.keyid = signatureList[i].issuerKeyId;
-        verifiedSig.status = signatureList[i].verify(publicKeyPacket, literalDataList[0]);
+        verifiedSig.valid = signatureList[i].verify(publicKeyPacket, literalDataList[0]);
         result.push(verifiedSig);
         break;
       }
@@ -297,3 +297,4 @@ function fromBinary(bytes) {
 exports.Message = Message;
 exports.readArmored = readArmored;
 exports.fromText = fromText;
+exports.fromBinary = fromBinary;

src/openpgp.js

@@ -75,7 +75,7 @@ function decryptMessage(privateKey, message) {
  * @param  {key}     privateKey private key with decrypted secret key data
  * @param  {[key]}   publicKeys public keys to verify signatures
  * @param  {message} message    the message object with signed and encrypted data
- * @return {{'text': String, signatures: [{'keyid': keyid, 'status': Boolean}]}}
+ * @return {{'text': String, signatures: [{'keyid': keyid, 'valid': Boolean}]}}
  *                              decrypted message as as native JavaScript string
  *                              with verified signatures or null if no literal data found
  */
@@ -106,7 +106,7 @@ function signClearMessage(privateKeys, text) {
  * Verifies signatures of cleartext signed message
  * @param  {[Key]}            publicKeys public keys to verify signatures
  * @param  {CleartextMessage} message    cleartext message object with signatures
- * @return {{'text': String, signatures: [{'keyid': keyid, 'status': Boolean}]}}
+ * @return {{'text': String, signatures: [{'keyid': keyid, 'valid': Boolean}]}}
  *                                       cleartext with status of verified signatures
  */
 function verifyClearSignedMessage(publicKeys, message) {

test/ci-quick.js

@@ -141,7 +141,7 @@ describe('Openpgp integration tests', function() {
                 expect(result, 'decryptAndVerifyMessage() result').to.exist;
                 expect(result.text, 'decryptAndVerifyMessage() result.text').to.exist.and.equal(message);
                 expect(result.signatures, 'decryptAndVerifyMessage() result.signatures').to.exist.and.not.be.empty;
-                expect(result.signatures[0].status, 'decryptAndVerifyMessage() result.signatures[0].status').to.be.true;
+                expect(result.signatures[0].valid, 'decryptAndVerifyMessage() result.signatures[0].valid').to.be.true;
                 done();
             });
         });
@@ -185,7 +185,7 @@ describe('Openpgp integration tests', function() {
                 var result = cleartext.verify([verifykey])
                 expect(result, 'verify() result').to.exist.and.not.be.empty;
                 expect(result[0].keyid, 'verify() result[0].keyid').to.exist;
-                expect(result[0].status, 'verify() result[0].status').to.be.true;
+                expect(result[0].valid, 'verify() result[0].valid').to.be.true;
                 done();
             });
         });
@@ -228,7 +228,7 @@ describe('Openpgp integration tests', function() {
                 var result = cleartext.verify([verifykey])
                 expect(result, 'verify() result').to.exist.and.not.be.empty;
                 expect(result[0].keyid, 'verify() result[0].keyid').to.exist;
-                expect(result[0].status, 'verify() result[0].status').to.be.true;
+                expect(result[0].valid, 'verify() result[0].valid').to.be.true;
                 done();
             });
         });

test/general/keyring.js

@@ -5,9 +5,8 @@ unit.register("Keyring testing", function() {
   var keyring = require('keyring');
   var result = [];
 
-  // Exercises the ability of openpgp_keyring.getPublicKeysForKeyId to return subkeys
   keyring.init();
-  keyring.importPacketlist([
+  keyring.importKey([
         '-----BEGIN PGP PUBLIC KEY BLOCK-----',
         'Version: GnuPG v1.4.11 (GNU/Linux)',
         '',
@@ -48,14 +47,14 @@ unit.register("Keyring testing", function() {
         'AJ9zh4zsK4GIPuEu81YPNmHsju7DYg==',
         '=WaSx',
         '-----END PGP MESSAGE-----'
-        ].join("\n")).packets;
+        ].join("\n"));
-  var packetlists = keyring.getPacketlistsForKeyId(msg2[0].signingKeyId.write());
+  var signingKeyIds = msg2.getSigningKeyIds();
-  var pubKey = packetlists[0];
+  var key = keyring.getKeysForKeyId(signingKeyIds[0].toHex());
-  msg2[2].verify(pubKey[3], msg2[1]);
+  var verified = msg2.verify(key);
-  result[2] = new unit.result("Testing keyring public subkey support",
+  result[2] = new unit.result("Testing keyring getKeysForKeyId method",
-          packetlists !== null && 
+          key !== null && 
-          packetlists.length == 1 && 
+          key.length == 1 && 
-          msg2[2].verified);
+          verified[0].valid);
   return result;
 });
 

test/general/signature.js

@@ -288,7 +288,7 @@ var pub_key_arm3 =
     privKey.decryptKeyPacket(keyids, 'hello world');
 
     var decrypted = openpgp.decryptAndVerifyMessage(privKey, [pubKey], esMsg);
-    var verified = decrypted.text == plaintext && decrypted.signatures[0].status;
+    var verified = decrypted.text == plaintext && decrypted.signatures[0].valid;
 
     return new unit.result("Verify signature of signed and encrypted message from GPG2 with openpgp.decryptAndVerifyMessage", verified);
   }, function() {
@@ -319,7 +319,7 @@ var pub_key_arm3 =
     privKey.decryptKeyPacket(keyids, 'hello world');
 
     var decrypted = openpgp.decryptAndVerifyMessage(privKey, [pubKey], esMsg);
-    var verified = decrypted.text == plaintext && decrypted.signatures[0].status;
+    var verified = decrypted.text == plaintext && decrypted.signatures[0].valid;
 
     return new unit.result("Verify signature of signed and encrypted message from PGP 10.3.0 with openpgp.decryptAndVerifyMessage", verified);
   }, function() {
@@ -355,7 +355,7 @@ var pub_key_arm3 =
 
     var verifiedSig = sMsg.verify([pubKey2, pubKey3]);
     
-    verified = verified && verifiedSig[0].status && verifiedSig[1].status;
+    verified = verified && verifiedSig[0].valid && verifiedSig[1].valid;
 
     return new unit.result("Verify signed message with two one pass signatures", verified);
   }, function() {
@@ -396,7 +396,7 @@ var pub_key_arm3 =
 
     verified = verified && cleartextSig.text == plaintext;
 
-    verified = verified && cleartextSig.signatures[0].status && cleartextSig.signatures[1].status;
+    verified = verified && cleartextSig.signatures[0].valid && cleartextSig.signatures[1].valid;
 
     return new unit.result("Verify cleartext signed message with two signatures with openpgp.verifyClearSignedMessage", verified);
   }, function() {
@@ -414,7 +414,7 @@ var pub_key_arm3 =
 
     var verified = cleartextSig.text == plaintext.replace(/\r/g,'');
 
-    verified = verified && cleartextSig.signatures[0].status;
+    verified = verified && cleartextSig.signatures[0].valid;
 
     return new unit.result("Sign text with openpgp.signClearMessage and verify with openpgp.verifyClearSignedMessage leads to same cleartext and valid signatures", verified);
   }, function() {
@@ -446,7 +446,7 @@ var pub_key_arm3 =
 
     var verified = cleartextSig.text == plaintext;
 
-    verified = verified && cleartextSig.signatures[0].status;
+    verified = verified && cleartextSig.signatures[0].valid;
 
     return new unit.result("Verify cleartext signed message with CP-1252 character encoding", verified);
   }];

test/index.html

@@ -4,7 +4,6 @@
 <meta charset="utf-8">
 
 <!-- unit test -->
-<script type="text/javascript" src="test-bundle.js"></script>
 <title>OpenPGP.js testpage</title>
 
 <style>