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

Support multiple user IDs for key generation

Browse Source
This commit is contained in:
Thomas Oberndörfer 2015-06-29 14:56:57 +02:00 committed by evilaliv3
parent 37ce176d42
commit 6f8a3abdfa
2 changed files with 71 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/key.js
View File

@ -906,7 +906,8 @@ function readArmored(armoredText) {
* @param {module:enums.publicKey} [options.keyType=module:enums.publicKey.rsa_encrypt_sign] to indicate what type of key to make. * @param {module:enums.publicKey} [options.keyType=module:enums.publicKey.rsa_encrypt_sign] to indicate what type of key to make.
* RSA is 1. See {@link http://tools.ietf.org/html/rfc4880#section-9.1} * RSA is 1. See {@link http://tools.ietf.org/html/rfc4880#section-9.1}
* @param {Integer} options.numBits number of bits for the key creation. * @param {Integer} options.numBits number of bits for the key creation.
* @param {String} options.userId assumes already in form of "User Name <username@email.com>" * @param {String|Array<String>} options.userId assumes already in form of "User Name <username@email.com>"
If array is used, the first userId is set as primary user Id
* @param {String} options.passphrase The passphrase used to encrypt the resulting private key * @param {String} options.passphrase The passphrase used to encrypt the resulting private key
* @param {Boolean} [options.unlocked=false] The secret part of the generated key is unlocked * @param {Boolean} [options.unlocked=false] The secret part of the generated key is unlocked
* @return {module:key~Key} * @return {module:key~Key}
@ -924,6 +925,9 @@ function generate(options) {
if (!options.passphrase) { if (!options.passphrase) {
options.unlocked = true; options.unlocked = true;
} }
if (String.prototype.isPrototypeOf(options.userId) || typeof options.userId === 'string') {
options.userId = [options.userId];
}
// generate // generate
var genSecretKey = generateSecretKey(); var genSecretKey = generateSecretKey();
@ -951,35 +955,47 @@ function generate(options) {
packetlist = new packet.List(); packetlist = new packet.List();
userIdPacket = new packet.Userid(); packetlist.push(secretKeyPacket);
userIdPacket.read(options.userId);
dataToSign = {}; options.userId.forEach(function(userId, index) {
dataToSign.userid = userIdPacket;
dataToSign.key = secretKeyPacket; userIdPacket = new packet.Userid();
signaturePacket = new packet.Signature(); userIdPacket.read(userId);
signaturePacket.signatureType = enums.signature.cert_generic;
signaturePacket.publicKeyAlgorithm = options.keyType; dataToSign = {};
signaturePacket.hashAlgorithm = config.prefer_hash_algorithm; dataToSign.userid = userIdPacket;
signaturePacket.keyFlags = [enums.keyFlags.certify_keys | enums.keyFlags.sign_data]; dataToSign.key = secretKeyPacket;
signaturePacket.preferredSymmetricAlgorithms = []; signaturePacket = new packet.Signature();
signaturePacket.preferredSymmetricAlgorithms.push(enums.symmetric.aes256); signaturePacket.signatureType = enums.signature.cert_generic;
signaturePacket.preferredSymmetricAlgorithms.push(enums.symmetric.aes192); signaturePacket.publicKeyAlgorithm = options.keyType;
signaturePacket.preferredSymmetricAlgorithms.push(enums.symmetric.aes128); signaturePacket.hashAlgorithm = config.prefer_hash_algorithm;
signaturePacket.preferredSymmetricAlgorithms.push(enums.symmetric.cast5); signaturePacket.keyFlags = [enums.keyFlags.certify_keys | enums.keyFlags.sign_data];
signaturePacket.preferredSymmetricAlgorithms.push(enums.symmetric.tripledes); signaturePacket.preferredSymmetricAlgorithms = [];
signaturePacket.preferredHashAlgorithms = []; signaturePacket.preferredSymmetricAlgorithms.push(enums.symmetric.aes256);
signaturePacket.preferredHashAlgorithms.push(enums.hash.sha256); signaturePacket.preferredSymmetricAlgorithms.push(enums.symmetric.aes192);
signaturePacket.preferredHashAlgorithms.push(enums.hash.sha1); signaturePacket.preferredSymmetricAlgorithms.push(enums.symmetric.aes128);
signaturePacket.preferredHashAlgorithms.push(enums.hash.sha512); signaturePacket.preferredSymmetricAlgorithms.push(enums.symmetric.cast5);
signaturePacket.preferredCompressionAlgorithms = []; signaturePacket.preferredSymmetricAlgorithms.push(enums.symmetric.tripledes);
signaturePacket.preferredCompressionAlgorithms.push(enums.compression.zlib); signaturePacket.preferredHashAlgorithms = [];
signaturePacket.preferredCompressionAlgorithms.push(enums.compression.zip); signaturePacket.preferredHashAlgorithms.push(enums.hash.sha256);
if (config.integrity_protect) { signaturePacket.preferredHashAlgorithms.push(enums.hash.sha1);
signaturePacket.features = []; signaturePacket.preferredHashAlgorithms.push(enums.hash.sha512);
signaturePacket.features.push(1); // Modification Detection signaturePacket.preferredCompressionAlgorithms = [];
} signaturePacket.preferredCompressionAlgorithms.push(enums.compression.zlib);
signaturePacket.sign(secretKeyPacket, dataToSign); signaturePacket.preferredCompressionAlgorithms.push(enums.compression.zip);
if (index === 0) {
signaturePacket.isPrimaryUserID = true;
}
if (config.integrity_protect) {
signaturePacket.features = [];
signaturePacket.features.push(1); // Modification Detection
}
signaturePacket.sign(secretKeyPacket, dataToSign);
packetlist.push(userIdPacket);
packetlist.push(signaturePacket);
});
dataToSign = {}; dataToSign = {};
dataToSign.key = secretKeyPacket; dataToSign.key = secretKeyPacket;
@ -991,9 +1007,6 @@ function generate(options) {
subkeySignaturePacket.keyFlags = [enums.keyFlags.encrypt_communication | enums.keyFlags.encrypt_storage]; subkeySignaturePacket.keyFlags = [enums.keyFlags.encrypt_communication | enums.keyFlags.encrypt_storage];
subkeySignaturePacket.sign(secretKeyPacket, dataToSign); subkeySignaturePacket.sign(secretKeyPacket, dataToSign);
packetlist.push(secretKeyPacket);
packetlist.push(userIdPacket);
packetlist.push(signaturePacket);
packetlist.push(secretSubkeyPacket); packetlist.push(secretSubkeyPacket);
packetlist.push(subkeySignaturePacket); packetlist.push(subkeySignaturePacket);

26
test/general/key.js
View File

@ -666,5 +666,31 @@ var pgp_desktop_priv =
}); });
}); });
it('Generate key - single userid', function(done) {
var userId = 'single user';
var opt = {numBits: 512, userId: userId, passphrase: '123'};
openpgp.generateKeyPair(opt).then(function(key) {
key = key.key;
expect(key.users.length).to.equal(1);
expect(key.users[0].userId.userid).to.equal(userId);
done();
}).catch(done);
});
it('Generate key - multi userid', function(done) {
var userId1 = 'first user';
var userId2 = 'second user';
var opt = {numBits: 512, userId: [userId1, userId2], passphrase: '123'};
openpgp.generateKeyPair(opt).then(function(key) {
key = key.key;
expect(key.users.length).to.equal(2);
expect(key.users[0].userId.userid).to.equal(userId1);
expect(key.users[0].selfCertifications[0].isPrimaryUserID).to.be.true;
expect(key.users[1].userId.userid).to.equal(userId2);
expect(key.users[1].selfCertifications[0].isPrimaryUserID).to.be.null;
done();
}).catch(done);
});
}); });