Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop support for decrypting legacy messages #197

Merged
merged 1 commit into from
Mar 15, 2024
Merged

Drop support for decrypting legacy messages #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 0 additions & 96 deletions lib/message/decryptLegacy.js
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions lib/pmcrypto.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,6 @@ export {

export { generateForwardingMaterial, doesKeySupportForwarding, isForwardingKey } from './key/forwarding';

export interface DecryptLegacyOptions extends Omit<DecryptOptions, 'message'> {
armoredMessage: string; // no streaming support for legacy messages
messageDate: Date;
}

export interface DecryptMimeOptions extends DecryptLegacyOptions {
headerFilename?: string;
sender?: string;
}

export interface EncryptSessionKeyOptionsPmcrypto extends EncryptSessionKeyOptions {}
export function encryptSessionKey<FormatType extends EncryptSessionKeyOptionsPmcrypto['format'] = 'armored'>(
options: EncryptSessionKeyOptionsPmcrypto & { format?: FormatType }
Expand Down Expand Up @@ -105,25 +95,6 @@ export function decryptMessage<DataType extends MaybeStream<Data>, FormatType ex
never
>;

export function decryptMessageLegacy<F extends DecryptLegacyOptions['format'] = 'utf8'>(
options: DecryptLegacyOptions & { format?: F }
): Promise<
// output type cannot be statically determined:
// string for legacy messages, but either string or Uint8Array output for non-legacy ones (depending on options.format)
F extends 'utf8' ? DecryptResultPmcrypto<string> :
F extends 'binary' ? DecryptResultPmcrypto<Uint8Array | string> :
never
>;

export function decryptMIMEMessage(options: DecryptMimeOptions): Promise<{
getBody: () => Promise<{ body: string; mimetype: string } | undefined>;
getAttachments: () => Promise<any>;
getEncryptedSubject: () => Promise<string>;
verify: () => Promise<number>;
errors: () => Promise<Error[] | undefined>;
signatures: OpenPGPSignature[];
}>;

export type MaybeStream<T extends Uint8Array | string> = T | WebStream<T>;
export type Data = string | Uint8Array;
export { WebStream };
Expand Down
1 change: 0 additions & 1 deletion lib/pmcrypto.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ export { generateForwardingMaterial, doesKeySupportForwarding, isForwardingKey }
export { decryptSessionKey } from './key/decrypt';
export { encryptKey, encryptSessionKey } from './key/encrypt';
export { default as decryptMessage } from './message/decrypt';
export { default as decryptMessageLegacy } from './message/decryptLegacy';
export { default as encryptMessage } from './message/encrypt';
export { default as signMessage } from './message/sign';
export { verifyMessage, verifyCleartextMessage } from './message/verify';
Expand Down
Loading
Loading