openssl: fix build

indutny · Dec 19, 2012 · ee73a66 · ee73a66
1 parent 3e5b404
commit ee73a66
Show file tree

Hide file tree

Showing 49 changed files with 22,671 additions and 10,797 deletions.
diff --git a/deps/openssl/asm/Makefile b/deps/openssl/asm/Makefile
@@ -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

diff --git a/deps/openssl/asm/x64-elf-gas/aes/aes-x86_64.s b/deps/openssl/asm/x64-elf-gas/aes/aes-x86_64.s
@@ -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