From 0b1150d20f49eb0ec82b57ab3fac727f346c0da0 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Tue, 24 Apr 2018 12:01:36 +0300 Subject: libs: updated libsignal-c protocols: jabber: omemo: used 31bit device id instead of 32bit (32bit conflicts with conversations, not xep compliant) --- libs/libaxolotl/src/device_consistency.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'libs/libaxolotl/src/device_consistency.c') diff --git a/libs/libaxolotl/src/device_consistency.c b/libs/libaxolotl/src/device_consistency.c index 4b18bc1471..a079d11770 100644 --- a/libs/libaxolotl/src/device_consistency.c +++ b/libs/libaxolotl/src/device_consistency.c @@ -641,16 +641,18 @@ int device_consistency_signature_list_sort_comparator(const void *a, const void int result; const device_consistency_signature *sig1 = *((const device_consistency_signature **)a); const device_consistency_signature *sig2 = *((const device_consistency_signature **)b); - signal_buffer *buf1 = device_consistency_signature_get_signature(sig1); - signal_buffer *buf2 = device_consistency_signature_get_signature(sig2); + signal_buffer *buf1 = device_consistency_signature_get_vrf_output(sig1); + signal_buffer *buf2 = device_consistency_signature_get_vrf_output(sig2); size_t len1 = signal_buffer_len(buf1); size_t len2 = signal_buffer_len(buf2); if(len1 == len2) { result = memcmp(signal_buffer_data(buf1), signal_buffer_data(buf2), len1); } - else { - result = (int)(len1 - len2); + else if (len1 < len2) { + result = -1; + } else { + result = 1; } return result; -- cgit v1.2.3