projects
/
platform
/
upstream
/
cryptsetup.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
555d5f6
)
Activate devices privately.
author
Milan Broz
<gmazyland@gmail.com>
Wed, 2 May 2012 15:14:02 +0000
(17:14 +0200)
committer
Milan Broz
<gmazyland@gmail.com>
Tue, 22 May 2012 21:27:40 +0000
(23:27 +0200)
src/crypt_reencrypt.c
patch
|
blob
|
history
diff --git
a/src/crypt_reencrypt.c
b/src/crypt_reencrypt.c
index
a3abbba
..
94f3f42
100644
(file)
--- a/
src/crypt_reencrypt.c
+++ b/
src/crypt_reencrypt.c
@@
-350,7
+350,7
@@
static int activate_luks_headers(void)
if ((r = crypt_activate_by_passphrase(cd, rnc.header_file_org,
CRYPT_ANY_SLOT, rnc.password, rnc.passwordLen,
if ((r = crypt_activate_by_passphrase(cd, rnc.header_file_org,
CRYPT_ANY_SLOT, rnc.password, rnc.passwordLen,
- CRYPT_ACTIVATE_READONLY)) < 0)
+ CRYPT_ACTIVATE_READONLY
|CRYPT_ACTIVATE_PRIVATE
)) < 0)
goto out;
if ((r = crypt_init(&cd_new, rnc.header_file_new)) ||
goto out;
if ((r = crypt_init(&cd_new, rnc.header_file_new)) ||
@@
-360,7
+360,7
@@
static int activate_luks_headers(void)
if ((r = crypt_activate_by_passphrase(cd_new, rnc.header_file_new,
CRYPT_ANY_SLOT, rnc.password, rnc.passwordLen,
if ((r = crypt_activate_by_passphrase(cd_new, rnc.header_file_new,
CRYPT_ANY_SLOT, rnc.password, rnc.passwordLen,
- CRYPT_ACTIVATE_SHARED)) < 0)
+ CRYPT_ACTIVATE_SHARED
|CRYPT_ACTIVATE_PRIVATE
)) < 0)
goto out;
out:
crypt_free(cd);
goto out;
out:
crypt_free(cd);