From eba791e11e1b9b3ab5c43f194eefcf0ebdb9b3b2 Mon Sep 17 00:00:00 2001
From: Kevin Moutet <kevin.moutet@sierom.net>
Date: Tue, 16 Mar 2021 13:45:17 +0100
Subject: [PATCH] Add key.write() and update type definitions (#1267)

Also, mark key.keyPacket, message.packets and signature.packets private.
---
 openpgp.d.ts   | 18 ++++++++++++++----
 src/key/key.js |  8 ++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/openpgp.d.ts b/openpgp.d.ts
index 2927423f..42ed6531 100644
--- a/openpgp.d.ts
+++ b/openpgp.d.ts
@@ -25,7 +25,8 @@ export class Key {
   public subKeys: SubKey[];
   public users: User[];
   public revocationSignatures: SignaturePacket[];
-  public keyPacket: PublicKeyPacket | SecretKeyPacket;
+  private keyPacket: PublicKeyPacket | SecretKeyPacket;
+  public write(): Uint8Array;
   public armor(config?: Config): string;
   public decrypt(passphrase: string | string[], keyId?: Keyid, config?: Config): Promise<void>; // throws on error
   public encrypt(passphrase: string | string[], keyId?: Keyid, config?: Config): Promise<void>; // throws on error
@@ -37,7 +38,11 @@ export class Key {
   public isPublic(): boolean;
   public toPublic(): Key;
   public update(key: Key, config?: Config): void;
+  public signPrimaryUser(privateKeys: Key[], date?: Date, userId?: UserID, config?: Config): Promise<Key>
+  public signAllUsers(privateKeys: Key[], config?: Config): Promise<Key>
   public verifyPrimaryKey(date?: Date, userId?: UserID, config?: Config): Promise<void>; // throws on error
+  public verifyPrimaryUser(publicKeys: Key[], date?: Date, userIds?: UserID, config?: Config): Promise<{ keyid: Keyid, valid: boolean | null }[]>;
+  public verifyAllUsers(publicKeys: Key[], config?: Config): Promise<{ userid: string, keyid: Keyid, valid: boolean | null }[]>;
   public isRevoked(signature: SignaturePacket, key?: AnyKeyPacket, date?: Date, config?: Config): Promise<boolean>;
   public revoke(reason: { flag?: enums.reasonForRevocation; string?: string; }, date?: Date, config?: Config): Promise<Key>;
   public getRevocationCertificate(date?: Date, config?: Config): Promise<Stream<string> | string | undefined>;
@@ -55,7 +60,7 @@ export class Key {
 
 export class SubKey {
   constructor(subKeyPacket: SecretSubkeyPacket | PublicSubkeyPacket);
-  public keyPacket: SecretSubkeyPacket | PublicSubkeyPacket;
+  private keyPacket: SecretSubkeyPacket | PublicSubkeyPacket;
   public bindingSignatures: SignaturePacket[];
   public revocationSignatures: SignaturePacket[];
   public verify(primaryKey: PublicKeyPacket | SecretKeyPacket, date?: Date, config?: Config): Promise<SignaturePacket>;
@@ -91,8 +96,9 @@ export function readSignature(options: { armoredSignature: string, config?: Part
 export function readSignature(options: { binarySignature: Uint8Array, config?: PartialConfig }): Promise<Signature>;
 
 export class Signature {
-  public packets: PacketList<SignaturePacket>;
+  private packets: PacketList<SignaturePacket>;
   constructor(packetlist: PacketList<SignaturePacket>);
+  public write(): MaybeStream<Uint8Array>;
   public armor(config?: Config): string;
 }
 
@@ -237,9 +243,13 @@ export function verify<T extends MaybeStream<Data>>(options: VerifyOptions & { m
  */
 export class Message<T extends MaybeStream<Data>> {
 
-  public packets: PacketList<AnyPacket>;
+  private packets: PacketList<AnyPacket>;
   constructor(packetlist: PacketList<AnyPacket>);
 
+  /** Returns binary representation of message
+   */
+  public write(): MaybeStream<Uint8Array>;
+
   /** Returns ASCII armored text of message
    */
   public armor(config?: Config): string;
diff --git a/src/key/key.js b/src/key/key.js
index 369de903..8713b046 100644
--- a/src/key/key.js
+++ b/src/key/key.js
@@ -259,6 +259,14 @@ class Key {
     return new Key(packetlist);
   }
 
+  /**
+   * Returns binary encoded key
+   * @returns {Uint8Array} Binary key.
+   */
+  write() {
+    return this.toPacketlist().write();
+  }
+
   /**
    * Returns ASCII armored text of key
    * @param {Object} [config] - Full configuration, defaults to openpgp.config