d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always allow setting number of iterations for the first time.

Browse Source 
Before this change it was impossible to set number of PKCS#5v2 iterations,
required to set passphrase, if it has two keys and never had any passphrase.
Due to present metadata format limitations there are still cases when number
of iterations can not be changed, but now it works in cases when it can.

PR:		218512
MFC after:	2 weeks
Sponsored by:	iXsystems, Inc.
Differential Revision:	https://reviews.freebsd.org/D10338
This commit is contained in:
Alexander Motin 2017-04-21 07:16:07 +00:00
parent 56e7a784ac
commit d8880fd450
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbin/geom/class/eli/geom_eli.c
View File

@ -1118,7 +1118,9 @@ eli_setkey_detached(struct gctl_req *req, const char *prov,
val = gctl_get_intmax(req, "iterations");
/* Check if iterations number should and can be changed. */
if (val != -1) {
if (val != -1 && md->md_iterations == -1) {
md->md_iterations = val;
} else if (val != -1 && val != md->md_iterations) {
if (bitcount32(md->md_keys) != 1) {
gctl_error(req, "To be able to use '-i' option, only "
"one key can be defined.");

4
sys/geom/eli/g_eli_ctl.c
View File

@ -618,7 +618,9 @@ g_eli_ctl_setkey(struct gctl_req *req, struct g_class *mp)
return;
}
/* Check if iterations number should and can be changed. */
if (*valp != -1) {
if (*valp != -1 && md.md_iterations == -1) {
md.md_iterations = *valp;
} else if (*valp != -1 && *valp != md.md_iterations) {
if (bitcount32(md.md_keys) != 1) {
gctl_error(req, "To be able to use '-i' option, only "
"one key can be defined.");