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

Add aliases for deprecated functions

Browse source
This commit is contained in:
David Baker 2018-10-11 18:16:39 +01:00
parent e73ebcea67
commit fac1d52dfe
2 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/olm/pk.h
View file

@ -116,6 +116,10 @@ size_t olm_clear_pk_decryption(
*/ */
size_t olm_pk_private_key_length(); size_t olm_pk_private_key_length();
/** DEPRECATED: Use olm_pk_private_key_length()
*/
size_t olm_pk_generate_key_random_length(void);
/** Initialise the key from the private part of a key as returned by /** Initialise the key from the private part of a key as returned by
* olm_pk_get_private_key(). The associated public key will be written to the * olm_pk_get_private_key(). The associated public key will be written to the
* pubkey buffer. Returns olm_error() on failure. If the pubkey buffer is too * pubkey buffer. Returns olm_error() on failure. If the pubkey buffer is too
@ -132,6 +136,14 @@ size_t olm_pk_key_from_private(
void * privkey, size_t privkey_length void * privkey, size_t privkey_length
); );
/** DEPRECATED: Use olm_pk_key_from_private
*/
size_t olm_pk_generate_key(
OlmPkDecryption * decryption,
void * pubkey, size_t pubkey_length,
void * privkey, size_t privkey_length
);
/** Returns the number of bytes needed to store a decryption object. */ /** Returns the number of bytes needed to store a decryption object. */
size_t olm_pickle_pk_decryption_length( size_t olm_pickle_pk_decryption_length(
OlmPkDecryption * decryption OlmPkDecryption * decryption

12
src/pk.cpp
View file

@ -191,6 +191,10 @@ size_t olm_pk_private_key_length(void) {
return CURVE25519_KEY_LENGTH; return CURVE25519_KEY_LENGTH;
} }
size_t olm_pk_generate_key_random_length(void) {
return olm_pk_private_key_length();
}
size_t olm_pk_key_length(void) { size_t olm_pk_key_length(void) {
return olm::encode_base64_length(CURVE25519_KEY_LENGTH); return olm::encode_base64_length(CURVE25519_KEY_LENGTH);
} }
@ -220,6 +224,14 @@ size_t olm_pk_key_from_private(
return 0; return 0;
} }
size_t olm_pk_generate_key(
OlmPkDecryption * decryption,
void * pubkey, size_t pubkey_length,
void * privkey, size_t privkey_length
) {
return olm_pk_key_from_private(decryption, pubkey, pubkey_length, privkey, privkey_length);
}
namespace { namespace {
static const std::uint32_t PK_DECRYPTION_PICKLE_VERSION = 1; static const std::uint32_t PK_DECRYPTION_PICKLE_VERSION = 1;