Permalink
Browse files

openssl: fix build

  • Loading branch information...
1 parent 3e5b404 commit ee73a660540528774c9a5b9894d5953313435303 @indutny committed Oct 14, 2012
Showing with 22,671 additions and 10,797 deletions.
  1. +6 −0 deps/openssl/asm/Makefile
  2. +17 −8 deps/openssl/asm/x64-elf-gas/aes/aes-x86_64.s
  3. +1,257 −54 deps/openssl/asm/x64-elf-gas/bn/x86_64-mont.s
  4. +1,260 −0 deps/openssl/asm/x64-elf-gas/rc4/rc4-md5-x86_64.s
  5. +464 −270 deps/openssl/asm/x64-elf-gas/rc4/rc4-x86_64.s
  6. +2,370 −1,161 deps/openssl/asm/x64-elf-gas/sha/sha1-x86_64.s
  7. +979 −1,171 deps/openssl/asm/x64-elf-gas/sha/sha512-x86_64.s
  8. +56 −13 deps/openssl/asm/x64-elf-gas/x86_64cpuid.s
  9. +13 −4 deps/openssl/asm/x64-macosx-gas/aes/aes-x86_64.s
  10. +1,256 −53 deps/openssl/asm/x64-macosx-gas/bn/x86_64-mont.s
  11. +0 −1 deps/openssl/asm/x64-macosx-gas/md5/md5-x86_64.s
  12. +1,259 −0 deps/openssl/asm/x64-macosx-gas/rc4/rc4-md5-x86_64.s
  13. +462 −269 deps/openssl/asm/x64-macosx-gas/rc4/rc4-x86_64.s
  14. +2,369 −1,160 deps/openssl/asm/x64-macosx-gas/sha/sha1-x86_64.s
  15. +979 −1,171 deps/openssl/asm/x64-macosx-gas/sha/sha512-x86_64.s
  16. +55 −13 deps/openssl/asm/x64-macosx-gas/x86_64cpuid.s
  17. +27 −18 deps/openssl/asm/x64-win32-masm/aes/aes-x86_64.asm
  18. +1,421 −119 deps/openssl/asm/x64-win32-masm/bn/x86_64-mont.asm
  19. +2 −2 deps/openssl/asm/x64-win32-masm/camellia/cmll-x86_64.asm
  20. +140 −140 deps/openssl/asm/x64-win32-masm/md5/md5-x86_64.asm
  21. +1,375 −0 deps/openssl/asm/x64-win32-masm/rc4/rc4-md5-x86_64.asm
  22. +469 −275 deps/openssl/asm/x64-win32-masm/rc4/rc4-x86_64.asm
  23. +2,457 −1,167 deps/openssl/asm/x64-win32-masm/sha/sha1-x86_64.asm
  24. +1,031 −1,223 deps/openssl/asm/x64-win32-masm/sha/sha512-x86_64.asm
  25. +102 −102 deps/openssl/asm/x64-win32-masm/whrlpool/wp-x86_64.asm
  26. +57 −13 deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm
  27. +11 −11 deps/openssl/asm/x86-elf-gas/aes/aes-586.s
  28. +5 −5 deps/openssl/asm/x86-elf-gas/camellia/cmll-x86.s
  29. +180 −38 deps/openssl/asm/x86-elf-gas/rc4/rc4-586.s
  30. +600 −662 deps/openssl/asm/x86-elf-gas/sha/sha1-586.s
  31. +31 −34 deps/openssl/asm/x86-elf-gas/sha/sha256-586.s
  32. +88 −47 deps/openssl/asm/x86-elf-gas/x86cpuid.s
  33. +14 −10 deps/openssl/asm/x86-macosx-gas/aes/aes-586.s
  34. +3 −3 deps/openssl/asm/x86-macosx-gas/camellia/cmll-x86.s
  35. +10 −3 deps/openssl/asm/x86-macosx-gas/des/crypt586.s
  36. +193 −38 deps/openssl/asm/x86-macosx-gas/rc4/rc4-586.s
  37. +600 −662 deps/openssl/asm/x86-macosx-gas/sha/sha1-586.s
  38. +31 −34 deps/openssl/asm/x86-macosx-gas/sha/sha256-586.s
  39. +102 −47 deps/openssl/asm/x86-macosx-gas/x86cpuid.s
  40. +7 −7 deps/openssl/asm/x86-win32-masm/aes/aes-586.asm
  41. +3 −3 deps/openssl/asm/x86-win32-masm/camellia/cmll-x86.asm
  42. +187 −38 deps/openssl/asm/x86-win32-masm/rc4/rc4-586.asm
  43. +600 −662 deps/openssl/asm/x86-win32-masm/sha/sha1-586.asm
  44. +31 −34 deps/openssl/asm/x86-win32-masm/sha/sha256-586.asm
  45. +86 −44 deps/openssl/asm/x86-win32-masm/x86cpuid.asm
  46. +4 −5 deps/openssl/openssl.gyp
  47. +1 −1 deps/openssl/openssl/crypto/evp/e_aes.c
  48. +1 −1 deps/openssl/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c
  49. +0 −1 deps/openssl/openssl/crypto/x86_64cpuid.pl
@@ -24,6 +24,7 @@ OUTPUTS = \
x64-elf-gas/camellia/cmll-x86_64.s \
x64-elf-gas/md5/md5-x86_64.s \
x64-elf-gas/rc4/rc4-x86_64.s \
+ x64-elf-gas/rc4/rc4-md5-x86_64.s \
x64-elf-gas/sha/sha1-x86_64.s \
x64-elf-gas/sha/sha512-x86_64.s \
x64-elf-gas/whrlpool/wp-x86_64.s \
@@ -50,6 +51,7 @@ OUTPUTS = \
x64-macosx-gas/camellia/cmll-x86_64.s \
x64-macosx-gas/md5/md5-x86_64.s \
x64-macosx-gas/rc4/rc4-x86_64.s \
+ x64-macosx-gas/rc4/rc4-md5-x86_64.s \
x64-macosx-gas/sha/sha1-x86_64.s \
x64-macosx-gas/sha/sha512-x86_64.s \
x64-macosx-gas/whrlpool/wp-x86_64.s \
@@ -76,6 +78,7 @@ OUTPUTS = \
x64-win32-masm/camellia/cmll-x86_64.asm \
x64-win32-masm/md5/md5-x86_64.asm \
x64-win32-masm/rc4/rc4-x86_64.asm \
+ x64-win32-masm/rc4/rc4-md5-x86_64.asm \
x64-win32-masm/sha/sha1-x86_64.asm \
x64-win32-masm/sha/sha512-x86_64.asm \
x64-win32-masm/whrlpool/wp-x86_64.asm \
@@ -107,6 +110,7 @@ x64-elf-gas/bn/x86_64-mont.s: ../openssl/crypto/bn/asm/x86_64-mont.pl
x64-elf-gas/camellia/cmll-x86_64.s: ../openssl/crypto/camellia/asm/cmll-x86_64.pl
x64-elf-gas/md5/md5-x86_64.s: ../openssl/crypto/md5/asm/md5-x86_64.pl
x64-elf-gas/rc4/rc4-x86_64.s: ../openssl/crypto/rc4/asm/rc4-x86_64.pl
+x64-elf-gas/rc4/rc4-md5-x86_64.s: ../openssl/crypto/rc4/asm/rc4-md5-x86_64.pl
x64-elf-gas/sha/sha1-x86_64.s: ../openssl/crypto/sha/asm/sha1-x86_64.pl
x64-elf-gas/sha/sha512-x86_64.s: ../openssl/crypto/sha/asm/sha512-x86_64.pl
x64-elf-gas/whrlpool/wp-x86_64.s: ../openssl/crypto/whrlpool/asm/wp-x86_64.pl
@@ -116,6 +120,7 @@ x64-macosx-gas/bn/x86_64-mont.s: ../openssl/crypto/bn/asm/x86_64-mont.pl
x64-macosx-gas/camellia/cmll-x86_64.s: ../openssl/crypto/camellia/asm/cmll-x86_64.pl
x64-macosx-gas/md5/md5-x86_64.s: ../openssl/crypto/md5/asm/md5-x86_64.pl
x64-macosx-gas/rc4/rc4-x86_64.s: ../openssl/crypto/rc4/asm/rc4-x86_64.pl
+x64-macosx-gas/rc4/rc4-md5-x86_64.s: ../openssl/crypto/rc4/asm/rc4-md5-x86_64.pl
x64-macosx-gas/sha/sha1-x86_64.s: ../openssl/crypto/sha/asm/sha1-x86_64.pl
x64-macosx-gas/sha/sha512-x86_64.s: ../openssl/crypto/sha/asm/sha512-x86_64.pl
x64-macosx-gas/whrlpool/wp-x86_64.s: ../openssl/crypto/whrlpool/asm/wp-x86_64.pl
@@ -125,6 +130,7 @@ x64-win32-masm/bn/x86_64-mont.asm: ../openssl/crypto/bn/asm/x86_64-mont.pl
x64-win32-masm/camellia/cmll-x86_64.asm: ../openssl/crypto/camellia/asm/cmll-x86_64.pl
x64-win32-masm/md5/md5-x86_64.asm: ../openssl/crypto/md5/asm/md5-x86_64.pl
x64-win32-masm/rc4/rc4-x86_64.asm: ../openssl/crypto/rc4/asm/rc4-x86_64.pl
+x64-win32-masm/rc4/rc4-md5-x86_64.asm: ../openssl/crypto/rc4/asm/rc4-md5-x86_64.pl
x64-win32-masm/sha/sha1-x86_64.asm: ../openssl/crypto/sha/asm/sha1-x86_64.pl
x64-win32-masm/sha/sha512-x86_64.asm: ../openssl/crypto/sha/asm/sha512-x86_64.pl
x64-win32-masm/whrlpool/wp-x86_64.asm: ../openssl/crypto/whrlpool/asm/wp-x86_64.pl
@@ -333,6 +333,9 @@ _x86_64_AES_encrypt_compact:
.globl AES_encrypt
.type AES_encrypt,@function
.align 16
+.globl asm_AES_encrypt
+.hidden asm_AES_encrypt
+asm_AES_encrypt:
AES_encrypt:
pushq %rbx
pushq %rbp
@@ -780,6 +783,9 @@ _x86_64_AES_decrypt_compact:
.globl AES_decrypt
.type AES_decrypt,@function
.align 16
+.globl asm_AES_decrypt
+.hidden asm_AES_decrypt
+asm_AES_decrypt:
AES_decrypt:
pushq %rbx
pushq %rbp
@@ -843,10 +849,10 @@ AES_decrypt:
.Ldec_epilogue:
.byte 0xf3,0xc3
.size AES_decrypt,.-AES_decrypt
-.globl AES_set_encrypt_key
-.type AES_set_encrypt_key,@function
+.globl private_AES_set_encrypt_key
+.type private_AES_set_encrypt_key,@function
.align 16
-AES_set_encrypt_key:
+private_AES_set_encrypt_key:
pushq %rbx
pushq %rbp
pushq %r12
@@ -867,7 +873,7 @@ AES_set_encrypt_key:
addq $56,%rsp
.Lenc_key_epilogue:
.byte 0xf3,0xc3
-.size AES_set_encrypt_key,.-AES_set_encrypt_key
+.size private_AES_set_encrypt_key,.-private_AES_set_encrypt_key
.type _x86_64_AES_set_encrypt_key,@function
.align 16
@@ -1109,10 +1115,10 @@ _x86_64_AES_set_encrypt_key:
.byte 0xf3,0xc3
.size _x86_64_AES_set_encrypt_key,.-_x86_64_AES_set_encrypt_key
-.globl AES_set_decrypt_key
-.type AES_set_decrypt_key,@function
+.globl private_AES_set_decrypt_key
+.type private_AES_set_decrypt_key,@function
.align 16
-AES_set_decrypt_key:
+private_AES_set_decrypt_key:
pushq %rbx
pushq %rbp
pushq %r12
@@ -1295,11 +1301,14 @@ AES_set_decrypt_key:
addq $56,%rsp
.Ldec_key_epilogue:
.byte 0xf3,0xc3
-.size AES_set_decrypt_key,.-AES_set_decrypt_key
+.size private_AES_set_decrypt_key,.-private_AES_set_decrypt_key
.globl AES_cbc_encrypt
.type AES_cbc_encrypt,@function
.align 16
+.globl asm_AES_cbc_encrypt
+.hidden asm_AES_cbc_encrypt
+asm_AES_cbc_encrypt:
AES_cbc_encrypt:
cmpq $0,%rdx
je .Lcbc_epilogue
Oops, something went wrong.

0 comments on commit ee73a66

Please sign in to comment.