timoreo/olm
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into uhoreg/fallback

Browse source
This commit is contained in:
Hubert Chathi 2020-09-01 15:57:20 -04:00
commit c45f19f12d
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
javascript/index.d.ts vendored
View file

@ -21,7 +21,7 @@ declare class Account {
free(); free();
create(); create();
identity_keys(): string; identity_keys(): string;
sign(message: string): string; sign(message: string | Uint8Array): string;
one_time_keys(): string; one_time_keys(): string;
mark_keys_as_published(); mark_keys_as_published();
max_number_of_one_time_keys(): number; max_number_of_one_time_keys(): number;
@ -36,8 +36,8 @@ declare class Account {
declare class Session { declare class Session {
constructor(); constructor();
free(): void; free(): void;
pickle(key: string): string; pickle(key: string | Uint8Array): string;
unpickle(key: string, pickle: string); unpickle(key: string | Uint8Array, pickle: string);
create_outbound( create_outbound(
account: Account, their_identity_key: string, their_one_time_key: string, account: Account, their_identity_key: string, their_one_time_key: string,
): void; ): void;
@ -57,8 +57,8 @@ declare class Session {
declare class Utility { declare class Utility {
constructor(); constructor();
free(): void; free(): void;
sha256(input: string): string; sha256(input: string | Uint8Array): string;
ed25519verify(key: string, message: string, signature: string): void; ed25519_verify(key: string, message: string | Uint8Array, signature: string): void;
} }
declare class InboundGroupSession { declare class InboundGroupSession {
@ -99,8 +99,8 @@ declare class PkDecryption {
init_with_private_key(key: Uint8Array): string; init_with_private_key(key: Uint8Array): string;
generate_key(): string; generate_key(): string;
get_private_key(): Uint8Array; get_private_key(): Uint8Array;
pickle(key: string): string; pickle(key: string | Uint8Array): string;
unpickle(key: string, pickle: string): string; unpickle(key: string | Uint8Array, pickle: string): string;
decrypt(ephemeral_key: string, mac: string, ciphertext: string): string; decrypt(ephemeral_key: string, mac: string, ciphertext: string): string;
} }
@ -122,6 +122,6 @@ declare class SAS {
calculate_mac_long_kdf(input: string, info: string): string; calculate_mac_long_kdf(input: string, info: string): string;
} }
export function init(): Promise<void>; export function init(opts?: object): Promise<void>;
export function get_library_version(): [number, number, number]; export function get_library_version(): [number, number, number];

2
javascript/olm_post.js
View file

@ -11,7 +11,7 @@ function stack(size_or_array) {
} }
function array_from_string(string) { function array_from_string(string) {
return intArrayFromString(string, true); return string instanceof Uint8Array ? string : intArrayFromString(string, true);
} }
function random_stack(size) { function random_stack(size) {