diff options
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/geom/class/eli/geom_eli.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/sbin/geom/class/eli/geom_eli.c b/sbin/geom/class/eli/geom_eli.c index 85ca83e..084fdbd 100644 --- a/sbin/geom/class/eli/geom_eli.c +++ b/sbin/geom/class/eli/geom_eli.c @@ -739,18 +739,30 @@ static void eli_setkey_attached(struct gctl_req *req, struct g_eli_metadata *md) { unsigned char key[G_ELI_USERKEYLEN]; - intmax_t val; + intmax_t val, old = 0; + int error; val = gctl_get_intmax(req, "iterations"); /* Check if iterations number should be changed. */ if (val != -1) md->md_iterations = val; + else + old = md->md_iterations; /* Generate key for Master Key encryption. */ if (eli_genkey(req, md, key, 1) == NULL) { bzero(key, sizeof(key)); return; } + /* + * If number of iterations has changed, but wasn't given as a + * command-line argument, update the request. + */ + if (val == -1 && md->md_iterations != old) { + error = gctl_change_param(req, "iterations", sizeof(intmax_t), + &md->md_iterations); + assert(error == 0); + } gctl_ro_param(req, "key", sizeof(key), key); gctl_issue(req); |
