diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-04-08 15:08:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 15:08:17 -0400 |
| commit | 2a6400716c1e17b65507cd2a433192f81cd402df (patch) | |
| tree | eb034ad74fab1e337b422d387e8e9a8b62bfb098 /include/olm | |
| parent | fcfa5f12a4cd482973fdf03000af4a26a360dc2e (diff) | |
| parent | 709687a7b56d6768831766459940b6f0bb078d85 (diff) | |
Merge branch 'master' into poljar/python-sas
Diffstat (limited to 'include/olm')
| -rw-r--r-- | include/olm/sas.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/olm/sas.h b/include/olm/sas.h index 46d4176..ec90ae7 100644 --- a/include/olm/sas.h +++ b/include/olm/sas.h @@ -147,6 +147,14 @@ size_t olm_sas_calculate_mac( void * mac, size_t mac_length ); +// for compatibility with an old version of Riot +size_t olm_sas_calculate_mac_long_kdf( + OlmSAS * sas, + void * input, size_t input_length, + const void * info, size_t info_length, + void * mac, size_t mac_length +); + /** @} */ // end of SAS group #ifdef __cplusplus |