aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2019-03-13 22:39:21 -0400
committerHubert Chathi <hubert@uhoreg.ca>2019-03-13 22:39:21 -0400
commit0348f06a5692f168f2d0d8b77aac81ebb31e2df6 (patch)
tree2256bf65aa65b42a4a116a66c515aaa4557d6c80
parent2589d1b17b140d83c444289bc3ed2c00061d88f4 (diff)
rename functions to be more consistent
-rw-r--r--include/olm/pk.h4
-rw-r--r--javascript/olm_pk.js4
-rw-r--r--src/pk.cpp8
3 files changed, 8 insertions, 8 deletions
diff --git a/include/olm/pk.h b/include/olm/pk.h
index 8901621..3f77ef7 100644
--- a/include/olm/pk.h
+++ b/include/olm/pk.h
@@ -238,8 +238,8 @@ size_t olm_pk_signing_key_from_seed(
void * seed, size_t seed_length
);
-size_t olm_pk_sign_seed_length(void);
-size_t olm_pk_sign_public_key_length(void);
+size_t olm_pk_signing_seed_length(void);
+size_t olm_pk_signing_public_key_length(void);
size_t olm_pk_signature_length();
diff --git a/javascript/olm_pk.js b/javascript/olm_pk.js
index 80a57aa..2cbe44d 100644
--- a/javascript/olm_pk.js
+++ b/javascript/olm_pk.js
@@ -302,7 +302,7 @@ PkSigning.prototype['init_with_seed'] = restore_stack(function (seed) {
Module['HEAPU8'].set(seed, seed_buffer);
var pubkey_length = pk_signing_method(
- Module['_olm_pk_sign_public_key_length']
+ Module['_olm_pk_signing_public_key_length']
)();
var pubkey_buffer = stack(pubkey_length + NULL_BYTE_PADDING_LENGTH);
try {
@@ -320,7 +320,7 @@ PkSigning.prototype['init_with_seed'] = restore_stack(function (seed) {
PkSigning.prototype['generate_seed'] = restore_stack(function () {
var random_length = pk_signing_method(
- Module['_olm_pk_sign_seed_length']
+ Module['_olm_pk_signing_seed_length']
)();
var random_buffer = random_stack(random_length);
var key_arr = new Uint8Array(
diff --git a/src/pk.cpp b/src/pk.cpp
index 111e54b..c619aee 100644
--- a/src/pk.cpp
+++ b/src/pk.cpp
@@ -436,11 +436,11 @@ size_t olm_clear_pk_signing(OlmPkSigning *sign) {
return sizeof(OlmPkSigning);
}
-size_t olm_pk_sign_seed_length(void) {
+size_t olm_pk_signing_seed_length(void) {
return ED25519_RANDOM_LENGTH;
}
-size_t olm_pk_sign_public_key_length(void) {
+size_t olm_pk_signing_public_key_length(void) {
return olm::encode_base64_length(ED25519_PUBLIC_KEY_LENGTH);
}
@@ -449,12 +449,12 @@ size_t olm_pk_signing_key_from_seed(
void * pubkey, size_t pubkey_length,
void * seed, size_t seed_length
) {
- if (pubkey_length < olm_pk_sign_public_key_length()) {
+ if (pubkey_length < olm_pk_signing_public_key_length()) {
signing->last_error =
OlmErrorCode::OLM_OUTPUT_BUFFER_TOO_SMALL;
return std::size_t(-1);
}
- if (seed_length < olm_pk_sign_seed_length()) {
+ if (seed_length < olm_pk_signing_seed_length()) {
signing->last_error =
OlmErrorCode::OLM_INPUT_BUFFER_TOO_SMALL;
return std::size_t(-1);