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

Merge readPublicKey for V3 and V4

Browse Source
This commit is contained in:
Thomas Oberndörfer 2013-12-12 16:17:01 +01:00
parent d7d74ec5e3
commit a31fe80a2c
3 changed files with 27 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
resources/openpgp.js
View File

File diff suppressed because one or more lines are too long

43
src/packet/public_key.js
View File

@ -54,48 +54,29 @@ module.exports = function packet_public_key() {
* @return {Object} This object with attributes set by the parser
*/
this.readPublicKey = this.read = function(bytes) {
var pos = 0;
// A one-octet version number (3 or 4).
this.version = bytes.charCodeAt(0);
this.version = bytes.charCodeAt(pos++);
if (this.version == 4) {
if (this.version == 3 || this.version == 4) {
// - A four-octet number denoting the time that the key was created.
this.created = util.readDate(bytes.substr(1, 4));
this.created = util.readDate(bytes.substr(pos, 4));
pos += 4;
// - A one-octet number denoting the public-key algorithm of this key.
this.algorithm = enums.read(enums.publicKey, bytes.charCodeAt(5));
var mpicount = crypto.getPublicMpiCount(this.algorithm);
this.mpi = [];
var bmpi = bytes.substr(6);
var p = 0;
for (var i = 0; i < mpicount && p < bmpi.length; i++) {
this.mpi[i] = new type_mpi();
p += this.mpi[i].read(bmpi.substr(p))
if (p > bmpi.length)
util.print_error("openpgp.packet.keymaterial.js\n" + 'error reading MPI @:' + p);
if (this.version == 3) {
// - A two-octet number denoting the time in days that this key is
// valid. If this number is zero, then it does not expire.
this.expirationTimeV3 = util.readNumber(bytes.substr(pos, 2));
pos += 2;
}
return p + 6;
} else if (this.version == 3) {
// - A four-octet number denoting the time that the key was created.
this.created = util.readDate(bytes.substr(1, 4));
// - A two-octet number denoting the time in days that this key is
// valid. If this number is zero, then it does not expire.
this.expirationTimeV3 = util.readNumber(bytes.substr(5, 2));
// - A one-octet number denoting the public-key algorithm of this key.
this.algorithm = enums.read(enums.publicKey, bytes.charCodeAt(7));
this.algorithm = enums.read(enums.publicKey, bytes.charCodeAt(pos++));
var mpicount = crypto.getPublicMpiCount(this.algorithm);
this.mpi = [];
var bmpi = bytes.substr(8);
var bmpi = bytes.substr(pos);
var p = 0;
for (var i = 0; i < mpicount && p < bmpi.length; i++) {

2
src/packet/signature.js
View File

@ -51,7 +51,7 @@ module.exports = function packet_signature() {
this.regularExpression = null;
this.revocable = null;
this.keyExpirationTime = null;
this.keyNeverExpires = true;
this.keyNeverExpires = null;
this.preferredSymmetricAlgorithms = null;
this.revocationKeyClass = null;
this.revocationKeyAlgorithm = null;