Fixing two minor defects in openpgp typings (#35632)

* Making user and email optional in user id

* Adding primaryKey attribute to Key

* Improving types
This commit is contained in:
Eric Camellini 2019-05-21 23:05:53 +03:00 committed by Ryan Cavanaugh
parent f106c413ce
commit f579deb24f
4 changed files with 31 additions and 5 deletions

View File

@ -1565,6 +1565,8 @@ export namespace key {
*/
constructor(packetlist: packet.List);
primaryKey: Key;
/**
* Transforms packetlist to structured key data
* @param packetlist The packets that form a key
@ -4736,8 +4738,8 @@ export function getWorker(): worker.async_proxy.AsyncProxy | null;
export function destroyWorker(): void;
export interface UserID {
name: string;
email: string;
name?: string;
email?: string;
}
export interface KeyOptions {

View File

@ -7,6 +7,11 @@ const options: openpgp.KeyOptions = {
userIds: [{
name: 'Jon Smith',
email: 'jon.smith@example.org',
}, {
email: 'jon.smith@example.org',
}, {
name: 'Jon Smith',
}, {
}],
passphrase: 'super long and hard to guess secret'
};
@ -156,7 +161,7 @@ openpgp.initWorker({
armor: false,
detached: false,
}).then(s => s.message/* as openpgp.message.Message*/);
const verifyOptions: openpgp.VerifyOptions = {
message,
signature,
@ -168,6 +173,12 @@ openpgp.initWorker({
return verified.signatures[0].valid;
})();
(async () => {
const publicKey = (await openpgp.key.readArmored(spubkey));
return publicKey.keys[0].primaryKey.getFingerprint()/* as string*/
})
// Open PGP Tests
const keyoptions: openpgp.KeyOptions = null;

View File

@ -1634,6 +1634,8 @@ export namespace key {
*/
constructor(packetlist: packet.List);
primaryKey: Key;
/**
* Transforms packetlist to structured key data
* @param packetlist The packets that form a key
@ -4807,8 +4809,8 @@ export function getWorker(): worker.async_proxy.AsyncProxy | null;
export function destroyWorker(): void;
export interface UserID {
name: string;
email: string;
name?: string;
email?: string;
}
export interface KeyOptions {

View File

@ -7,6 +7,11 @@ var options: openpgp.KeyOptions = {
userIds: [{
name: 'Jon Smith',
email: 'jon.smith@example.org',
}, {
email: 'jon.smith@example.org',
}, {
name: 'Jon Smith',
}, {
}],
passphrase: 'super long and hard to guess secret'
};
@ -171,6 +176,12 @@ openpgp.initWorker({
return verified.signatures[0].valid;
})();
(async () => {
const publicKey = (await openpgp.key.readArmored(spubkey));
return publicKey.keys[0].primaryKey.getFingerprint()/* as string*/
})
// Open PGP Tests