Bug 1230759: Part 10 - reapplied patches from bug 1003929 draft
authorNils Ohlmeier [:drno] <drno@ohlmeier.org>
Sat, 11 Nov 2017 01:37:05 -0800
changeset 697519 3387a9ae7d40faea9ac8b3ee159936b1b5b1e697
parent 697518 0981bd942678e807c0182dcf0780970c93afd82b
child 697520 7497e304a4f960891cf54d4cb5ed4e68501e9f55
push id89030
push userdrno@ohlmeier.org
push dateTue, 14 Nov 2017 06:38:04 +0000
bugs1230759, 1003929
milestone58.0a1
Bug 1230759: Part 10 - reapplied patches from bug 1003929 MozReview-Commit-ID: Eo4DMEuyZ3R
netwerk/srtp/src/crypto/replay/rdbx.c
--- a/netwerk/srtp/src/crypto/replay/rdbx.c
+++ b/netwerk/srtp/src/crypto/replay/rdbx.c
@@ -125,23 +125,18 @@ int32_t srtp_index_guess(const srtp_xtd_
 {
 #ifdef NO_64BIT_MATH
     uint32_t local_roc = ((high32(*local) << 16) | (low32(*local) >> 16));
     uint16_t local_seq = (uint16_t)(low32(*local));
 #else
     uint32_t local_roc = (uint32_t)(*local >> 16);
     uint16_t local_seq = (uint16_t)*local;
 #endif
-#ifdef NO_64BIT_MATH
-    uint32_t guess_roc = ((high32(*guess) << 16) | (low32(*guess) >> 16));
-    uint16_t guess_seq = (uint16_t)(low32(*guess));
-#else
-    uint32_t guess_roc = (uint32_t)(*guess >> 16);
-    uint16_t guess_seq = (uint16_t)*guess;
-#endif
+    uint32_t guess_roc;
+    uint16_t guess_seq;
     int32_t difference;
 
     if (local_seq < seq_num_median) {
         if (s - local_seq > seq_num_median) {
             guess_roc = local_roc - 1;
             difference = s - local_seq - seq_num_max;
         } else {
             guess_roc = local_roc;