projects
/
platform
/
upstream
/
cryptsetup.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 2.6.1
[platform/upstream/cryptsetup.git]
/
lib
/
luks1
/
af.c
diff --git
a/lib/luks1/af.c
b/lib/luks1/af.c
index
3aa319d
..
76afeac
100644
(file)
--- a/
lib/luks1/af.c
+++ b/
lib/luks1/af.c
@@
-2,7
+2,7
@@
* AFsplitter - Anti forensic information splitter
*
* Copyright (C) 2004 Clemens Fruhwirth <clemens@endorphin.org>
* AFsplitter - Anti forensic information splitter
*
* Copyright (C) 2004 Clemens Fruhwirth <clemens@endorphin.org>
- * Copyright (C) 2009-202
1
Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2009-202
3
Red Hat, Inc. All rights reserved.
*
* AFsplitter diffuses information over a large stripe of data,
* therefore supporting secure data destruction.
*
* AFsplitter diffuses information over a large stripe of data,
* therefore supporting secure data destruction.
@@
-131,7
+131,7
@@
out:
return r;
}
return r;
}
-int AF_merge(
struct crypt_device *ctx __attribute__((unused)),
const char *src, char *dst,
+int AF_merge(const char *src, char *dst,
size_t blocksize, unsigned int blocknumbers, const char *hash)
{
unsigned int i;
size_t blocksize, unsigned int blocknumbers, const char *hash)
{
unsigned int i;
@@
-142,7
+142,7
@@
int AF_merge(struct crypt_device *ctx __attribute__((unused)), const char *src,
if (!bufblock)
return -ENOMEM;
if (!bufblock)
return -ENOMEM;
- for(i = 0; i < blocknumbers - 1; i++) {
+ for
(i = 0; i < blocknumbers - 1; i++) {
XORblock(src + blocksize * i, bufblock, bufblock, blocksize);
r = diffuse(bufblock, bufblock, blocksize, hash);
if (r < 0)
XORblock(src + blocksize * i, bufblock, bufblock, blocksize);
r = diffuse(bufblock, bufblock, blocksize, hash);
if (r < 0)