diff options
author | David Baker <dave@matrix.org> | 2018-10-01 16:14:39 +0100 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2018-10-01 16:14:39 +0100 |
commit | b51d75392bd68a6938f27ad07ea4f3d58b9dc66a (patch) | |
tree | 45556a8e8e258e4ab164e596df35d6a34eb02d90 | |
parent | c4a39186862b61915cab1e98e6eed417878020cd (diff) | |
parent | 8f6e0557eeb3afe1088ce1abfc7351eb697eea24 (diff) |
Merge remote-tracking branch 'origin/master' into dbkr/wasm
-rw-r--r-- | docs/olm.rst | 2 | ||||
-rw-r--r-- | src/pk.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/olm.rst b/docs/olm.rst index 9f82c8e..9c13478 100644 --- a/docs/olm.rst +++ b/docs/olm.rst @@ -72,7 +72,7 @@ info. Advancing the chain key ~~~~~~~~~~~~~~~~~~~~~~~ -Advancing a chain key takes the previous chain key, :math:`C_{i,j-i}`. The next +Advancing a chain key takes the previous chain key, :math:`C_{i,j-1}`. The next chain key, :math:`C_{i,j}`, is the HMAC-SHA-256_ of ``"\x02"`` using the previous chain key as the key. @@ -189,7 +189,7 @@ size_t olm_pk_generate_key( void * pubkey, size_t pubkey_length, void * random, size_t random_length ) { - if (pubkey_length < CURVE25519_KEY_LENGTH) { + if (pubkey_length < olm_pk_key_length()) { decryption->last_error = OlmErrorCode::OLM_OUTPUT_BUFFER_TOO_SMALL; return std::size_t(-1); |