[Pkg-openssl-changes] r541 - in openssl/trunk/debian: . patches
Kurt Roeckx
kroeckx at alioth.debian.org
Sat Mar 17 13:59:04 UTC 2012
Author: kroeckx
Date: 2012-03-17 13:59:04 +0000 (Sat, 17 Mar 2012)
New Revision: 541
Modified:
openssl/trunk/debian/changelog
openssl/trunk/debian/patches/pic.patch
Log:
* pic.patch: upstream made OPENSSL_ia32cap_P hidden on amd64, no need to
access it PIC anymore.
* pic.patch: Make OPENSSL_ia32cap_P hidden on i386 too (Closes: #663977)
Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog 2012-03-17 12:14:07 UTC (rev 540)
+++ openssl/trunk/debian/changelog 2012-03-17 13:59:04 UTC (rev 541)
@@ -7,7 +7,9 @@
the new functions.
* Disable modexp512-x86_64 and the new RSAX internal engine for now, the
perl script to generate modexp512-x86_64 has some problems.
-
+ * pic.patch: upstream made OPENSSL_ia32cap_P hidden on amd64, no need to
+ access it PIC anymore.
+ * pic.patch: Make OPENSSL_ia32cap_P hidden on i386 too (Closes: #663977)
-- Kurt Roeckx <kurt at roeckx.be> Sat, 17 Mar 2012 12:19:07 +0100
Modified: openssl/trunk/debian/patches/pic.patch
===================================================================
--- openssl/trunk/debian/patches/pic.patch 2012-03-17 12:14:07 UTC (rev 540)
+++ openssl/trunk/debian/patches/pic.patch 2012-03-17 13:59:04 UTC (rev 541)
@@ -1,7 +1,7 @@
Index: openssl-1.0.1/crypto/Makefile
===================================================================
---- openssl-1.0.1.orig/crypto/Makefile 2011-12-10 01:37:55.000000000 +0000
-+++ openssl-1.0.1/crypto/Makefile 2012-03-17 09:29:15.000000000 +0000
+--- openssl-1.0.1.orig/crypto/Makefile 2011-12-10 02:37:55.000000000 +0100
++++ openssl-1.0.1/crypto/Makefile 2012-03-17 14:03:25.000000000 +0100
@@ -60,7 +60,7 @@
echo " #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \
echo '#endif' ) >buildinf.h
@@ -22,8 +22,8 @@
pariscid.s: pariscid.pl; $(PERL) pariscid.pl $(PERLASM_SCHEME) $@
Index: openssl-1.0.1/crypto/x86_64cpuid.pl
===================================================================
---- openssl-1.0.1.orig/crypto/x86_64cpuid.pl 2011-11-14 21:01:16.000000000 +0000
-+++ openssl-1.0.1/crypto/x86_64cpuid.pl 2012-03-17 09:20:04.000000000 +0000
+--- openssl-1.0.1.orig/crypto/x86_64cpuid.pl 2011-11-14 22:01:16.000000000 +0100
++++ openssl-1.0.1/crypto/x86_64cpuid.pl 2012-03-17 14:03:25.000000000 +0100
@@ -20,7 +20,11 @@
.extern OPENSSL_cpuid_setup
.hidden OPENSSL_cpuid_setup
@@ -38,8 +38,8 @@
.comm OPENSSL_ia32cap_P,8,4
Index: openssl-1.0.1/crypto/des/asm/desboth.pl
===================================================================
---- openssl-1.0.1.orig/crypto/des/asm/desboth.pl 2001-10-24 21:20:56.000000000 +0000
-+++ openssl-1.0.1/crypto/des/asm/desboth.pl 2012-03-17 09:20:04.000000000 +0000
+--- openssl-1.0.1.orig/crypto/des/asm/desboth.pl 2001-10-24 23:20:56.000000000 +0200
++++ openssl-1.0.1/crypto/des/asm/desboth.pl 2012-03-17 14:03:25.000000000 +0100
@@ -16,6 +16,11 @@
&push("edi");
@@ -79,8 +79,8 @@
&mov($L,&DWP(0,"ebx","",0));
Index: openssl-1.0.1/crypto/rc4/Makefile
===================================================================
---- openssl-1.0.1.orig/crypto/rc4/Makefile 2011-11-14 20:42:21.000000000 +0000
-+++ openssl-1.0.1/crypto/rc4/Makefile 2012-03-17 09:20:04.000000000 +0000
+--- openssl-1.0.1.orig/crypto/rc4/Makefile 2011-11-14 21:42:21.000000000 +0100
++++ openssl-1.0.1/crypto/rc4/Makefile 2012-03-17 14:03:25.000000000 +0100
@@ -44,7 +44,7 @@
rc4-586.s: asm/rc4-586.pl ../perlasm/x86asm.pl
$(PERL) asm/rc4-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@
@@ -90,50 +90,10 @@
$(PERL) asm/rc4-x86_64.pl $(PERLASM_SCHEME) > $@
rc4-md5-x86_64.s: asm/rc4-md5-x86_64.pl
$(PERL) asm/rc4-md5-x86_64.pl $(PERLASM_SCHEME) > $@
-Index: openssl-1.0.1/crypto/rc4/asm/rc4-x86_64.pl
-===================================================================
---- openssl-1.0.1.orig/crypto/rc4/asm/rc4-x86_64.pl 2011-07-01 14:13:52.000000000 +0000
-+++ openssl-1.0.1/crypto/rc4/asm/rc4-x86_64.pl 2012-03-17 09:28:11.000000000 +0000
-@@ -157,7 +157,11 @@
- mov -4($dat),$YY#b
- cmpl \$-1,256($dat)
- je .LRC4_CHAR
-+#ifdef OPENSSL_PIC
-+ mov OPENSSL_ia32cap_P\@GOTPCREL(%rip),%r8d
-+#else
- mov OPENSSL_ia32cap_P(%rip),%r8d
-+#endif
- xor $TX[1],$TX[1]
- inc $XX[0]#b
- sub $XX[0],$TX[1]
-@@ -442,7 +446,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 # RC4_CHAR?
- jc .Lc1stloop
- jmp .Lw1stloop
-@@ -506,7 +514,11 @@
- .align 16
- RC4_options:
- lea .Lopts(%rip),%rax
-+#ifdef OPENSSL_PIC
-+ mov OPENSSL_ia32cap_P\@GOTPCREL(%rip),%edx
-+#else
- mov OPENSSL_ia32cap_P(%rip),%edx
-+#endif
- bt \$20,%edx
- jc .L8xchar
- bt \$30,%edx
Index: openssl-1.0.1/crypto/perlasm/cbc.pl
===================================================================
---- openssl-1.0.1.orig/crypto/perlasm/cbc.pl 2011-07-13 06:22:46.000000000 +0000
-+++ openssl-1.0.1/crypto/perlasm/cbc.pl 2012-03-17 09:20:04.000000000 +0000
+--- openssl-1.0.1.orig/crypto/perlasm/cbc.pl 2011-07-13 08:22:46.000000000 +0200
++++ openssl-1.0.1/crypto/perlasm/cbc.pl 2012-03-17 14:03:25.000000000 +0100
@@ -122,7 +122,11 @@
&mov(&DWP($data_off,"esp","",0), "eax"); # put in array for call
&mov(&DWP($data_off+4,"esp","",0), "ebx"); #
@@ -188,8 +148,8 @@
&mov("ebx", &DWP($data_off+4,"esp","",0)); #
Index: openssl-1.0.1/crypto/perlasm/x86_64-xlate.pl
===================================================================
---- openssl-1.0.1.orig/crypto/perlasm/x86_64-xlate.pl 2012-03-17 09:19:38.000000000 +0000
-+++ openssl-1.0.1/crypto/perlasm/x86_64-xlate.pl 2012-03-17 09:20:04.000000000 +0000
+--- openssl-1.0.1.orig/crypto/perlasm/x86_64-xlate.pl 2012-03-13 20:19:31.000000000 +0100
++++ openssl-1.0.1/crypto/perlasm/x86_64-xlate.pl 2012-03-17 14:03:25.000000000 +0100
@@ -786,7 +786,7 @@
chomp($line);
@@ -201,9 +161,17 @@
Index: openssl-1.0.1/crypto/perlasm/x86gas.pl
===================================================================
---- openssl-1.0.1.orig/crypto/perlasm/x86gas.pl 2011-12-09 19:16:35.000000000 +0000
-+++ openssl-1.0.1/crypto/perlasm/x86gas.pl 2012-03-17 09:30:54.000000000 +0000
-@@ -218,6 +218,15 @@
+--- openssl-1.0.1.orig/crypto/perlasm/x86gas.pl 2011-12-09 20:16:35.000000000 +0100
++++ openssl-1.0.1/crypto/perlasm/x86gas.pl 2012-03-17 14:03:25.000000000 +0100
+@@ -161,6 +161,7 @@
+ if ($::macosx) { push (@out,"$tmp,2\n"); }
+ elsif ($::elf) { push (@out,"$tmp,4\n"); }
+ else { push (@out,"$tmp\n"); }
++ if ($::elf) { push (@out,".hidden\tOPENSSL_ia32cap_P\n"); }
+ }
+ push(@out,$initseg) if ($initseg);
+ }
+@@ -218,7 +219,17 @@
elsif ($::elf)
{ $initseg.=<<___;
.section .init
@@ -217,28 +185,14 @@
+ popl %ebx
+#else
call $f
++#endif
___
}
-Index: openssl-1.0.1/crypto/aes/asm/aes-x86_64.pl
-===================================================================
---- openssl-1.0.1.orig/crypto/aes/asm/aes-x86_64.pl 2011-11-14 21:01:17.000000000 +0000
-+++ openssl-1.0.1/crypto/aes/asm/aes-x86_64.pl 2012-03-17 09:20:04.000000000 +0000
-@@ -1678,7 +1678,11 @@
- lea .LAES_Td(%rip),$sbox
- .Lcbc_picked_te:
-
-+#ifdef OPENSSL_PIC
-+ mov OPENSSL_ia32cap_P\@GOTPCREL(%rip),%r10d
-+#else
- mov OPENSSL_ia32cap_P(%rip),%r10d
-+#endif
- cmp \$$speed_limit,%rdx
- jb .Lcbc_slow_prologue
- test \$15,%rdx
+ elsif ($::coff)
Index: openssl-1.0.1/crypto/aes/Makefile
===================================================================
---- openssl-1.0.1.orig/crypto/aes/Makefile 2011-11-14 20:42:21.000000000 +0000
-+++ openssl-1.0.1/crypto/aes/Makefile 2012-03-17 09:20:04.000000000 +0000
+--- openssl-1.0.1.orig/crypto/aes/Makefile 2011-11-14 21:42:21.000000000 +0100
++++ openssl-1.0.1/crypto/aes/Makefile 2012-03-17 14:03:25.000000000 +0100
@@ -55,7 +55,7 @@
aesni-x86.s: asm/aesni-x86.pl ../perlasm/x86asm.pl
$(PERL) asm/aesni-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
@@ -248,3 +202,45 @@
$(PERL) asm/aes-x86_64.pl $(PERLASM_SCHEME) > $@
vpaes-x86_64.s: asm/vpaes-x86_64.pl
$(PERL) asm/vpaes-x86_64.pl $(PERLASM_SCHEME) > $@
+Index: openssl-1.0.1/crypto/x86cpuid.pl
+===================================================================
+--- openssl-1.0.1.orig/crypto/x86cpuid.pl 2012-02-28 15:20:34.000000000 +0100
++++ openssl-1.0.1/crypto/x86cpuid.pl 2012-03-17 14:13:56.000000000 +0100
+@@ -8,6 +8,8 @@
+
+ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
+
++push(@out, ".hidden OPENSSL_ia32cap_P\n");
++
+ &function_begin("OPENSSL_ia32_cpuid");
+ &xor ("edx","edx");
+ &pushf ();
+@@ -139,9 +141,7 @@
+ &set_label("nocpuid");
+ &function_end("OPENSSL_ia32_cpuid");
+
+-&external_label("OPENSSL_ia32cap_P");
+-
+-&function_begin_B("OPENSSL_rdtsc","EXTRN\t_OPENSSL_ia32cap_P:DWORD");
++&function_begin_B("OPENSSL_rdtsc");
+ &xor ("eax","eax");
+ &xor ("edx","edx");
+ &picmeup("ecx","OPENSSL_ia32cap_P");
+@@ -155,7 +155,7 @@
+ # This works in Ring 0 only [read DJGPP+MS-DOS+privileged DPMI host],
+ # but it's safe to call it on any [supported] 32-bit platform...
+ # Just check for [non-]zero return value...
+-&function_begin_B("OPENSSL_instrument_halt","EXTRN\t_OPENSSL_ia32cap_P:DWORD");
++&function_begin_B("OPENSSL_instrument_halt");
+ &picmeup("ecx","OPENSSL_ia32cap_P");
+ &bt (&DWP(0,"ecx"),4);
+ &jnc (&label("nohalt")); # no TSC
+@@ -222,7 +222,7 @@
+ &ret ();
+ &function_end_B("OPENSSL_far_spin");
+
+-&function_begin_B("OPENSSL_wipe_cpu","EXTRN\t_OPENSSL_ia32cap_P:DWORD");
++&function_begin_B("OPENSSL_wipe_cpu");
+ &xor ("eax","eax");
+ &xor ("edx","edx");
+ &picmeup("ecx","OPENSSL_ia32cap_P");
More information about the Pkg-openssl-changes
mailing list