Commit 0348f06a authored by Hubert Chathi's avatar Hubert Chathi
Browse files

rename functions to be more consistent

parent 2589d1b1

include/olm/pk.h

+2 −2
Original line number Diff line number Diff line
@@ -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();

javascript/olm_pk.js

+2 −2
Original line number Diff line number Diff line
@@ -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(

src/pk.cpp

+4 −4
Original line number Diff line number Diff line
@@ -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);