1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
|
--- cryptmodes_64.ml.orig 2001-03-10 16:43:21 UTC
+++ cryptmodes_64.ml
@@ -52,7 +52,7 @@ module Make_modes (M : Cryptsystem_64.T) =
if l mod 8 <> 0 then failwith "encrypt_cbc";
let n = l / 8 in
- let data' = String.create l in
+ let data' = Bytes.create l in
let v = ref iv in
for i = 0 to n-1 do
@@ -79,7 +79,7 @@ module Make_modes (M : Cryptsystem_64.T) =
data'.[j+7] <- Char.chr(v0' land 0xff);
done;
- !v, data'
+ !v, Bytes.to_string data'
let decrypt_cbc k iv data =
@@ -87,7 +87,7 @@ module Make_modes (M : Cryptsystem_64.T) =
if l mod 8 <> 0 then failwith "decrypt_cbc";
let n = l / 8 in
- let data' = String.create l in
+ let data' = Bytes.create l in
let v = ref iv in
for i = 0 to n-1 do
@@ -119,12 +119,12 @@ module Make_modes (M : Cryptsystem_64.T) =
v := (x3,x2,x1,x0);
done;
- !v, data'
+ !v, Bytes.to_string data'
let encrypt_cfb8 k iv data =
let l = String.length data in
- let data' = String.create l in
+ let data' = Bytes.create l in
let sr = ref iv in (* shift register *)
@@ -139,12 +139,12 @@ module Make_modes (M : Cryptsystem_64.T) =
((sr0 lsl 8) land 0xff00) lor c);
done;
- !sr, data'
+ !sr, Bytes.to_string data'
let decrypt_cfb8 k iv data =
let l = String.length data in
- let data' = String.create l in
+ let data' = Bytes.create l in
let sr = ref iv in (* shift register *)
@@ -160,7 +160,7 @@ module Make_modes (M : Cryptsystem_64.T) =
((sr0 lsl 8) land 0xff00) lor c);
done;
- !sr, data'
+ !sr, Bytes.to_string data'
let array_of_quadrupel (n3,n2,n1,n0) =
@@ -182,7 +182,7 @@ module Make_modes (M : Cryptsystem_64.T) =
let encrypt_cfb64 k iv j data =
if j < 0 or j > 7 then failwith "encrypt_cfb64";
let l = String.length data in
- let data' = String.create l in
+ let data' = Bytes.create l in
let sr_a = ref (array_of_quadrupel iv) in
let jc = ref j in
@@ -200,13 +200,13 @@ module Make_modes (M : Cryptsystem_64.T) =
done;
let sr = quadrupel_of_array !sr_a in
- sr, !jc, data'
+ sr, !jc, Bytes.to_string data'
let decrypt_cfb64 k iv j data =
if j < 0 or j > 7 then failwith "decrypt_cfb64";
let l = String.length data in
- let data' = String.create l in
+ let data' = Bytes.create l in
let sr_a = ref (array_of_quadrupel iv) in
let jc = ref j in
@@ -224,13 +224,13 @@ module Make_modes (M : Cryptsystem_64.T) =
done;
let sr = quadrupel_of_array !sr_a in
- sr, !jc, data'
+ sr, !jc, Bytes.to_string data'
let crypt_ofb k iv j data =
if j < 0 or j > 7 then failwith "crypt_ofb";
let l = String.length data in
- let data' = String.create l in
+ let data' = Bytes.create l in
let sr_a = ref (array_of_quadrupel iv) in
let jc = ref j in
@@ -247,7 +247,7 @@ module Make_modes (M : Cryptsystem_64.T) =
done;
let sr = quadrupel_of_array !sr_a in
- sr, !jc, data'
+ sr, !jc, Bytes.to_string data'
end
;;
@@ -263,7 +263,7 @@ module Make_modes_int32 (M : Cryptsystem_64.T) =
if l mod 8 <> 0 then failwith "encrypt_cbc";
let n = l / 8 in
- let data' = String.create l in
+ let data' = Bytes.create l in
let vl = ref Int32.zero in
let vr = ref Int32.zero in
@@ -308,7 +308,7 @@ module Make_modes_int32 (M : Cryptsystem_64.T) =
data'.[j+7] <- Char.chr(v0' land 0xff);
done;
- quadruple_of_int32 !vl !vr, data'
+ quadruple_of_int32 !vl !vr, Bytes.to_string data'
let decrypt_cbc k iv data =
@@ -316,7 +316,7 @@ module Make_modes_int32 (M : Cryptsystem_64.T) =
if l mod 8 <> 0 then failwith "decrypt_cbc";
let n = l / 8 in
- let data' = String.create l in
+ let data' = Bytes.create l in
let vl = ref Int32.zero in
let vr = ref Int32.zero in
@@ -367,12 +367,12 @@ module Make_modes_int32 (M : Cryptsystem_64.T) =
vr := xr;
done;
- quadruple_of_int32 !vl !vr, data'
+ quadruple_of_int32 !vl !vr, Bytes.to_string data'
let encrypt_cfb8 k iv data =
let l = String.length data in
- let data' = String.create l in
+ let data' = Bytes.create l in
let sr_l = ref Int32.zero in (* shift register MSB *)
let sr_r = ref Int32.zero in (* shift register LSB *)
@@ -396,12 +396,12 @@ module Make_modes_int32 (M : Cryptsystem_64.T) =
(Int32.of_int c)
done;
- quadruple_of_int32 !sr_l !sr_r, data'
+ quadruple_of_int32 !sr_l !sr_r, Bytes.to_string data'
let decrypt_cfb8 k iv data =
let l = String.length data in
- let data' = String.create l in
+ let data' = Bytes.create l in
let sr_l = ref Int32.zero in (* shift register MSB *)
let sr_r = ref Int32.zero in (* shift register LSB *)
@@ -426,7 +426,7 @@ module Make_modes_int32 (M : Cryptsystem_64.T) =
(Int32.of_int c)
done;
- quadruple_of_int32 !sr_l !sr_r, data'
+ quadruple_of_int32 !sr_l !sr_r, Bytes.to_string data'
let mask =
@@ -439,7 +439,7 @@ module Make_modes_int32 (M : Cryptsystem_64.T) =
let encrypt_cfb64 k iv j data =
if j < 0 or j > 7 then failwith "encrypt_cfb64";
let l = String.length data in
- let data' = String.create l in
+ let data' = Bytes.create l in
let sr_l = ref Int32.zero in (* shift register MSB *)
let sr_r = ref Int32.zero in (* shift register LSB *)
@@ -479,13 +479,13 @@ module Make_modes_int32 (M : Cryptsystem_64.T) =
jc := (!jc + 1) mod 8;
done;
- quadruple_of_int32 !sr_l !sr_r, !jc, data'
+ quadruple_of_int32 !sr_l !sr_r, !jc, Bytes.to_string data'
let decrypt_cfb64 k iv j data =
if j < 0 or j > 7 then failwith "decrypt_cfb64";
let l = String.length data in
- let data' = String.create l in
+ let data' = Bytes.create l in
let sr_l = ref Int32.zero in (* shift register MSB *)
let sr_r = ref Int32.zero in (* shift register LSB *)
@@ -525,13 +525,13 @@ module Make_modes_int32 (M : Cryptsystem_64.T) =
jc := (!jc + 1) mod 8;
done;
- quadruple_of_int32 !sr_l !sr_r, !jc, data'
+ quadruple_of_int32 !sr_l !sr_r, !jc, Bytes.to_string data'
let crypt_ofb k iv j data =
if j < 0 or j > 7 then failwith "crypt_ofb";
let l = String.length data in
- let data' = String.create l in
+ let data' = Bytes.create l in
let sr_l = ref Int32.zero in (* shift register MSB *)
let sr_r = ref Int32.zero in (* shift register LSB *)
@@ -561,7 +561,7 @@ module Make_modes_int32 (M : Cryptsystem_64.T) =
jc := (!jc + 1) mod 8;
done;
- quadruple_of_int32 !sr_l !sr_r, !jc, data'
+ quadruple_of_int32 !sr_l !sr_r, !jc, Bytes.to_string data'
end
;;
|
