eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-13 20:00:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix typo in iteration time api call.

Browse Source 
(To not break API keep old set_iterarion_time alias...)

git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@675 36d66b0a-2a48-0410-832c-cd162a569da5
This commit is contained in:
Milan Broz
2011-11-06 22:44:52 +00:00
parent 66f042953d
commit 1b982af46f
6 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -1,5 +1,6 @@
2011-11-05 Milan Broz <mbroz@redhat.com> 2011-11-05 Milan Broz <mbroz@redhat.com>
* Merge pycryptsetup (Python libcryptsetup bindings). * Merge pycryptsetup (Python libcryptsetup bindings).
* Fix stupid typo in set_iteration_time API call.
2011-10-27 Milan Broz <mbroz@redhat.com> 2011-10-27 Milan Broz <mbroz@redhat.com>
* Fix crypt_get_volume_key_size() for plain device. * Fix crypt_get_volume_key_size() for plain device.

2
lib/libcryptsetup.h
View File

@@ -190,6 +190,8 @@ void crypt_set_password_retry(struct crypt_device *cd, int tries);
* @param cd crypt device handle * @param cd crypt device handle
* @param iteration_time_ms the time in ms * @param iteration_time_ms the time in ms
*/ */
void crypt_set_iteration_time(struct crypt_device *cd, uint64_t iteration_time_ms);
/* Don't ask :-) */
void crypt_set_iterarion_time(struct crypt_device *cd, uint64_t iteration_time_ms); void crypt_set_iterarion_time(struct crypt_device *cd, uint64_t iteration_time_ms);
/** /**

1
lib/libcryptsetup.sym
View File

@@ -9,6 +9,7 @@ CRYPTSETUP_1.0 {
crypt_set_timeout; crypt_set_timeout;
crypt_set_password_retry; crypt_set_password_retry;
crypt_set_iterarion_time; crypt_set_iterarion_time;
crypt_set_iteration_time;
crypt_set_password_verify; crypt_set_password_verify;
crypt_set_uuid; crypt_set_uuid;
crypt_set_data_device; crypt_set_data_device;

6
lib/setup.c
View File

@@ -1811,11 +1811,15 @@ void crypt_set_password_retry(struct crypt_device *cd, int tries)
cd->tries = tries; cd->tries = tries;
} }
void crypt_set_iterarion_time(struct crypt_device *cd, uint64_t iteration_time_ms) void crypt_set_iteration_time(struct crypt_device *cd, uint64_t iteration_time_ms)
{ {
log_dbg("Iteration time set to %" PRIu64 " miliseconds.", iteration_time_ms); log_dbg("Iteration time set to %" PRIu64 " miliseconds.", iteration_time_ms);
cd->iteration_time = iteration_time_ms; cd->iteration_time = iteration_time_ms;
} }
void crypt_set_iterarion_time(struct crypt_device *cd, uint64_t iteration_time_ms)
{
crypt_set_iteration_time(cd, iteration_time_ms);
}
void crypt_set_password_verify(struct crypt_device *cd, int password_verify) void crypt_set_password_verify(struct crypt_device *cd, int password_verify)
{ {

2
python/pycryptsetup.c
View File

@@ -582,7 +582,7 @@ static PyObject *CryptSetup_iterationTime(CryptSetupObject* self, PyObject *args
if (!PyArg_ParseTupleAndKeywords(args, kwds, "l", kwlist, &time_ms)) if (!PyArg_ParseTupleAndKeywords(args, kwds, "l", kwlist, &time_ms))
return NULL; return NULL;
crypt_set_iterarion_time(self->device, time_ms); crypt_set_iteration_time(self->device, time_ms);
return PyObjectResult(0); return PyObjectResult(0);
} }

8
src/cryptsetup.c
View File

@@ -499,7 +499,7 @@ static int action_luksFormat(int arg __attribute__((unused)))
crypt_set_password_verify(cd, 1); crypt_set_password_verify(cd, 1);
crypt_set_timeout(cd, opt_timeout); crypt_set_timeout(cd, opt_timeout);
if (opt_iteration_time) if (opt_iteration_time)
crypt_set_iterarion_time(cd, opt_iteration_time); crypt_set_iteration_time(cd, opt_iteration_time);
if (opt_random) if (opt_random)
crypt_set_rng_type(cd, CRYPT_RNG_RANDOM); crypt_set_rng_type(cd, CRYPT_RNG_RANDOM);
@@ -569,7 +569,7 @@ static int action_luksOpen(int arg __attribute__((unused)))
crypt_set_password_retry(cd, opt_tries); crypt_set_password_retry(cd, opt_tries);
if (opt_iteration_time) if (opt_iteration_time)
crypt_set_iterarion_time(cd, opt_iteration_time); crypt_set_iteration_time(cd, opt_iteration_time);
if (opt_readonly) if (opt_readonly)
flags |= CRYPT_ACTIVATE_READONLY; flags |= CRYPT_ACTIVATE_READONLY;
@@ -742,7 +742,7 @@ static int action_luksAddKey(int arg __attribute__((unused)))
crypt_set_password_verify(cd, opt_verify_passphrase ? 1 : 0); crypt_set_password_verify(cd, opt_verify_passphrase ? 1 : 0);
crypt_set_timeout(cd, opt_timeout); crypt_set_timeout(cd, opt_timeout);
if (opt_iteration_time) if (opt_iteration_time)
crypt_set_iterarion_time(cd, opt_iteration_time); crypt_set_iteration_time(cd, opt_iteration_time);
if (opt_master_key_file) { if (opt_master_key_file) {
r = _read_mk(opt_master_key_file, &key, keysize); r = _read_mk(opt_master_key_file, &key, keysize);
@@ -791,7 +791,7 @@ static int action_luksChangeKey(int arg __attribute__((unused)))
goto out; goto out;
if (opt_iteration_time) if (opt_iteration_time)
crypt_set_iterarion_time(cd, opt_iteration_time); crypt_set_iteration_time(cd, opt_iteration_time);
r = crypt_get_key(_("Enter LUKS passphrase to be changed: "), r = crypt_get_key(_("Enter LUKS passphrase to be changed: "),
&password, &passwordLen, &password, &passwordLen,