projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:fmorgner/umurmur
[umurmur.git]
/
src
/
crypt.c
diff --git
a/src/crypt.c
b/src/crypt.c
index f90dfa02b70946b606f58a95efcab529e2e54826..ddf1f74af93dc9eff77e922e116555860aefbd79 100644
(file)
--- a/
src/crypt.c
+++ b/
src/crypt.c
@@
-1,5
+1,5
@@
-/* Copyright (C) 2009-201
3
, Martin Johansson <martin@fatbob.nu>
- Copyright (C) 2005-201
3
, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-201
4
, Martin Johansson <martin@fatbob.nu>
+ Copyright (C) 2005-201
4
, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
All rights reserved.
@@
-199,7
+199,7
@@
bool_t CryptState_decrypt(cryptState_t *cs, const unsigned char *source, unsigne
CryptState_ocb_decrypt(cs, source+4, dst, plain_length, cs->decrypt_iv, tag);
if (memcmp(tag, source+1, 3) != 0) {
CryptState_ocb_decrypt(cs, source+4, dst, plain_length, cs->decrypt_iv, tag);
if (memcmp(tag, source+1, 3) != 0) {
- memcpy(cs->decrypt_iv, saveiv, AES_BLOCK_SIZE);
+ memcpy(cs->decrypt_iv, saveiv, AES_BLOCK_SIZE);
return false;
}
cs->decrypt_history[cs->decrypt_iv[0]] = cs->decrypt_iv[1];
return false;
}
cs->decrypt_history[cs->decrypt_iv[0]] = cs->decrypt_iv[1];