summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJason Wright <jason@cvs.openbsd.org>2000-08-15 17:39:20 +0000
committerJason Wright <jason@cvs.openbsd.org>2000-08-15 17:39:20 +0000
commit8875337ab5350dd194ee13562b002fc65c5c416e (patch)
tree605764036e69e721ade084f0c68a2ad698f2c092 /sys
parent188d8b653f731bf31e5043fc66b1bbd85e9303a6 (diff)
Put the bcopy back in place for the decryption CRD_F_EXPLICIT_IV case (missed
this yesterday when fixing the encryption side of this case). Only used for old IPSec xforms anyway.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/ubsec.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/pci/ubsec.c b/sys/dev/pci/ubsec.c
index 28e3a24b3e5..ff8941ffea0 100644
--- a/sys/dev/pci/ubsec.c
+++ b/sys/dev/pci/ubsec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ubsec.c,v 1.27 2000/08/15 17:27:56 jason Exp $ */
+/* $OpenBSD: ubsec.c,v 1.28 2000/08/15 17:39:19 jason Exp $ */
/*
* Copyright (c) 2000 Jason L. Wright (jason@thought.net)
@@ -653,10 +653,9 @@ ubsec_process(crp)
} else {
q->q_ctx.pc_flags |= UBS_PKTCTX_INBOUND;
- if (enccrd->crd_flags & CRD_F_IV_EXPLICIT) {
- q->q_ctx.pc_iv[0] = enccrd->crd_iv[0];
- q->q_ctx.pc_iv[1] = enccrd->crd_iv[1];
- } else
+ if (enccrd->crd_flags & CRD_F_IV_EXPLICIT)
+ bcopy(enccrd->crd_iv, &q->q_ctx.pc_iv[0], 8);
+ else
m_copydata(q->q_src_m, enccrd->crd_inject,
8, (caddr_t)&q->q_ctx.pc_iv[0]);
}