[Pkg-openssl-changes] r418 - in openssl/trunk: crypto/rc4 crypto/rc4/asm debian

[Kurt Roeckx]

Author: kroeckx
Date: 2009-06-13 16:15:40 +0000 (Sat, 13 Jun 2009)
New Revision: 418

Modified:
   openssl/trunk/crypto/rc4/Makefile
   openssl/trunk/crypto/rc4/asm/rc4-x86_64.pl
   openssl/trunk/debian/changelog
Log:
Make rc4-x86_64 PIC


Modified: openssl/trunk/crypto/rc4/Makefile
===================================================================
--- openssl/trunk/crypto/rc4/Makefile	2009-06-13 15:50:37 UTC (rev 417)
+++ openssl/trunk/crypto/rc4/Makefile	2009-06-13 16:15:40 UTC (rev 418)
@@ -51,7 +51,7 @@
 rx86-out.s: asm/rc4-586.pl ../perlasm/x86asm.pl
 	(cd asm; $(PERL) rc4-586.pl a.out $(CFLAGS) > ../$@)
 
-rc4-x86_64.s: asm/rc4-x86_64.pl;	$(PERL) asm/rc4-x86_64.pl $@
+rc4-x86_64.S: asm/rc4-x86_64.pl;	$(PERL) asm/rc4-x86_64.pl $@
 
 rc4-ia64.s: asm/rc4-ia64.S
 	@case `awk '/^#define RC4_INT/{print$$NF}' $(TOP)/include/openssl/opensslconf.h` in \

Modified: openssl/trunk/crypto/rc4/asm/rc4-x86_64.pl
===================================================================
--- openssl/trunk/crypto/rc4/asm/rc4-x86_64.pl	2009-06-13 15:50:37 UTC (rev 417)
+++ openssl/trunk/crypto/rc4/asm/rc4-x86_64.pl	2009-06-13 16:15:40 UTC (rev 418)
@@ -270,7 +270,11 @@
 	xor	%r10,%r10
 	xor	%r11,%r11
 
+#ifdef OPENSSL_PIC
+	mov	OPENSSL_ia32cap_P\@GOTPCREL(%rip),$idx#d
+#else
 	mov	OPENSSL_ia32cap_P(%rip),$idx#d
+#endif
 	bt	\$20,$idx#d
 	jnc	.Lw1stloop
 	bt	\$30,$idx#d
@@ -338,7 +342,11 @@
 RC4_options:
 	.picmeup %rax
 	lea	.Lopts-.(%rax),%rax
+#ifdef OPENSSL_PIC
+	mov	OPENSSL_ia32cap_P\@GOTPCREL(%rip),%edx
+#else
 	mov	OPENSSL_ia32cap_P(%rip),%edx
+#endif
 	bt	\$20,%edx
 	jnc	.Ldone
 	add	\$12,%rax

Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2009-06-13 15:50:37 UTC (rev 417)
+++ openssl/trunk/debian/changelog	2009-06-13 16:15:40 UTC (rev 418)
@@ -1,3 +1,9 @@
+openssl (0.9.8k-3) unstable; urgency=low
+
+  * Make rc4-x86_64 PIC.  Based on patch from Petr Salinger (Closes: #532336)
+
+ -- Kurt Roeckx <kurt at roeckx.be>  Sat, 13 Jun 2009 17:46:23 +0200
+
 openssl (0.9.8k-2) unstable; urgency=low
 
   * Move libssl0.9.8-dbg to the debug section.