suzanne.soy/fork-openpgpjs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add unit tests for getExpirationTime Key method

Browse Source
This commit is contained in:
Thomas Oberndörfer 2014-02-06 12:28:36 +01:00
parent a595d683a9
commit b1e8c9ec52
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/key.js
View File

@ -470,7 +470,7 @@ function getExpirationTime(keyPacket, selfCertificate) {
return new Date(keyPacket.created.getTime() + keyPacket.expirationTimeV3*24*3600*1000); return new Date(keyPacket.created.getTime() + keyPacket.expirationTimeV3*24*3600*1000);
} }
// check V4 expiration time // check V4 expiration time
if (this.primaryKey.version == 4 && selfCertificate.keyNeverExpires === false) { if (keyPacket.version == 4 && selfCertificate.keyNeverExpires === false) {
return new Date(keyPacket.created.getTime() + selfCertificate.keyExpirationTime*1000); return new Date(keyPacket.created.getTime() + selfCertificate.keyExpirationTime*1000);
} }
return null; return null;

15
test/general/key.js
View File

@ -293,5 +293,20 @@ describe('Key', function() {
expect(status).to.equal(openpgp.enums.keyStatus.revoked); expect(status).to.equal(openpgp.enums.keyStatus.revoked);
done(); done();
}); });
it('Method getExpirationTime V4 Key', function() {
var pubKey = openpgp.key.readArmored(twoKeys).keys[1];
expect(pubKey).to.exist;
expect(pubKey).to.be.an.instanceof(openpgp.key.Key);
expect(pubKey.getExpirationTime().toISOString()).to.be.equal('2018-11-26T10:58:29.000Z');
});
it('Method getExpirationTime V4 SubKey', function() {
var pubKey = openpgp.key.readArmored(twoKeys).keys[1];
expect(pubKey).to.exist;
expect(pubKey).to.be.an.instanceof(openpgp.key.Key);
expect(pubKey.subKeys[0].getExpirationTime().toISOString()).to.be.equal('2018-11-26T10:58:29.000Z');
});
}); });