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

add date parameter to generateKey function

Browse Source
This commit is contained in:
Sanjana Rajan 2018-03-19 18:55:15 -07:00
parent afc9164e7d
commit eb96d44298
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/key.js
View File

@ -1154,7 +1154,7 @@ export function generate(options) {
}); });
function generateSecretKey() { function generateSecretKey() {
secretKeyPacket = new packet.SecretKey(); secretKeyPacket = new packet.SecretKey(options.date);
secretKeyPacket.packets = null; secretKeyPacket.packets = null;
secretKeyPacket.algorithm = enums.read(enums.publicKey, options.keyType); secretKeyPacket.algorithm = enums.read(enums.publicKey, options.keyType);
options.curve = options.curve === enums.curve.curve25519 ? enums.curve.ed25519 : options.curve; options.curve = options.curve === enums.curve.curve25519 ? enums.curve.ed25519 : options.curve;
@ -1162,7 +1162,7 @@ export function generate(options) {
} }
function generateSecretSubkey() { function generateSecretSubkey() {
secretSubkeyPacket = new packet.SecretSubkey(); secretSubkeyPacket = new packet.SecretSubkey(options.date);
secretKeyPacket.packets = null; secretKeyPacket.packets = null;
secretSubkeyPacket.algorithm = enums.read(enums.publicKey, options.subkeyType); secretSubkeyPacket.algorithm = enums.read(enums.publicKey, options.subkeyType);
options.curve = options.curve === enums.curve.ed25519 ? enums.curve.curve25519 : options.curve; options.curve = options.curve === enums.curve.ed25519 ? enums.curve.curve25519 : options.curve;
@ -1245,7 +1245,7 @@ async function wrapKeyObject(secretKeyPacket, secretSubkeyPacket, options) {
const dataToSign = {}; const dataToSign = {};
dataToSign.userid = userIdPacket; dataToSign.userid = userIdPacket;
dataToSign.key = secretKeyPacket; dataToSign.key = secretKeyPacket;
const signaturePacket = new packet.Signature(); const signaturePacket = new packet.Signature(options.date);
signaturePacket.signatureType = enums.signature.cert_generic; signaturePacket.signatureType = enums.signature.cert_generic;
signaturePacket.publicKeyAlgorithm = options.keyType; signaturePacket.publicKeyAlgorithm = options.keyType;
signaturePacket.hashAlgorithm = await getPreferredHashAlgo(secretKeyPacket); signaturePacket.hashAlgorithm = await getPreferredHashAlgo(secretKeyPacket);
@ -1290,7 +1290,7 @@ async function wrapKeyObject(secretKeyPacket, secretSubkeyPacket, options) {
const dataToSign = {}; const dataToSign = {};
dataToSign.key = secretKeyPacket; dataToSign.key = secretKeyPacket;
dataToSign.bind = secretSubkeyPacket; dataToSign.bind = secretSubkeyPacket;
const subkeySignaturePacket = new packet.Signature(); const subkeySignaturePacket = new packet.Signature(options.date);
subkeySignaturePacket.signatureType = enums.signature.subkey_binding; subkeySignaturePacket.signatureType = enums.signature.subkey_binding;
subkeySignaturePacket.publicKeyAlgorithm = options.keyType; subkeySignaturePacket.publicKeyAlgorithm = options.keyType;
subkeySignaturePacket.hashAlgorithm = await getPreferredHashAlgo(secretSubkeyPacket); subkeySignaturePacket.hashAlgorithm = await getPreferredHashAlgo(secretSubkeyPacket);

4
src/openpgp.js
View File

@ -111,11 +111,11 @@ export function destroyWorker() {
*/ */
export function generateKey({ export function generateKey({
userIds=[], passphrase, numBits=2048, unlocked=false, keyExpirationTime=0, curve="" userIds=[], passphrase, numBits=2048, unlocked=false, keyExpirationTime=0, curve="", date=new Date()
} = {}) { } = {}) {
userIds = formatUserIds(userIds); userIds = formatUserIds(userIds);
const options = { const options = {
userIds, passphrase, numBits, unlocked, keyExpirationTime, curve userIds, passphrase, numBits, unlocked, keyExpirationTime, curve, date
}; };
if (util.getWebCryptoAll() && numBits < 2048) { if (util.getWebCryptoAll() && numBits < 2048) {

4
src/packet/public_key.js
View File

@ -42,7 +42,7 @@ import util from '../util';
* @memberof module:packet * @memberof module:packet
* @constructor * @constructor
*/ */
function PublicKey() { function PublicKey(date=new Date()) {
/** /**
* Packet type * Packet type
* @type {module:enums.packet} * @type {module:enums.packet}
@ -57,7 +57,7 @@ function PublicKey() {
* Key creation date. * Key creation date.
* @type {Date} * @type {Date}
*/ */
this.created = util.normalizeDate(); this.created = util.normalizeDate(date);
/** /**
* Algorithm specific params * Algorithm specific params
* @type {Array<Object>} * @type {Array<Object>}

4
src/packet/secret_key.js
View File

@ -39,8 +39,8 @@ import util from '../util';
* @constructor * @constructor
* @extends module:packet.PublicKey * @extends module:packet.PublicKey
*/ */
function SecretKey() { function SecretKey(date=new Date()) {
publicKey.call(this); publicKey.call(this, date);
/** /**
* Packet type * Packet type
* @type {module:enums.packet} * @type {module:enums.packet}

4
src/packet/secret_subkey.js
View File

@ -30,8 +30,8 @@ import enums from '../enums';
* @constructor * @constructor
* @extends module:packet.SecretKey * @extends module:packet.SecretKey
*/ */
function SecretSubkey() { function SecretSubkey(date=new Date()) {
secretKey.call(this); secretKey.call(this, date);
this.tag = enums.packet.secretSubkey; this.tag = enums.packet.secretSubkey;
} }