Merge c45560f into 35cd564

nodegit · Aug 12, 2016 · 0ccb4f0 · 0ccb4f0
2 parents 35cd564 + c45560f
commit 0ccb4f0
Show file tree

Hide file tree

Showing 384 changed files with 15,480 additions and 7,101 deletions.
diff --git a/vendor/openssl/asm/x64-elf-gas/aes/aes-x86_64.s b/vendor/openssl/asm/x64-elf-gas/aes/aes-x86_64.s
@@ -81,8 +81,8 @@ _x86_64_AES_encrypt:
 	movl	0(%r14,%rdi,8),%edi
 	movl	0(%r14,%rbp,8),%ebp
 
-	andl	$65280,%edi
-	andl	$65280,%ebp
+	andl	$0x0000ff00,%edi
+	andl	$0x0000ff00,%ebp
 
 	xorl	%edi,%r10d
 	xorl	%ebp,%r11d
@@ -94,8 +94,8 @@ _x86_64_AES_encrypt:
 	movl	0(%r14,%rsi,8),%esi
 	movl	0(%r14,%rdi,8),%edi
 
-	andl	$65280,%esi
-	andl	$65280,%edi
+	andl	$0x0000ff00,%esi
+	andl	$0x0000ff00,%edi
 	shrl	$16,%ebx
 	xorl	%esi,%r12d
 	xorl	%edi,%r8d
@@ -108,9 +108,9 @@ _x86_64_AES_encrypt:
 	movl	0(%r14,%rdi,8),%edi
 	movl	0(%r14,%rbp,8),%ebp
 
-	andl	$16711680,%esi
-	andl	$16711680,%edi
-	andl	$16711680,%ebp
+	andl	$0x00ff0000,%esi
+	andl	$0x00ff0000,%edi
+	andl	$0x00ff0000,%ebp
 
 	xorl	%esi,%r10d
 	xorl	%edi,%r11d
@@ -123,9 +123,9 @@ _x86_64_AES_encrypt:
 	movl	2(%r14,%rdi,8),%edi
 	movl	2(%r14,%rbp,8),%ebp
 
-	andl	$16711680,%esi
-	andl	$4278190080,%edi
-	andl	$4278190080,%ebp
+	andl	$0x00ff0000,%esi
+	andl	$0xff000000,%edi
+	andl	$0xff000000,%ebp
 
 	xorl	%esi,%r8d
 	xorl	%edi,%r10d
@@ -138,8 +138,8 @@ _x86_64_AES_encrypt:
 	movl	2(%r14,%rdi,8),%edi
 	movl	16+0(%r15),%eax
 
-	andl	$4278190080,%esi
-	andl	$4278190080,%edi
+	andl	$0xff000000,%esi
+	andl	$0xff000000,%edi
 
 	xorl	%esi,%r12d
 	xorl	%edi,%r8d
@@ -241,8 +241,8 @@ _x86_64_AES_encrypt_compact:
 	xorl	%r8d,%edx
 	cmpq	16(%rsp),%r15
 	je	.Lenc_compact_done
-	movl	$2155905152,%r10d
-	movl	$2155905152,%r11d
+	movl	$0x80808080,%r10d
+	movl	$0x80808080,%r11d
 	andl	%eax,%r10d
 	andl	%ebx,%r11d
 	movl	%r10d,%esi
@@ -253,20 +253,20 @@ _x86_64_AES_encrypt_compact:
 	leal	(%rbx,%rbx,1),%r9d
 	subl	%r10d,%esi
 	subl	%r11d,%edi
-	andl	$4278124286,%r8d
-	andl	$4278124286,%r9d
-	andl	$454761243,%esi
-	andl	$454761243,%edi
+	andl	$0xfefefefe,%r8d
+	andl	$0xfefefefe,%r9d
+	andl	$0x1b1b1b1b,%esi
+	andl	$0x1b1b1b1b,%edi
 	movl	%eax,%r10d
 	movl	%ebx,%r11d
 	xorl	%esi,%r8d
 	xorl	%edi,%r9d
 
 	xorl	%r8d,%eax
 	xorl	%r9d,%ebx
-	movl	$2155905152,%r12d
+	movl	$0x80808080,%r12d
 	roll	$24,%eax
-	movl	$2155905152,%ebp
+	movl	$0x80808080,%ebp
 	roll	$24,%ebx
 	andl	%ecx,%r12d
 	andl	%edx,%ebp
@@ -289,10 +289,10 @@ _x86_64_AES_encrypt_compact:
 	xorl	%r10d,%eax
 	xorl	%r11d,%ebx
 
-	andl	$4278124286,%r8d
-	andl	$4278124286,%r9d
-	andl	$454761243,%esi
-	andl	$454761243,%edi
+	andl	$0xfefefefe,%r8d
+	andl	$0xfefefefe,%r9d
+	andl	$0x1b1b1b1b,%esi
+	andl	$0x1b1b1b1b,%edi
 	movl	%ecx,%r12d
 	movl	%edx,%ebp
 	xorl	%esi,%r8d
@@ -345,7 +345,7 @@ AES_encrypt:
 	andq	$-64,%rsp
 	subq	%rsp,%rcx
 	negq	%rcx
-	andq	$960,%rcx
+	andq	$0x3c0,%rcx
 	subq	%rcx,%rsp
 	subq	$32,%rsp
 
@@ -370,7 +370,7 @@ AES_encrypt:
 	leaq	.LAES_Te+2048(%rip),%r14
 	leaq	768(%rsp),%rbp
 	subq	%r14,%rbp
-	andq	$768,%rbp
+	andq	$0x300,%rbp
 	leaq	(%r14,%rbp,1),%r14
 
 	call	_x86_64_AES_encrypt_compact
@@ -792,7 +792,7 @@ AES_decrypt:
 	andq	$-64,%rsp
 	subq	%rsp,%rcx
 	negq	%rcx
-	andq	$960,%rcx
+	andq	$0x3c0,%rcx
 	subq	%rcx,%rsp
 	subq	$32,%rsp
 
@@ -817,7 +817,7 @@ AES_decrypt:
 	leaq	.LAES_Td+2048(%rip),%r14
 	leaq	768(%rsp),%rbp
 	subq	%r14,%rbp
-	andq	$768,%rbp
+	andq	$0x300,%rbp
 	leaq	(%r14,%rbp,1),%r14
 	shrq	$3,%rbp
 	addq	%rbp,%r14
@@ -1333,9 +1333,9 @@ AES_cbc_encrypt:
 	movq	%r14,%r10
 	leaq	2304(%r14),%r11
 	movq	%r15,%r12
-	andq	$4095,%r10
-	andq	$4095,%r11
-	andq	$4095,%r12
+	andq	$0xFFF,%r10
+	andq	$0xFFF,%r11
+	andq	$0xFFF,%r12
 
 	cmpq	%r11,%r12
 	jb	.Lcbc_te_break_out
@@ -1344,7 +1344,7 @@ AES_cbc_encrypt:
 	jmp	.Lcbc_te_ok
 .Lcbc_te_break_out:
 	subq	%r10,%r12
-	andq	$4095,%r12
+	andq	$0xFFF,%r12
 	addq	$320,%r12
 	subq	%r12,%r15
 .align	4
@@ -1370,7 +1370,7 @@ AES_cbc_encrypt:
 
 	movq	%r15,%r10
 	subq	%r14,%r10
-	andq	$4095,%r10
+	andq	$0xfff,%r10
 	cmpq	$2304,%r10
 	jb	.Lcbc_do_ecopy
 	cmpq	$4096-248,%r10
@@ -1557,7 +1557,7 @@ AES_cbc_encrypt:
 	leaq	-88-63(%rcx),%r10
 	subq	%rbp,%r10
 	negq	%r10
-	andq	$960,%r10
+	andq	$0x3c0,%r10
 	subq	%r10,%rbp
 
 	xchgq	%rsp,%rbp
@@ -1586,7 +1586,7 @@ AES_cbc_encrypt:
 	leaq	2048(%r14),%r14
 	leaq	768-8(%rsp),%rax
 	subq	%r14,%rax
-	andq	$768,%rax
+	andq	$0x300,%rax
 	leaq	(%r14,%rax,1),%r14
 
 	cmpq	$0,%rbx

diff --git a/vendor/openssl/asm/x64-elf-gas/aes/aesni-mb-x86_64.s b/vendor/openssl/asm/x64-elf-gas/aes/aesni-mb-x86_64.s
@@ -1120,7 +1120,7 @@ _avx_cbc_dec_shortcut:
 	vpxor	%xmm15,%xmm8,%xmm8
 	vmovdqu	%xmm9,112(%rbp)
 	vpxor	%xmm15,%xmm9,%xmm9
-	xorq	$128,%rbp
+	xorq	$0x80,%rbp
 	movl	$1,%ecx
 	jmp	.Loop_dec8x
 

diff --git a/vendor/openssl/asm/x64-elf-gas/aes/aesni-sha256-x86_64.s b/vendor/openssl/asm/x64-elf-gas/aes/aesni-sha256-x86_64.s
@@ -4015,9 +4015,9 @@ aesni_cbc_sha256_enc_shaext:
 	movups	16(%rcx),%xmm4
 	leaq	112(%rcx),%rcx
 
-	pshufd	$27,%xmm1,%xmm0
-	pshufd	$177,%xmm1,%xmm1
-	pshufd	$27,%xmm2,%xmm2
+	pshufd	$0x1b,%xmm1,%xmm0
+	pshufd	$0xb1,%xmm1,%xmm1
+	pshufd	$0x1b,%xmm2,%xmm2
 	movdqa	%xmm3,%xmm7
 .byte	102,15,58,15,202,8
 	punpcklqdq	%xmm0,%xmm2
@@ -4043,7 +4043,7 @@ aesni_cbc_sha256_enc_shaext:
 	movups	-80(%rcx),%xmm5
 	aesenc	%xmm4,%xmm6
 .byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
+	pshufd	$0x0e,%xmm0,%xmm0
 	movups	-64(%rcx),%xmm4
 	aesenc	%xmm5,%xmm6
 .byte	15,56,203,202
@@ -4055,7 +4055,7 @@ aesni_cbc_sha256_enc_shaext:
 	movups	-48(%rcx),%xmm5
 	aesenc	%xmm4,%xmm6
 .byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
+	pshufd	$0x0e,%xmm0,%xmm0
 	movups	-32(%rcx),%xmm4
 	aesenc	%xmm5,%xmm6
 .byte	15,56,203,202
@@ -4067,7 +4067,7 @@ aesni_cbc_sha256_enc_shaext:
 	movups	-16(%rcx),%xmm5
 	aesenc	%xmm4,%xmm6
 .byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
+	pshufd	$0x0e,%xmm0,%xmm0
 	movdqa	%xmm13,%xmm3
 .byte	102,65,15,58,15,220,4
 	paddd	%xmm3,%xmm10
@@ -4082,7 +4082,7 @@ aesni_cbc_sha256_enc_shaext:
 	movups	16(%rcx),%xmm5
 	aesenc	%xmm4,%xmm6
 .byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
+	pshufd	$0x0e,%xmm0,%xmm0
 	movups	32(%rcx),%xmm4
 	aesenc	%xmm5,%xmm6
 	movdqa	%xmm10,%xmm3
@@ -4096,7 +4096,7 @@ aesni_cbc_sha256_enc_shaext:
 	movups	48(%rcx),%xmm5
 	aesenc	%xmm4,%xmm6
 .byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
+	pshufd	$0x0e,%xmm0,%xmm0
 	movdqa	%xmm11,%xmm3
 .byte	102,65,15,58,15,218,4
 	paddd	%xmm3,%xmm12
@@ -4129,7 +4129,7 @@ aesni_cbc_sha256_enc_shaext:
 	movups	-64(%rcx),%xmm4
 	aesenc	%xmm5,%xmm6
 .byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
+	pshufd	$0x0e,%xmm0,%xmm0
 	movdqa	%xmm12,%xmm3
 .byte	102,65,15,58,15,219,4
 	paddd	%xmm3,%xmm13
@@ -4143,7 +4143,7 @@ aesni_cbc_sha256_enc_shaext:
 	movups	-32(%rcx),%xmm4
 	aesenc	%xmm5,%xmm6
 .byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
+	pshufd	$0x0e,%xmm0,%xmm0
 	movdqa	%xmm13,%xmm3
 .byte	102,65,15,58,15,220,4
 	paddd	%xmm3,%xmm10
@@ -4157,7 +4157,7 @@ aesni_cbc_sha256_enc_shaext:
 	movups	0(%rcx),%xmm4
 	aesenc	%xmm5,%xmm6
 .byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
+	pshufd	$0x0e,%xmm0,%xmm0
 	movdqa	%xmm10,%xmm3
 .byte	102,65,15,58,15,221,4
 	paddd	%xmm3,%xmm11
@@ -4171,7 +4171,7 @@ aesni_cbc_sha256_enc_shaext:
 	movups	32(%rcx),%xmm4
 	aesenc	%xmm5,%xmm6
 .byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
+	pshufd	$0x0e,%xmm0,%xmm0
 	movdqa	%xmm11,%xmm3
 .byte	102,65,15,58,15,218,4
 	paddd	%xmm3,%xmm12
@@ -4206,7 +4206,7 @@ aesni_cbc_sha256_enc_shaext:
 	movups	-64(%rcx),%xmm4
 	aesenc	%xmm5,%xmm6
 .byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
+	pshufd	$0x0e,%xmm0,%xmm0
 	movdqa	%xmm12,%xmm3
 .byte	102,65,15,58,15,219,4
 	paddd	%xmm3,%xmm13
@@ -4220,7 +4220,7 @@ aesni_cbc_sha256_enc_shaext:
 	movups	-32(%rcx),%xmm4
 	aesenc	%xmm5,%xmm6
 .byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
+	pshufd	$0x0e,%xmm0,%xmm0
 	movdqa	%xmm13,%xmm3
 .byte	102,65,15,58,15,220,4
 	paddd	%xmm3,%xmm10
@@ -4234,7 +4234,7 @@ aesni_cbc_sha256_enc_shaext:
 	movups	0(%rcx),%xmm4
 	aesenc	%xmm5,%xmm6
 .byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
+	pshufd	$0x0e,%xmm0,%xmm0
 	movdqa	%xmm10,%xmm3
 .byte	102,65,15,58,15,221,4
 	paddd	%xmm3,%xmm11
@@ -4248,7 +4248,7 @@ aesni_cbc_sha256_enc_shaext:
 	movups	32(%rcx),%xmm4
 	aesenc	%xmm5,%xmm6
 .byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
+	pshufd	$0x0e,%xmm0,%xmm0
 	movdqa	%xmm11,%xmm3
 .byte	102,65,15,58,15,218,4
 	paddd	%xmm3,%xmm12
@@ -4275,7 +4275,7 @@ aesni_cbc_sha256_enc_shaext:
 	movups	16-112(%rcx),%xmm4
 	nop
 .byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
+	pshufd	$0x0e,%xmm0,%xmm0
 	movdqa	%xmm12,%xmm3
 .byte	102,65,15,58,15,219,4
 	paddd	%xmm3,%xmm13
@@ -4296,7 +4296,7 @@ aesni_cbc_sha256_enc_shaext:
 	movups	-48(%rcx),%xmm5
 	aesenc	%xmm4,%xmm6
 .byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
+	pshufd	$0x0e,%xmm0,%xmm0
 	movups	-32(%rcx),%xmm4
 	aesenc	%xmm5,%xmm6
 .byte	15,56,203,202
@@ -4308,7 +4308,7 @@ aesni_cbc_sha256_enc_shaext:
 	movups	0(%rcx),%xmm4
 	aesenc	%xmm5,%xmm6
 .byte	15,56,203,209
-	pshufd	$14,%xmm0,%xmm0
+	pshufd	$0x0e,%xmm0,%xmm0
 	movups	16(%rcx),%xmm5
 	aesenc	%xmm4,%xmm6
 .byte	15,56,203,202
@@ -4341,9 +4341,9 @@ aesni_cbc_sha256_enc_shaext:
 	leaq	64(%rdi),%rdi
 	jnz	.Loop_shaext
 
-	pshufd	$177,%xmm2,%xmm2
-	pshufd	$27,%xmm1,%xmm3
-	pshufd	$177,%xmm1,%xmm1
+	pshufd	$0xb1,%xmm2,%xmm2
+	pshufd	$0x1b,%xmm1,%xmm3
+	pshufd	$0xb1,%xmm1,%xmm1
 	punpckhqdq	%xmm2,%xmm1
 .byte	102,15,58,15,211,8