ObjFW  Diff

Differences From Artifact [f05769188c]:

To Artifact [239cec3ca7]:


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
235

236
237
238
239


240
241

242
243
244
245
246
247
248
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

235
236
237


238
239
240

241
242
243
244
245
246
247
248







-
+









-
-
+
+







-
-
-
+
+
+






-
+

















-
+









-
-
+
+


-
+




-
+


-
-
+
+

-
+







	bits[1] += size >> 29;

	/* Bytes already in shsInfo->data */
	t = (t >> 3) & 0x3F;

	/* Handle any leading odd-sized chunks */
	if (t) {
		uint8_t *p = in + t;
		uint8_t *p = in.u8 + t;

		t = 64 - t;

		if (size < t) {
			memcpy(p, buffer, size);
			return;
		}

		memcpy(p, buffer, t);
		of_bswap32_vec_if_be((uint32_t*)in, 16);
		md5_transform(buf, (uint32_t*)in);
		of_bswap32_vec_if_be(in.u32, 16);
		md5_transform(buf, in.u32);

		buffer += t;
		size -= t;
	}

	/* Process data in 64-byte chunks */
	while (size >= 64) {
		memcpy(in, buffer, 64);
		of_bswap32_vec_if_be((uint32_t*)in, 16);
		md5_transform(buf, (uint32_t*)in);
		memcpy(in.u8, buffer, 64);
		of_bswap32_vec_if_be(in.u32, 16);
		md5_transform(buf, in.u32);

		buffer += 64;
		size -= 64;
	}

	/* Handle any remaining bytes of data. */
	memcpy(in, buffer, size);
	memcpy(in.u8, buffer, size);
}

- (uint8_t*)digest
{
	uint8_t	*p;
	size_t	count;

	if (isCalculated)
		return (uint8_t*)buf;

	/* Compute number of bytes mod 64 */
	count = (bits[0] >> 3) & 0x3F;

	/*
	 * Set the first char of padding to 0x80. This is safe since there is
	 * always at least one byte free
	 */
	p = in + count;
	p = in.u8 + count;
	*p++ = 0x80;

	/* Bytes of padding needed to make 64 bytes */
	count = 64 - 1 - count;

	/* Pad out to 56 mod 64 */
	if (count < 8) {
		/* Two lots of padding: Pad the first block to 64 bytes */
		memset(p, 0, count);
		of_bswap32_vec_if_be((uint32_t*)in, 16);
		md5_transform(buf, (uint32_t*)in);
		of_bswap32_vec_if_be(in.u32, 16);
		md5_transform(buf, in.u32);

		/* Now fill the next block with 56 bytes */
		memset(in, 0, 56);
		memset(in.u8, 0, 56);
	} else {
		/* Pad block to 56 bytes */
		memset(p, 0, count - 8);
	}
	of_bswap32_vec_if_be((uint32_t*)in, 14);
	of_bswap32_vec_if_be(in.u32, 14);

	/* Append length in bits and transform */
	((uint32_t*)in)[14] = bits[0];
	((uint32_t*)in)[15] = bits[1];
	in.u32[14] = bits[0];
	in.u32[15] = bits[1];

	md5_transform(buf, (uint32_t*)in);
	md5_transform(buf, in.u32);
	of_bswap32_vec_if_be(buf, 4);

	isCalculated = YES;

	return (uint8_t*)buf;
}
@end