Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
matrix-org
Olm
Commits
c45f19f1
Commit
c45f19f1
authored
Sep 01, 2020
by
Hubert Chathi
Browse files
Merge branch 'master' into uhoreg/fallback
parents
171044f3
89050dc0
Changes
2
Hide whitespace changes
Inline
Side-by-side
javascript/index.d.ts
View file @
c45f19f1
...
...
@@ -21,7 +21,7 @@ declare class Account {
free
();
create
();
identity_keys
():
string
;
sign
(
message
:
string
):
string
;
sign
(
message
:
string
|
Uint8Array
):
string
;
one_time_keys
():
string
;
mark_keys_as_published
();
max_number_of_one_time_keys
():
number
;
...
...
@@ -36,8 +36,8 @@ declare class Account {
declare
class
Session
{
constructor
();
free
():
void
;
pickle
(
key
:
string
):
string
;
unpickle
(
key
:
string
,
pickle
:
string
);
pickle
(
key
:
string
|
Uint8Array
):
string
;
unpickle
(
key
:
string
|
Uint8Array
,
pickle
:
string
);
create_outbound
(
account
:
Account
,
their_identity_key
:
string
,
their_one_time_key
:
string
,
):
void
;
...
...
@@ -57,8 +57,8 @@ declare class Session {
declare
class
Utility
{
constructor
();
free
():
void
;
sha256
(
input
:
string
):
string
;
ed25519verify
(
key
:
string
,
message
:
string
,
signature
:
string
):
void
;
sha256
(
input
:
string
|
Uint8Array
):
string
;
ed25519
_
verify
(
key
:
string
,
message
:
string
|
Uint8Array
,
signature
:
string
):
void
;
}
declare
class
InboundGroupSession
{
...
...
@@ -99,8 +99,8 @@ declare class PkDecryption {
init_with_private_key
(
key
:
Uint8Array
):
string
;
generate_key
():
string
;
get_private_key
():
Uint8Array
;
pickle
(
key
:
string
):
string
;
unpickle
(
key
:
string
,
pickle
:
string
):
string
;
pickle
(
key
:
string
|
Uint8Array
):
string
;
unpickle
(
key
:
string
|
Uint8Array
,
pickle
:
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
;
}
export
function
init
():
Promise
<
void
>
;
export
function
init
(
opts
?:
object
):
Promise
<
void
>
;
export
function
get_library_version
():
[
number
,
number
,
number
];
javascript/olm_post.js
View file @
c45f19f1
...
...
@@ -11,7 +11,7 @@ function stack(size_or_array) {
}
function
array_from_string
(
string
)
{
return
intArrayFromString
(
string
,
true
);
return
string
instanceof
Uint8Array
?
string
:
intArrayFromString
(
string
,
true
);
}
function
random_stack
(
size
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment