Differences From Artifact [7457ae87b9]:
- File src/OFMD5Hash.m — part of check-in [1a86b8175b] at 2022-02-12 07:46:07 on branch trunk — Update copyright (user: js, size: 6307) [annotate] [blame] [check-ins using]
To Artifact [190d96fa7c]:
- File
src/OFMD5Hash.m
— part of check-in
[82801897d3]
at
2022-03-25 10:22:55
on branch trunk
— OFCryptographicHash: Add -[calculate]
Before, -[digest] would do the final calculation, however, this would
mean a property modifies state, which is bad. (user: js, size: 6487) [annotate] [blame] [check-ins using] [more...]
| ︙ | ︙ | |||
17 18 19 20 21 22 23 24 25 26 27 28 29 30 | #include <string.h> #import "OFMD5Hash.h" #import "OFSecureData.h" #import "OFHashAlreadyCalculatedException.h" #import "OFOutOfRangeException.h" static const size_t digestSize = 16; static const size_t blockSize = 64; OF_DIRECT_MEMBERS @interface OFMD5Hash () | > | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | #include <string.h> #import "OFMD5Hash.h" #import "OFSecureData.h" #import "OFHashAlreadyCalculatedException.h" #import "OFHashNotCalculatedException.h" #import "OFOutOfRangeException.h" static const size_t digestSize = 16; static const size_t blockSize = 64; OF_DIRECT_MEMBERS @interface OFMD5Hash () |
| ︙ | ︙ | |||
240 241 242 243 244 245 246 |
_iVars->bufferLength = 0;
}
}
}
- (const unsigned char *)digest
{
| | > > | > > > > > > > < < | 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 |
_iVars->bufferLength = 0;
}
}
}
- (const unsigned char *)digest
{
if (!_calculated)
@throw [OFHashNotCalculatedException exceptionWithObject: self];
return (const unsigned char *)_iVars->state;
}
- (void)calculate
{
if (_calculated)
@throw [OFHashAlreadyCalculatedException
exceptionWithObject: self];
_iVars->buffer.bytes[_iVars->bufferLength] = 0x80;
OFZeroMemory(_iVars->buffer.bytes + _iVars->bufferLength + 1,
64 - _iVars->bufferLength - 1);
if (_iVars->bufferLength >= 56) {
processBlock(_iVars->state, _iVars->buffer.words);
OFZeroMemory(_iVars->buffer.bytes, 64);
}
_iVars->buffer.words[14] =
OFToLittleEndian32((uint32_t)(_iVars->bits & 0xFFFFFFFF));
_iVars->buffer.words[15] =
OFToLittleEndian32((uint32_t)(_iVars->bits >> 32));
processBlock(_iVars->state, _iVars->buffer.words);
OFZeroMemory(&_iVars->buffer, sizeof(_iVars->buffer));
byteSwapVectorIfBE(_iVars->state, 4);
_calculated = true;
}
- (void)reset
{
[self of_resetState];
_iVars->bits = 0;
OFZeroMemory(&_iVars->buffer, sizeof(_iVars->buffer));
_iVars->bufferLength = 0;
_calculated = false;
}
@end
|