remove offset from counters

src/cipher_block.ml

@@ -83,7 +83,7 @@ module Counters = struct
     val size : int
     val add  : ctr -> int64 -> ctr
     val of_octets : string -> ctr
-    val unsafe_count_into : ctr -> bytes -> int -> blocks:int -> unit
+    val unsafe_count_into : ctr -> bytes -> blocks:int -> unit
   end
 
   module C64be = struct
@@ -92,10 +92,10 @@ module Counters = struct
     (* Until OCaml 4.13 is lower bound*)
     let of_octets cs = Bytes.get_int64_be (Bytes.unsafe_of_string cs) 0
     let add = Int64.add
-    let unsafe_count_into t buf off ~blocks =
+    let unsafe_count_into t buf ~blocks =
       let tmp = Bytes.create 8 in
       Bytes.set_int64_be tmp 0 t;
-      Native.count8be tmp buf off ~blocks
+      Native.count8be tmp buf ~blocks
   end
 
   module C128be = struct
@@ -108,21 +108,21 @@ module Counters = struct
       let w0'  = Int64.add w0 n in
       let flip = if Int64.logxor w0 w0' < 0L then w0' > w0 else w0' < w0 in
       ((if flip then Int64.succ w1 else w1), w0')
-    let unsafe_count_into (w1, w0) buf off ~blocks =
+    let unsafe_count_into (w1, w0) buf ~blocks =
       let tmp = Bytes.create 16 in
       Bytes.set_int64_be tmp 0 w1; Bytes.set_int64_be tmp 8 w0;
-      Native.count16be tmp buf off ~blocks
+      Native.count16be tmp buf ~blocks
   end
 
   module C128be32 = struct
     include C128be
     let add (w1, w0) n =
       let hi = 0xffffffff00000000L and lo = 0x00000000ffffffffL in
       (w1, Int64.(logor (logand hi w0) (add n w0 |> logand lo)))
-    let unsafe_count_into (w1, w0) buf off ~blocks =
+    let unsafe_count_into (w1, w0) buf ~blocks =
       let tmp = Bytes.create 16 in
       Bytes.set_int64_be tmp 0 w1; Bytes.set_int64_be tmp 8 w0;
-      Native.count16be4 tmp buf off ~blocks
+      Native.count16be4 tmp buf ~blocks
   end
 end
 
@@ -208,13 +208,13 @@ module Modes = struct
     let stream ~key ~ctr n =
       let blocks = imax 0 n / block_size in
       let buf = Bytes.create n in
-      Ctr.unsafe_count_into ctr ~blocks buf 0 ;
+      Ctr.unsafe_count_into ctr ~blocks buf ;
       Core.encrypt ~key ~blocks (Bytes.unsafe_to_string buf) 0 buf 0 ;
       let slack = imax 0 n mod block_size in
       if slack <> 0 then begin
         let buf' = Bytes.create block_size in
         let ctr = Ctr.add ctr (Int64.of_int blocks) in
-        Ctr.unsafe_count_into ctr ~blocks:1 buf' 0 ;
+        Ctr.unsafe_count_into ctr ~blocks:1 buf' ;
         Core.encrypt ~key ~blocks:1 (Bytes.unsafe_to_string buf') 0 buf' 0 ;
         Bytes.unsafe_blit buf' 0 buf (blocks * block_size) slack
       end;

src/native.ml

@@ -39,9 +39,9 @@ end
  * Unsolved: bounds-checked XORs are slowing things down considerably... *)
 external xor_into_bytes : string -> int -> bytes -> int -> int -> unit = "mc_xor_into_bytes" [@@noalloc]
 
-external count8be   : bytes -> bytes -> int -> blocks:int -> unit = "mc_count_8_be"    [@@noalloc]
-external count16be  : bytes -> bytes -> int -> blocks:int -> unit = "mc_count_16_be"   [@@noalloc]
-external count16be4 : bytes -> bytes -> int -> blocks:int -> unit = "mc_count_16_be_4" [@@noalloc]
+external count8be   : bytes -> bytes -> blocks:int -> unit = "mc_count_8_be"    [@@noalloc]
+external count16be  : bytes -> bytes -> blocks:int -> unit = "mc_count_16_be"   [@@noalloc]
+external count16be4 : bytes -> bytes -> blocks:int -> unit = "mc_count_16_be_4" [@@noalloc]
 
 external misc_mode : unit -> int = "mc_misc_mode" [@@noalloc]
 

src/native/mirage_crypto.h

@@ -114,6 +114,6 @@ CAMLprim value
 mc_xor_into_bytes_generic (value b1, value off1, value b2, value off2, value n);
 
 CAMLprim value
-mc_count_16_be_4_generic (value ctr, value dst, value off, value blocks);
+mc_count_16_be_4_generic (value ctr, value dst, value blocks);
 
 #endif /* H__MIRAGE_CRYPTO */

src/native/misc.c

@@ -60,9 +60,9 @@ mc_xor_into_bytes_generic (value b1, value off1, value b2, value off2, value n)
 }
 
 #define __export_counter(name, f)                                        \
-  CAMLprim value name (value ctr, value dst, value off, value blocks) {  \
+  CAMLprim value name (value ctr, value dst, value blocks) {  \
     f ( (uint64_t*) Bp_val (ctr),                                        \
-        (uint64_t*) _bp_uint8_off (dst, off), Long_val (blocks) );       \
+        (uint64_t*) _bp_uint8 (dst), Long_val (blocks) );       \
     return Val_unit;                                                     \
   }
 

src/native/misc_sse.c

@@ -48,11 +48,11 @@ mc_xor_into_bytes (value b1, value off1, value b2, value off2, value n) {
 }
 
 #define __export_counter(name, f)                                        \
-  CAMLprim value name (value ctr, value dst, value off, value blocks) {  \
+  CAMLprim value name (value ctr, value dst, value blocks) {  \
     _mc_switch_accel(ssse3,                                     \
-      name##_generic (ctr, dst, off, blocks),                            \
+      name##_generic (ctr, dst, blocks),                            \
       f ( (uint64_t*) Bp_val (ctr),                                      \
-          (uint64_t*) _bp_uint8_off (dst, off), Long_val (blocks) ))     \
+          (uint64_t*) _bp_uint8 (dst), Long_val (blocks) ))     \
     return Val_unit;                                                     \
   }