View | Details | Raw Unified | Return to bug 196834
Collapse All | Expand All

(-)b/sbin/geom/class/eli/geom_eli.c (-3 / +17 lines)
Lines 1012-1019 eli_setkey_attached(struct gctl_req *req, struct g_eli_metadata *md) Link Here
1012
	/* Check if iterations number should be changed. */
1012
	/* Check if iterations number should be changed. */
1013
	if (val != -1)
1013
	if (val != -1)
1014
		md->md_iterations = val;
1014
		md->md_iterations = val;
1015
	else
1015
	else {
1016
		old = md->md_iterations;
1016
		old = md->md_iterations;
1017
		/*
1018
		 * If the new key does not require a passphrase,
1019
		 * the iterations count has to be reset to reflect
1020
		 * this.
1021
		 */
1022
		if (gctl_get_int(req, "nonewpassphrase") == 1)
1023
			md->md_iterations = -1;
1024
	}
1017
1025
1018
	/* Generate key for Master Key encryption. */
1026
	/* Generate key for Master Key encryption. */
1019
	if (eli_genkey(req, md, key, true) == NULL) {
1027
	if (eli_genkey(req, md, key, true) == NULL) {
Lines 1098-1104 eli_setkey_detached(struct gctl_req *req, const char *prov, Link Here
1098
			return;
1106
			return;
1099
		}
1107
		}
1100
		md->md_iterations = val;
1108
		md->md_iterations = val;
1101
	}
1109
	} else if (gctl_get_int(req, "nonewpassphrase") == 1) {
1110
		/*
1111
		 * If the new key does not require a passphrase,
1112
		 * the iterations count has to be reset to reflect
1113
		 * this.
1114
		 */
1115
		md->md_iterations = -1;
1116
        }
1102
1117
1103
	mkeydst = md->md_mkeys + nkey * G_ELI_MKEYLEN;
1118
	mkeydst = md->md_mkeys + nkey * G_ELI_MKEYLEN;
1104
	md->md_keys |= (1 << nkey);
1119
	md->md_keys |= (1 << nkey);
1105
- 

Return to bug 196834