diff options
| -rw-r--r-- | lib/libssl/src/crypto/engine/hw_cryptodev.c | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/amd64/via.c | 6 | ||||
| -rw-r--r-- | sys/arch/i386/i386/via.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/lib/libssl/src/crypto/engine/hw_cryptodev.c b/lib/libssl/src/crypto/engine/hw_cryptodev.c index 0e80ca051a5..bc953872dd0 100644 --- a/lib/libssl/src/crypto/engine/hw_cryptodev.c +++ b/lib/libssl/src/crypto/engine/hw_cryptodev.c @@ -625,7 +625,7 @@ viac3_xcrypt_cbc(int *cw, const void *src, void *dst, void *key, int rep, * Cannot simply place key into "b" register, since the compiler * -pic mode uses that register; so instead we must dance a little. */ - __asm __volatile("pushl %%ebx; movl %0, %%ebx; rep xcrypt-cbc; popl %%ebx" : + __asm __volatile("pushl %%ebx; movl %0, %%ebx; rep xcryptcbc; popl %%ebx" : : "m" (key), "a" (iv), "c" (rep), "d" (cw), "S" (src), "D" (dst) : "memory", "cc"); #else @@ -634,7 +634,7 @@ viac3_xcrypt_cbc(int *cw, const void *src, void *dst, void *key, int rep, * Clear bit 30 of EFLAGS. */ __asm __volatile("pushfq; popfq"); - __asm __volatile("rep xcrypt-cbc" : + __asm __volatile("rep xcryptcbc" : : "b" (key), "a" (iv), "c" (rep), "d" (cw), "S" (src), "D" (dst) : "memory", "cc"); #endif diff --git a/sys/arch/amd64/amd64/via.c b/sys/arch/amd64/amd64/via.c index b6ac5c47522..7fa8bfb8963 100644 --- a/sys/arch/amd64/amd64/via.c +++ b/sys/arch/amd64/amd64/via.c @@ -1,4 +1,4 @@ -/* $OpenBSD: via.c,v 1.12 2012/01/13 09:53:24 mikeb Exp $ */ +/* $OpenBSD: via.c,v 1.13 2013/05/30 15:37:51 matthew Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -327,7 +327,7 @@ viac3_cbc(void *cw, void *src, void *dst, void *key, int rep, /* Do the deed */ __asm __volatile("pushfq; popfq"); - __asm __volatile("rep xcrypt-cbc" : + __asm __volatile("rep xcryptcbc" : : "b" (key), "a" (iv), "c" (rep), "d" (cw), "S" (src), "D" (dst) : "memory", "cc"); @@ -534,7 +534,7 @@ viac3_rnd(void *v) * sure that we turn on maximum whitening (%edx[0,1] == "11"), so * that we get the best random data possible. */ - __asm __volatile("rep xstore-rng" + __asm __volatile("rep xstorerng" : "=a" (rv) : "d" (3), "D" (buffer), "c" (len*sizeof(int)) : "memory", "cc"); diff --git a/sys/arch/i386/i386/via.c b/sys/arch/i386/i386/via.c index 534257fbc7a..97f90b54b07 100644 --- a/sys/arch/i386/i386/via.c +++ b/sys/arch/i386/i386/via.c @@ -1,4 +1,4 @@ -/* $OpenBSD: via.c,v 1.29 2012/01/13 09:53:24 mikeb Exp $ */ +/* $OpenBSD: via.c,v 1.30 2013/05/30 15:37:51 matthew Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -328,7 +328,7 @@ viac3_cbc(void *cw, void *src, void *dst, void *key, int rep, /* Do the deed */ __asm __volatile("pushfl; popfl"); - __asm __volatile("rep xcrypt-cbc" : + __asm __volatile("rep xcryptcbc" : : "a" (iv), "b" (key), "c" (rep), "d" (cw), "S" (src), "D" (dst) : "memory", "cc"); @@ -535,7 +535,7 @@ viac3_rnd(void *v) * sure that we turn on maximum whitening (%edx[0,1] == "11"), so * that we get the best random data possible. */ - __asm __volatile("rep xstore-rng" + __asm __volatile("rep xstorerng" : "=a" (rv) : "d" (3), "D" (buffer), "c" (len*sizeof(int)) : "memory", "cc"); |