{
CryptSetupObject *self = this;
PyObject *result, *arglist;
+ size_t len;
char *res = NULL;
if(self->passwordDialogCB){
}
strncpy(buf, res, length - 1);
+ len = strlen(res);
- // FIXME: wipe res
+ memset(res, 0, len);
Py_DECREF(result);
- return strlen(buf);
+
+ return (int)len;
}
return -EINVAL;
*cmdLineLogCB = NULL,
*tmp = NULL;
char *device = NULL, *deviceName = NULL;
+ int r;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|zzOOO", kwlist, &device, &deviceName,
&yesDialogCB, &passwordDialogCB, &cmdLineLogCB))
PyErr_SetString(PyExc_IOError, "Device cannot be opened");
return -1;
}
-
+ /* Try to load header form device */
+ r = crypt_load(self->device, NULL, NULL);
+ if (r && r != -EINVAL) {
+ PyErr_SetString(PyExc_RuntimeError, "Cannot initialize device context");
+ return -1;
+ }
} else if (deviceName) {
if (crypt_init_by_name(&(self->device), deviceName)) {
PyErr_SetString(PyExc_IOError, "Device cannot be opened");
return -1;
}
+ /* Context is initialized automatically from active device */
} else {
PyErr_SetString(PyExc_RuntimeError, "Either device file or luks name has to be specified");
return -1;
}
- // FIXME: check return code
- crypt_load(self->device, NULL, NULL);
if(deviceName)
self->activated_as = strdup(deviceName);
return NULL;
crypt_set_debug_level(level);
- return PyObjectResult(0);
+
+ Py_RETURN_NONE;
}
#define CryptSetup_iterationTime_HELP "Set iteration time\n\n\
static char *kwlist[] = {"time_ms", NULL};
uint64_t time_ms = 0;
- if (!PyArg_ParseTupleAndKeywords(args, kwds, "l", kwlist, &time_ms))
+ if (!PyArg_ParseTupleAndKeywords(args, kwds, "K", kwlist, &time_ms))
return NULL;
- crypt_set_iterarion_time(self->device, time_ms);
- return PyObjectResult(0);
+ crypt_set_iteration_time(self->device, time_ms);
+
+ Py_RETURN_NONE;
}
static PyMemberDef CryptSetup_members[] = {