diff options
| author | marha <marha@users.sourceforge.net> | 2014-04-14 23:45:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-04-14 23:45:39 +0200 |
| commit | 7c21629fbeb51b65fd0625bb36d888587d62fd89 (patch) | |
| tree | 425433df36d64f529d2222de2d1680e0b0abca3f /openssl/crypto/aes | |
| parent | 0bd141efd4832e01c8b269b8566dd5749e30ed55 (diff) | |
| parent | 242d48135a12fc9167430f391ba0d27d9ad44c6b (diff) | |
| download | vcxsrv-7c21629fbeb51b65fd0625bb36d888587d62fd89.tar.gz vcxsrv-7c21629fbeb51b65fd0625bb36d888587d62fd89.tar.bz2 vcxsrv-7c21629fbeb51b65fd0625bb36d888587d62fd89.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Configure
openssl/Makefile
openssl/util/pl/VC-32.pl
Diffstat (limited to 'openssl/crypto/aes')
| -rw-r--r-- | openssl/crypto/aes/asm/vpaes-x86_64.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openssl/crypto/aes/asm/vpaes-x86_64.pl b/openssl/crypto/aes/asm/vpaes-x86_64.pl index 41f2e46f6..bd7f45b85 100644 --- a/openssl/crypto/aes/asm/vpaes-x86_64.pl +++ b/openssl/crypto/aes/asm/vpaes-x86_64.pl @@ -1060,7 +1060,7 @@ _vpaes_consts: .Lk_dsbo: # decryption sbox final output .quad 0x1387EA537EF94000, 0xC7AA6DB9D4943E2D .quad 0x12D7560F93441D00, 0xCA4B8159D8C58E9C -.asciz "Vector Permutaion AES for x86_64/SSSE3, Mike Hamburg (Stanford University)" +.asciz "Vector Permutation AES for x86_64/SSSE3, Mike Hamburg (Stanford University)" .align 64 .size _vpaes_consts,.-_vpaes_consts ___ |