Merge pull request #23 from luvit/bump/openssl_1_0_2g

Bump/openssl 1 0 2g

Author: rphillips

asm/Makefile

@@ -98,7 +98,7 @@ bn_GF2m_mul_2x2:
 	mov	r12,#7<<2
 	sub	sp,sp,#32		@ allocate tab[8]
 
-	bl	mul_1x1_ialu		@ a1·b1
+	bl	mul_1x1_ialu		@ a1·b1
 	str	r5,[r10,#8]
 	str	r4,[r10,#12]
 
@@ -108,13 +108,13 @@ bn_GF2m_mul_2x2:
 	 eor	r2,r2,r1
 	eor	r0,r0,r3
 	 eor	r1,r1,r2
-	bl	mul_1x1_ialu		@ a0·b0
+	bl	mul_1x1_ialu		@ a0·b0
 	str	r5,[r10]
 	str	r4,[r10,#4]
 
 	eor	r1,r1,r2
 	eor	r0,r0,r3
-	bl	mul_1x1_ialu		@ (a1+a0)·(b1+b0)
+	bl	mul_1x1_ialu		@ (a1+a0)·(b1+b0)
 	ldmia	r10,{r6-r9}
 	eor	r5,r5,r4
 	eor	r4,r4,r7

asm/arm-elf-gas/bn/armv4-gf2m.S

@@ -80,8 +80,7 @@ bn_mul_mont:
 	adc	r14,r14,#0
 	str	r12,[r0]		@ tp[num-1]=
 	str	r14,[r0,#4]		@ tp[num]=
-
-
+
 .Louter:
 	sub	r7,r0,sp		@ "original" r0-1 value
 	sub	r1,r1,r7		@ "rewind" ap to &ap[1]
@@ -129,8 +128,7 @@ bn_mul_mont:
 
 	cmp	r4,r7
 	bne	.Louter
-
-
+
 	ldr	r2,[r0,#12*4]		@ pull rp
 	add	r0,r0,#4		@ r0 to point at &tp[num]
 	sub	r5,r0,sp		@ "original" num value

asm/arm-elf-gas/bn/armv4-mont.S

@@ -3,6 +3,11 @@
 .text
 .code	32
 
+#ifdef __clang__
+#define ldrplb	ldrbpl
+#define ldrneb	ldrbne
+#endif
+
 .type	rem_4bit,%object
 .align	5
 rem_4bit:
@@ -144,8 +149,7 @@ gcm_ghash_4bit:
 	strb	r10,[r0,#4+1]
 	strb	r11,[r0,#4]
 #endif
-
-
+	
 #if __ARM_ARCH__>=7 && defined(__ARMEL__)
 	rev	r7,r7
 	str	r7,[r0,#0]
@@ -160,8 +164,7 @@ gcm_ghash_4bit:
 	strb	r10,[r0,#0+1]
 	strb	r11,[r0,#0]
 #endif
-
-
+	
 	bne	.Louter
 
 	add	sp,sp,#36
@@ -253,8 +256,7 @@ gcm_gmult_4bit:
 	strb	r10,[r0,#12+1]
 	strb	r11,[r0,#12]
 #endif
-
-
+	
 #if __ARM_ARCH__>=7 && defined(__ARMEL__)
 	rev	r5,r5
 	str	r5,[r0,#8]
@@ -269,8 +271,7 @@ gcm_gmult_4bit:
 	strb	r10,[r0,#8+1]
 	strb	r11,[r0,#8]
 #endif
-
-
+	
 #if __ARM_ARCH__>=7 && defined(__ARMEL__)
 	rev	r6,r6
 	str	r6,[r0,#4]
@@ -285,8 +286,7 @@ gcm_gmult_4bit:
 	strb	r10,[r0,#4+1]
 	strb	r11,[r0,#4]
 #endif
-
-
+	
 #if __ARM_ARCH__>=7 && defined(__ARMEL__)
 	rev	r7,r7
 	str	r7,[r0,#0]
@@ -301,8 +301,7 @@ gcm_gmult_4bit:
 	strb	r10,[r0,#0+1]
 	strb	r11,[r0,#0]
 #endif
-
-
+	
 #if __ARM_ARCH__>=5
 	ldmia	sp!,{r4-r11,pc}
 #else
@@ -518,8 +517,7 @@ gcm_ghash_neon:
 #ifdef __ARMEL__
 	vrev64.8	q0,q0
 #endif
-	sub		r0,#16
-
+	sub		r0,#16	
 	vst1.64		d1,[r0,:64]!	@ write out Xi
 	vst1.64		d0,[r0,:64]