diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-06-29 22:42:15 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-06-29 22:42:15 +0000 |
| commit | 6c7fd946b6ae8a1ccccfb49eba04d4a0c0175056 (patch) | |
| tree | ba768f0bb2ef0f6c35f483a3277556771aadf305 /sys | |
| parent | 21bf9cbb66b896264ca19a5013475e5d40dba56d (diff) | |
make the xcrypt match the jsg code in openssl
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/amd64/via.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/amd64/amd64/via.c b/sys/arch/amd64/amd64/via.c index 00a63267aea..62e50247138 100644 --- a/sys/arch/amd64/amd64/via.c +++ b/sys/arch/amd64/amd64/via.c @@ -1,4 +1,4 @@ -/* $OpenBSD: via.c,v 1.4 2010/06/26 23:24:43 guenther Exp $ */ +/* $OpenBSD: via.c,v 1.5 2010/06/29 22:42:14 deraadt Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -328,9 +328,9 @@ viac3_cbc(void *cw, void *src, void *dst, void *key, int rep, lcr0(creg0 & ~(CR0_EM|CR0_TS)); /* Do the deed */ - __asm __volatile("pushf; popf"); + __asm __volatile("pushfq; popfq"); __asm __volatile("rep xcrypt-cbc" : - : "a" (iv), "b" (key), "c" (rep), "d" (cw), "S" (src), "D" (dst) + : "b" (key), "a" (iv), "c" (rep), "d" (cw), "S" (src), "D" (dst) : "memory", "cc"); lcr0(creg0); |