summaryrefslogtreecommitdiffstats
path: root/sys/geom
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2006-04-20 06:33:46 +0000
committerpjd <pjd@FreeBSD.org>2006-04-20 06:33:46 +0000
commit7df97ee4bb8f1368f309cef74953892fc6a7c2f5 (patch)
tree96aa73011c8022504e9b157e58e144863479862f /sys/geom
parenta4071b836a496570fbc0647b522984a444e6d4a2 (diff)
downloadFreeBSD-src-7df97ee4bb8f1368f309cef74953892fc6a7c2f5.zip
FreeBSD-src-7df97ee4bb8f1368f309cef74953892fc6a7c2f5.tar.gz
geli(8) provides keys on newsession time, so remove CRD_F_KEY_EXPLICIT flag
as HW crypto drivers don't support it.
Diffstat (limited to 'sys/geom')
-rw-r--r--sys/geom/eli/g_eli.c3
-rw-r--r--sys/geom/eli/g_eli_crypto.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/sys/geom/eli/g_eli.c b/sys/geom/eli/g_eli.c
index 803678d..585e842 100644
--- a/sys/geom/eli/g_eli.c
+++ b/sys/geom/eli/g_eli.c
@@ -532,8 +532,7 @@ g_eli_crypto_run(struct g_eli_worker *wr, struct bio *bp)
crd->crd_skip = 0;
crd->crd_len = secsize;
- crd->crd_flags =
- CRD_F_IV_EXPLICIT | CRD_F_IV_PRESENT | CRD_F_KEY_EXPLICIT;
+ crd->crd_flags = CRD_F_IV_EXPLICIT | CRD_F_IV_PRESENT;
if (bp->bio_cmd == BIO_WRITE)
crd->crd_flags |= CRD_F_ENCRYPT;
crd->crd_alg = sc->sc_algo;
diff --git a/sys/geom/eli/g_eli_crypto.c b/sys/geom/eli/g_eli_crypto.c
index 693dab7..817ff72 100644
--- a/sys/geom/eli/g_eli_crypto.c
+++ b/sys/geom/eli/g_eli_crypto.c
@@ -97,7 +97,7 @@ g_eli_crypto_cipher(u_int algo, int enc, u_char *data, size_t datasize,
crd->crd_skip = 0;
crd->crd_len = datasize;
- crd->crd_flags = CRD_F_IV_EXPLICIT | CRD_F_IV_PRESENT | CRD_F_KEY_EXPLICIT;
+ crd->crd_flags = CRD_F_IV_EXPLICIT | CRD_F_IV_PRESENT;
if (enc)
crd->crd_flags |= CRD_F_ENCRYPT;
crd->crd_alg = algo;
OpenPOWER on IntegriCloud