aboutsummaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorPawel Jakub Dawidek <pjd@FreeBSD.org>2005-09-10 07:43:03 +0000
committerPawel Jakub Dawidek <pjd@FreeBSD.org>2005-09-10 07:43:03 +0000
commitdf7eabb0596bf01ee6e996a1f5cfcfb5a4e4c15c (patch)
treedc2c9302689a90727048a0c84ab04d5775a28a00 /sbin
parent457c463d8a2c30b006b2be4b9f7913f01a1697eb (diff)
Notes
Diffstat (limited to 'sbin')
-rw-r--r--sbin/geom/class/eli/geom_eli.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sbin/geom/class/eli/geom_eli.c b/sbin/geom/class/eli/geom_eli.c
index 987392f78ca37..a5f796446d3a6 100644
--- a/sbin/geom/class/eli/geom_eli.c
+++ b/sbin/geom/class/eli/geom_eli.c
@@ -727,6 +727,11 @@ eli_setkey_detached(struct gctl_req *req, const char *prov,
unsigned nkey;
int error;
+ if (md->md_keys == 0) {
+ gctl_error(req, "No valid keys on %s.", prov);
+ return;
+ }
+
/* Generate key for Master Key decryption. */
if (eli_genkey(req, md, key, 0) == NULL) {
bzero(key, sizeof(key));
@@ -838,11 +843,6 @@ eli_setkey(struct gctl_req *req)
if (eli_metadata_read(req, prov, &md) == -1)
return;
- if (md.md_keys == 0) {
- gctl_error(req, "No valid keys on %s.", prov);
- return;
- }
-
if (eli_is_attached(prov))
eli_setkey_attached(req, prov, &md);
else