aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2019-02-01 11:39:06 -0500
committerHubert Chathi <hubert@uhoreg.ca>2019-02-01 11:39:06 -0500
commit48dda7922d0fbb36a219045be01c58f518122448 (patch)
tree9d2bd19a11052e2d7fbb577e40362f4bcbfaaf32
parent621097f62b4c707d4e98ce68cdf8d5397178d41e (diff)
call the right function and remove unnecessary include
-rw-r--r--javascript/olm_pk.js6
-rw-r--r--src/pk.cpp2
2 files changed, 3 insertions, 5 deletions
diff --git a/javascript/olm_pk.js b/javascript/olm_pk.js
index 9159fbf..80a57aa 100644
--- a/javascript/olm_pk.js
+++ b/javascript/olm_pk.js
@@ -301,7 +301,7 @@ PkSigning.prototype['init_with_seed'] = restore_stack(function (seed) {
var seed_buffer = stack(seed.length);
Module['HEAPU8'].set(seed, seed_buffer);
- var pubkey_length = pk_decryption_method(
+ var pubkey_length = pk_signing_method(
Module['_olm_pk_sign_public_key_length']
)();
var pubkey_buffer = stack(pubkey_length + NULL_BYTE_PADDING_LENGTH);
@@ -319,7 +319,7 @@ PkSigning.prototype['init_with_seed'] = restore_stack(function (seed) {
});
PkSigning.prototype['generate_seed'] = restore_stack(function () {
- var random_length = pk_decryption_method(
+ var random_length = pk_signing_method(
Module['_olm_pk_sign_seed_length']
)();
var random_buffer = random_stack(random_length);
@@ -342,7 +342,7 @@ PkSigning.prototype['sign'] = restore_stack(function (message) {
message_buffer = malloc(message_length + 1);
stringToUTF8(message, message_buffer, message_length + 1);
- var sig_length = pk_decryption_method(
+ var sig_length = pk_signing_method(
Module['_olm_pk_signature_length']
)();
var sig_buffer = stack(sig_length + NULL_BYTE_PADDING_LENGTH);
diff --git a/src/pk.cpp b/src/pk.cpp
index 5db472c..111e54b 100644
--- a/src/pk.cpp
+++ b/src/pk.cpp
@@ -473,8 +473,6 @@ size_t olm_pk_signature_length() {
return olm::encode_base64_length(ED25519_SIGNATURE_LENGTH);
}
-#include "olm/utility.hh"
-
size_t olm_pk_sign(
OlmPkSigning *signing,
uint8_t const * message, size_t message_length,