diff --git a/ChangeLog b/ChangeLog index ac74b8ce..3796d732 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 2011-11-05 Milan Broz * Merge pycryptsetup (Python libcryptsetup bindings). + * Fix stupid typo in set_iteration_time API call. 2011-10-27 Milan Broz * Fix crypt_get_volume_key_size() for plain device. diff --git a/lib/libcryptsetup.h b/lib/libcryptsetup.h index 7da12d70..6d4153e4 100644 --- a/lib/libcryptsetup.h +++ b/lib/libcryptsetup.h @@ -190,6 +190,8 @@ void crypt_set_password_retry(struct crypt_device *cd, int tries); * @param cd crypt device handle * @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); /** diff --git a/lib/libcryptsetup.sym b/lib/libcryptsetup.sym index a7587982..a8a9ffbc 100644 --- a/lib/libcryptsetup.sym +++ b/lib/libcryptsetup.sym @@ -9,6 +9,7 @@ CRYPTSETUP_1.0 { crypt_set_timeout; crypt_set_password_retry; crypt_set_iterarion_time; + crypt_set_iteration_time; crypt_set_password_verify; crypt_set_uuid; crypt_set_data_device; diff --git a/lib/setup.c b/lib/setup.c index a7aba645..e58c4c5d 100644 --- a/lib/setup.c +++ b/lib/setup.c @@ -1811,11 +1811,15 @@ void crypt_set_password_retry(struct crypt_device *cd, int 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); 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) { diff --git a/python/pycryptsetup.c b/python/pycryptsetup.c index 2583ebd4..f7aff6bc 100644 --- a/python/pycryptsetup.c +++ b/python/pycryptsetup.c @@ -582,7 +582,7 @@ static PyObject *CryptSetup_iterationTime(CryptSetupObject* self, PyObject *args if (!PyArg_ParseTupleAndKeywords(args, kwds, "l", kwlist, &time_ms)) return NULL; - crypt_set_iterarion_time(self->device, time_ms); + crypt_set_iteration_time(self->device, time_ms); return PyObjectResult(0); } diff --git a/src/cryptsetup.c b/src/cryptsetup.c index 3f892e71..b4758411 100644 --- a/src/cryptsetup.c +++ b/src/cryptsetup.c @@ -499,7 +499,7 @@ static int action_luksFormat(int arg __attribute__((unused))) crypt_set_password_verify(cd, 1); crypt_set_timeout(cd, opt_timeout); if (opt_iteration_time) - crypt_set_iterarion_time(cd, opt_iteration_time); + crypt_set_iteration_time(cd, opt_iteration_time); if (opt_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); if (opt_iteration_time) - crypt_set_iterarion_time(cd, opt_iteration_time); + crypt_set_iteration_time(cd, opt_iteration_time); if (opt_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_timeout(cd, opt_timeout); 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) { r = _read_mk(opt_master_key_file, &key, keysize); @@ -791,7 +791,7 @@ static int action_luksChangeKey(int arg __attribute__((unused))) goto out; 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: "), &password, &passwordLen,