diff options
Diffstat (limited to 'openpgp.d.ts')
-rw-r--r-- | openpgp.d.ts | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/openpgp.d.ts b/openpgp.d.ts index f8da6e7c..ad749754 100644 --- a/openpgp.d.ts +++ b/openpgp.d.ts @@ -185,8 +185,8 @@ export function decryptSessionKeys<T extends MaybeStream<Data>>(options: { messa export function readMessage<T extends MaybeStream<string>>(options: { armoredMessage: T, config?: PartialConfig }): Promise<Message<T>>; export function readMessage<T extends MaybeStream<Uint8Array>>(options: { binaryMessage: T, config?: PartialConfig }): Promise<Message<T>>; -export function createMessage<T extends MaybeStream<string>>(options: { text: T, filename?: string, date?: Date, type?: DataPacketType }): Promise<Message<T>>; -export function createMessage<T extends MaybeStream<Uint8Array>>(options: { binary: T, filename?: string, date?: Date, type?: DataPacketType }): Promise<Message<T>>; +export function createMessage<T extends MaybeStream<string>>(options: { text: T, filename?: string, date?: Date, format?: enums.literalFormatNames }): Promise<Message<T>>; +export function createMessage<T extends MaybeStream<Uint8Array>>(options: { binary: T, filename?: string, date?: Date, format?: enums.literalFormatNames }): Promise<Message<T>>; export function encrypt<T extends MaybeStream<Data>>(options: EncryptOptions & { message: Message<T>, format?: 'armored' }): Promise< T extends WebStream<infer X> ? WebStream<string> : @@ -359,7 +359,7 @@ declare abstract class BasePacket { * - A Subkey Packet cannot always be used when a Primary Key Packet is expected (and vice versa). */ declare abstract class BasePublicKeyPacket extends BasePacket { - public algorithm: enums.publicKeyNames; + public algorithm: enums.publicKey; public created: Date; public version: number; public getAlgorithmInfo(): AlgorithmInfo; @@ -417,8 +417,8 @@ export class SymEncryptedIntegrityProtectedDataPacket extends BasePacket { export class AEADEncryptedDataPacket extends BasePacket { static readonly tag: enums.packet.aeadEncryptedData; - private decrypt(sessionKeyAlgorithm: string, sessionKey: Uint8Array, config?: Config): void; - private encrypt(sessionKeyAlgorithm: string, sessionKey: Uint8Array, config?: Config): void; + private decrypt(sessionKeyAlgorithm: enums.symmetric, sessionKey: Uint8Array, config?: Config): void; + private encrypt(sessionKeyAlgorithm: enums.symmetric, sessionKey: Uint8Array, config?: Config): void; private crypt(fn: Function, sessionKey: Uint8Array, data: MaybeStream<Uint8Array>): MaybeStream<Uint8Array> } @@ -438,8 +438,8 @@ export class LiteralDataPacket extends BasePacket { static readonly tag: enums.packet.literalData; private getText(clone?: boolean): MaybeStream<string>; private getBytes(clone?: boolean): MaybeStream<Uint8Array>; - private setText(text: MaybeStream<string>, format?: DataPacketType); - private setBytes(bytes: MaybeStream<Uint8Array>, format?: DataPacketType); + private setText(text: MaybeStream<string>, format?: enums.literal); + private setBytes(bytes: MaybeStream<Uint8Array>, format: enums.literal); private setFilename(filename: string); private getFilename(): string; private writeHeader(): Uint8Array; @@ -534,8 +534,6 @@ export type AnyPacket = BasePacket; export type AnySecretKeyPacket = SecretKeyPacket | SecretSubkeyPacket; export type AnyKeyPacket = BasePublicKeyPacket; -type DataPacketType = 'utf8' | 'binary' | 'text' | 'mime'; - type AllowedPackets = Map<enums.packet, object>; // mapping to Packet classes (i.e. typeof LiteralDataPacket etc.) export class PacketList<T extends AnyPacket> extends Array<T> { static fromBinary(bytes: MaybeStream<Uint8Array>, allowedPackets: AllowedPackets, config?: Config): PacketList<AnyPacket>; // the packet types depend on`allowedPackets` @@ -630,7 +628,6 @@ interface SignOptions { message: CleartextMessage | Message<MaybeStream<Data>>; signingKeys?: MaybeArray<PrivateKey>; format?: 'armored' | 'binary' | 'object'; - dataType?: DataPacketType; detached?: boolean; signingKeyIDs?: MaybeArray<KeyID>; date?: Date; @@ -876,4 +873,12 @@ export namespace enums { ocb = 2, experimentalGCM = 100 // Private algorithm } + + export type literalFormatNames = 'utf8' | 'binary' | 'text' | 'mime' + enum literal { + binary = 98, + text = 116, + utf8 = 117, + mime = 109 + } } |