summaryrefslogtreecommitdiffstats
path: root/sys/crypto
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2011-03-02 14:56:58 +0000
committerkib <kib@FreeBSD.org>2011-03-02 14:56:58 +0000
commit3ba18a465781653a8f2b106f1768c2a88b903250 (patch)
treea4226b9b4339165b130a6f80416c3e0f9b7bb6fb /sys/crypto
parenta8c9f18299da1bf825c6a1fdbce273c58137524f (diff)
downloadFreeBSD-src-3ba18a465781653a8f2b106f1768c2a88b903250.zip
FreeBSD-src-3ba18a465781653a8f2b106f1768c2a88b903250.tar.gz
Fix a bug in the result of manual assembly.
Reported by: Stefan Grundmann <sg2342 googlemail com> PR: kern/155118 MFC after: 3 days
Diffstat (limited to 'sys/crypto')
-rw-r--r--sys/crypto/aesni/aeskeys_amd64.S2
-rw-r--r--sys/crypto/aesni/aeskeys_i386.S2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/crypto/aesni/aeskeys_amd64.S b/sys/crypto/aesni/aeskeys_amd64.S
index 5a7605a..23a4d3d 100644
--- a/sys/crypto/aesni/aeskeys_amd64.S
+++ b/sys/crypto/aesni/aeskeys_amd64.S
@@ -162,7 +162,7 @@ ENTRY(aesni_set_enckey)
.byte 0x66,0x0f,0x3a,0xdf,0xc8,0x20
call _key_expansion_256b
// aeskeygenassist $0x40,%xmm2,%xmm1 # round 7
- .byte 0x66,0x0f,0x3a,0xdf,0xca,0x20
+ .byte 0x66,0x0f,0x3a,0xdf,0xca,0x40
call _key_expansion_256a
retq
.Lenc_key192:
diff --git a/sys/crypto/aesni/aeskeys_i386.S b/sys/crypto/aesni/aeskeys_i386.S
index f575512..f9be26d 100644
--- a/sys/crypto/aesni/aeskeys_i386.S
+++ b/sys/crypto/aesni/aeskeys_i386.S
@@ -167,7 +167,7 @@ ENTRY(aesni_set_enckey)
.byte 0x66,0x0f,0x3a,0xdf,0xc8,0x20
call _key_expansion_256b
// aeskeygenassist $0x40,%xmm2,%xmm1 # round 7
- .byte 0x66,0x0f,0x3a,0xdf,0xca,0x20
+ .byte 0x66,0x0f,0x3a,0xdf,0xca,0x40
call _key_expansion_256a
.cfi_adjust_cfa_offset -4
leave
OpenPOWER on IntegriCloud