[Pkg-openssl-changes] r104 - in openssl/trunk: crypto crypto/bn/asm debian

[Kurt Roeckx]

Author: kroeckx
Date: 2005-12-13 20:40:01 +0000 (Tue, 13 Dec 2005)
New Revision: 104

Added:
   openssl/trunk/crypto/bn/
Modified:
   openssl/trunk/crypto/bn/asm/sparcv8plus.S
   openssl/trunk/debian/changelog
Log:
Stop ssh from crashing randomly on sparc (Closes: #335912)
Patch from upstream cvs: http://cvs.openssl.org/chngview?cn=14624



Copied: openssl/trunk/crypto/bn (from rev 103, openssl/branches/upstream/current/crypto/bn)

Modified: openssl/trunk/crypto/bn/asm/sparcv8plus.S
===================================================================
--- openssl/branches/upstream/current/crypto/bn/asm/sparcv8plus.S	2005-12-13 20:34:47 UTC (rev 103)
+++ openssl/trunk/crypto/bn/asm/sparcv8plus.S	2005-12-13 20:40:01 UTC (rev 104)
@@ -162,10 +162,14 @@
  * BN_ULONG w;
  */
 bn_mul_add_words:
+	sra	%o2,%g0,%o2	! signx %o2
 	brgz,a	%o2,.L_bn_mul_add_words_proceed
 	lduw	[%o1],%g2
 	retl
 	clr	%o0
+	nop
+	nop
+	nop
 
 .L_bn_mul_add_words_proceed:
 	srl	%o3,%g0,%o3	! clruw	%o3
@@ -260,10 +264,14 @@
  * BN_ULONG w;
  */
 bn_mul_words:
+	sra	%o2,%g0,%o2	! signx %o2
 	brgz,a	%o2,.L_bn_mul_words_proceeed
 	lduw	[%o1],%g2
 	retl
 	clr	%o0
+	nop
+	nop
+	nop
 
 .L_bn_mul_words_proceeed:
 	srl	%o3,%g0,%o3	! clruw	%o3
@@ -344,10 +352,14 @@
  * int n;
  */
 bn_sqr_words:
+	sra	%o2,%g0,%o2	! signx %o2
 	brgz,a	%o2,.L_bn_sqr_words_proceeed
 	lduw	[%o1],%g2
 	retl
 	clr	%o0
+	nop
+	nop
+	nop
 
 .L_bn_sqr_words_proceeed:
 	andcc	%o2,-4,%g0
@@ -445,6 +457,7 @@
  * int n;
  */
 bn_add_words:
+	sra	%o3,%g0,%o3	! signx %o3
 	brgz,a	%o3,.L_bn_add_words_proceed
 	lduw	[%o1],%o4
 	retl
@@ -454,7 +467,6 @@
 	andcc	%o3,-4,%g0
 	bz,pn	%icc,.L_bn_add_words_tail
 	addcc	%g0,0,%g0	! clear carry flag
-	nop
 
 .L_bn_add_words_loop:		! wow! 32 aligned!
 	dec	4,%o3
@@ -523,6 +535,7 @@
  * int n;
  */
 bn_sub_words:
+	sra	%o3,%g0,%o3	! signx %o3
 	brgz,a	%o3,.L_bn_sub_words_proceed
 	lduw	[%o1],%o4
 	retl
@@ -532,7 +545,6 @@
 	andcc	%o3,-4,%g0
 	bz,pn	%icc,.L_bn_sub_words_tail
 	addcc	%g0,0,%g0	! clear carry flag
-	nop
 
 .L_bn_sub_words_loop:		! wow! 32 aligned!
 	dec	4,%o3

Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2005-12-13 20:34:47 UTC (rev 103)
+++ openssl/trunk/debian/changelog	2005-12-13 20:40:01 UTC (rev 104)
@@ -1,3 +1,10 @@
+openssl (0.9.8a-5) unstable; urgency=low
+
+  * Stop ssh from crashing randomly on sparc (Closes: #335912)
+    Patch from upstream cvs.
+
+ -- Kurt Roeckx <kurt at roeckx.be>  Tue, 13 Dec 2005 21:37:42 +0100
+
 openssl (0.9.8a-4) unstable; urgency=low
 
   * Call dh_makeshlibs with the proper version instead of putting