Changeset 5261 for pjproject/trunk/third_party/srtp/crypto/replay/rdb.c

Timestamp:

Mar 15, 2016 3:57:39 AM (8 years ago)

Author:

nanang

Message:

Close #1847: Upgraded libsrtp version to 1.5.4 and added support for AES-CM-256 crypto.

File:

• pjproject/trunk/third_party/srtp/crypto/replay/rdb.c (modified) (3 diffs)

pjproject/trunk/third_party/srtp/crypto/replay/rdb.c

@@ -45 +45 @@
 
 
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
+
 #include "rdb.h"
 
@@ -71 +75 @@
 
 err_status_t
-rdb_check(const rdb_t *rdb, uint32_t index) {
+rdb_check(const rdb_t *rdb, uint32_t p_index) {
   
   /* if the index appears after (or at very end of) the window, its good */
-  if (index >= rdb->window_start + rdb_bits_in_bitmask)
+  if (p_index >= rdb->window_start + rdb_bits_in_bitmask)
     return err_status_ok;
   
   /* if the index appears before the window, its bad */
-  if (index < rdb->window_start)
+  if (p_index < rdb->window_start)
     return err_status_replay_old;
 
   /* otherwise, the index appears within the window, so check the bitmask */
-  if (v128_get_bit(&rdb->bitmask, (index - rdb->window_start)) == 1)
+  if (v128_get_bit(&rdb->bitmask, (p_index - rdb->window_start)) == 1)
     return err_status_replay_fail;    
       
@@ -99 +103 @@
 
 err_status_t
-rdb_add_index(rdb_t *rdb, uint32_t index) {
+rdb_add_index(rdb_t *rdb, uint32_t p_index) {
   int delta;  
 
-  /* here we *assume* that index > rdb->window_start */
+  /* here we *assume* that p_index > rdb->window_start */
 
-  delta = (index - rdb->window_start);    
+  delta = (p_index - rdb->window_start);    
   if (delta < rdb_bits_in_bitmask) {
 
-    /* if the index is within the window, set the appropriate bit */
+    /* if the p_index is within the window, set the appropriate bit */
     v128_set_bit(&rdb->bitmask, delta);