[Pkg-openssl-changes] r456 - in openssl/trunk/debian: . patches
Kurt Roeckx
kroeckx at alioth.debian.org
Sun Jun 6 15:39:40 UTC 2010
Author: kroeckx
Date: 2010-06-06 15:39:33 +0000 (Sun, 06 Jun 2010)
New Revision: 456
Modified:
openssl/trunk/debian/changelog
openssl/trunk/debian/patches/pic.patch
Log:
aes-x86_64.pl is now PIC, update pic.patch.
Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog 2010-06-06 12:55:46 UTC (rev 455)
+++ openssl/trunk/debian/changelog 2010-06-06 15:39:33 UTC (rev 456)
@@ -2,6 +2,7 @@
* New upstream version
- Add SHA2 algorithms to SSL_library_init().
+ - aes-x86_64.pl is now PIC, update pic.patch.
* Add sparc64 support (Closes: #560240)
-- Kurt Roeckx <kurt at roeckx.be> Sun, 18 Apr 2010 01:42:44 +0200
Modified: openssl/trunk/debian/patches/pic.patch
===================================================================
--- openssl/trunk/debian/patches/pic.patch 2010-06-06 12:55:46 UTC (rev 455)
+++ openssl/trunk/debian/patches/pic.patch 2010-06-06 15:39:33 UTC (rev 456)
@@ -1,7 +1,7 @@
-Index: openssl-0.9.8k/crypto/Makefile
+Index: openssl-0.9.8o/crypto/Makefile
===================================================================
---- openssl-0.9.8k.orig/crypto/Makefile 2008-09-17 19:10:55.000000000 +0200
-+++ openssl-0.9.8k/crypto/Makefile 2009-07-19 11:36:00.000000000 +0200
+--- openssl-0.9.8o.orig/crypto/Makefile 2008-09-17 17:10:55.000000000 +0000
++++ openssl-0.9.8o/crypto/Makefile 2010-06-06 13:09:28.000000000 +0000
@@ -57,7 +57,7 @@
echo " #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \
echo '#endif' ) >buildinf.h
@@ -20,10 +20,10 @@
$(PERL) x86_64cpuid.pl $@
ia64cpuid.s: ia64cpuid.S
$(CC) $(CFLAGS) -E ia64cpuid.S > $@
-Index: openssl-0.9.8k/crypto/x86_64cpuid.pl
+Index: openssl-0.9.8o/crypto/x86_64cpuid.pl
===================================================================
---- openssl-0.9.8k.orig/crypto/x86_64cpuid.pl 2007-11-11 17:25:00.000000000 +0100
-+++ openssl-0.9.8k/crypto/x86_64cpuid.pl 2009-07-19 11:36:00.000000000 +0200
+--- openssl-0.9.8o.orig/crypto/x86_64cpuid.pl 2007-11-11 16:25:00.000000000 +0000
++++ openssl-0.9.8o/crypto/x86_64cpuid.pl 2010-06-06 13:09:28.000000000 +0000
@@ -95,7 +95,11 @@
.size OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu
@@ -36,10 +36,10 @@
___
-Index: openssl-0.9.8k/crypto/md5/Makefile
+Index: openssl-0.9.8o/crypto/md5/Makefile
===================================================================
---- openssl-0.9.8k.orig/crypto/md5/Makefile 2008-09-17 19:11:02.000000000 +0200
-+++ openssl-0.9.8k/crypto/md5/Makefile 2009-07-19 11:36:00.000000000 +0200
+--- openssl-0.9.8o.orig/crypto/md5/Makefile 2008-09-17 17:11:02.000000000 +0000
++++ openssl-0.9.8o/crypto/md5/Makefile 2010-06-06 13:09:28.000000000 +0000
@@ -52,7 +52,8 @@
mx86-out.s: asm/md5-586.pl ../perlasm/x86asm.pl
(cd asm; $(PERL) md5-586.pl a.out $(CFLAGS) > ../$@)
@@ -50,10 +50,10 @@
files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-Index: openssl-0.9.8k/crypto/des/asm/desboth.pl
+Index: openssl-0.9.8o/crypto/des/asm/desboth.pl
===================================================================
---- openssl-0.9.8k.orig/crypto/des/asm/desboth.pl 2001-10-24 23:20:56.000000000 +0200
-+++ openssl-0.9.8k/crypto/des/asm/desboth.pl 2009-07-19 11:36:00.000000000 +0200
+--- openssl-0.9.8o.orig/crypto/des/asm/desboth.pl 2001-10-24 21:20:56.000000000 +0000
++++ openssl-0.9.8o/crypto/des/asm/desboth.pl 2010-06-06 13:09:28.000000000 +0000
@@ -16,6 +16,11 @@
&push("edi");
@@ -91,10 +91,10 @@
&stack_pop(3);
&mov($L,&DWP(0,"ebx","",0));
-Index: openssl-0.9.8k/crypto/rc4/Makefile
+Index: openssl-0.9.8o/crypto/rc4/Makefile
===================================================================
---- openssl-0.9.8k.orig/crypto/rc4/Makefile 2008-11-19 17:03:50.000000000 +0100
-+++ openssl-0.9.8k/crypto/rc4/Makefile 2009-07-19 11:36:00.000000000 +0200
+--- openssl-0.9.8o.orig/crypto/rc4/Makefile 2008-11-19 16:03:50.000000000 +0000
++++ openssl-0.9.8o/crypto/rc4/Makefile 2010-06-06 13:09:28.000000000 +0000
@@ -51,7 +51,7 @@
rx86-out.s: asm/rc4-586.pl ../perlasm/x86asm.pl
(cd asm; $(PERL) rc4-586.pl a.out $(CFLAGS) > ../$@)
@@ -104,10 +104,10 @@
rc4-ia64.s: asm/rc4-ia64.S
@case `awk '/^#define RC4_INT/{print$$NF}' $(TOP)/include/openssl/opensslconf.h` in \
-Index: openssl-0.9.8k/crypto/rc4/asm/rc4-x86_64.pl
+Index: openssl-0.9.8o/crypto/rc4/asm/rc4-x86_64.pl
===================================================================
---- openssl-0.9.8k.orig/crypto/rc4/asm/rc4-x86_64.pl 2008-09-16 12:47:27.000000000 +0200
-+++ openssl-0.9.8k/crypto/rc4/asm/rc4-x86_64.pl 2009-07-19 11:36:00.000000000 +0200
+--- openssl-0.9.8o.orig/crypto/rc4/asm/rc4-x86_64.pl 2008-09-16 10:47:27.000000000 +0000
++++ openssl-0.9.8o/crypto/rc4/asm/rc4-x86_64.pl 2010-06-06 13:09:28.000000000 +0000
@@ -270,7 +270,11 @@
xor %r10,%r10
xor %r11,%r11
@@ -132,10 +132,10 @@
bt \$20,%edx
jnc .Ldone
add \$12,%rax
-Index: openssl-0.9.8k/crypto/perlasm/x86unix.pl
+Index: openssl-0.9.8o/crypto/perlasm/x86unix.pl
===================================================================
---- openssl-0.9.8k.orig/crypto/perlasm/x86unix.pl 2008-05-02 01:11:32.000000000 +0200
-+++ openssl-0.9.8k/crypto/perlasm/x86unix.pl 2009-07-19 11:36:00.000000000 +0200
+--- openssl-0.9.8o.orig/crypto/perlasm/x86unix.pl 2008-05-01 23:11:32.000000000 +0000
++++ openssl-0.9.8o/crypto/perlasm/x86unix.pl 2010-06-06 13:09:28.000000000 +0000
@@ -400,6 +400,29 @@
$stack=4;
}
@@ -184,10 +184,10 @@
jmp .Linitalign
.align $align
.Linitalign:
-Index: openssl-0.9.8k/crypto/perlasm/cbc.pl
+Index: openssl-0.9.8o/crypto/perlasm/cbc.pl
===================================================================
---- openssl-0.9.8k.orig/crypto/perlasm/cbc.pl 2005-05-09 23:48:00.000000000 +0200
-+++ openssl-0.9.8k/crypto/perlasm/cbc.pl 2009-07-19 11:36:00.000000000 +0200
+--- openssl-0.9.8o.orig/crypto/perlasm/cbc.pl 2005-05-09 21:48:00.000000000 +0000
++++ openssl-0.9.8o/crypto/perlasm/cbc.pl 2010-06-06 13:09:28.000000000 +0000
@@ -122,7 +122,11 @@
&mov(&DWP($data_off,"esp","",0), "eax"); # put in array for call
&mov(&DWP($data_off+4,"esp","",0), "ebx"); #
@@ -240,11 +240,11 @@
&mov("eax", &DWP($data_off,"esp","",0)); # get return
&mov("ebx", &DWP($data_off+4,"esp","",0)); #
-Index: openssl-0.9.8k/crypto/perlasm/x86_64-xlate.pl
+Index: openssl-0.9.8o/crypto/perlasm/x86_64-xlate.pl
===================================================================
---- openssl-0.9.8k.orig/crypto/perlasm/x86_64-xlate.pl 2009-07-19 11:32:41.000000000 +0200
-+++ openssl-0.9.8k/crypto/perlasm/x86_64-xlate.pl 2009-07-19 11:36:00.000000000 +0200
-@@ -433,7 +433,7 @@
+--- openssl-0.9.8o.orig/crypto/perlasm/x86_64-xlate.pl 2010-06-06 13:09:00.000000000 +0000
++++ openssl-0.9.8o/crypto/perlasm/x86_64-xlate.pl 2010-06-06 13:09:28.000000000 +0000
+@@ -435,7 +435,7 @@
chomp($line);
@@ -253,23 +253,10 @@
$line =~ s|/\*.*\*/||; # ... and C-style comments...
$line =~ s|^\s+||; # ... and skip white spaces in beginning
-Index: openssl-0.9.8k/crypto/aes/Makefile
+Index: openssl-0.9.8o/crypto/aes/asm/aes-586.pl
===================================================================
---- openssl-0.9.8k.orig/crypto/aes/Makefile 2008-09-17 19:10:55.000000000 +0200
-+++ openssl-0.9.8k/crypto/aes/Makefile 2009-07-19 11:36:00.000000000 +0200
-@@ -57,7 +57,7 @@
- ax86-out.s: asm/aes-586.pl ../perlasm/x86asm.pl
- (cd asm; $(PERL) aes-586.pl a.out $(CFLAGS) $(PROCESSOR) > ../$@)
-
--aes-x86_64.s: asm/aes-x86_64.pl
-+aes-x86_64.S: asm/aes-x86_64.pl
- $(PERL) asm/aes-x86_64.pl $@
-
- files:
-Index: openssl-0.9.8k/crypto/aes/asm/aes-586.pl
-===================================================================
---- openssl-0.9.8k.orig/crypto/aes/asm/aes-586.pl 2008-12-17 15:14:51.000000000 +0100
-+++ openssl-0.9.8k/crypto/aes/asm/aes-586.pl 2009-07-19 11:36:00.000000000 +0200
+--- openssl-0.9.8o.orig/crypto/aes/asm/aes-586.pl 2008-12-17 14:14:51.000000000 +0000
++++ openssl-0.9.8o/crypto/aes/asm/aes-586.pl 2010-06-06 13:09:28.000000000 +0000
@@ -250,7 +250,7 @@
sub _data_word() { my $i; while(defined($i=shift)) { &data_word($i,$i); } }
@@ -312,19 +299,3 @@
&cmp ("eax",0);
&je (&label("proceed"));
&ret ();
-Index: openssl-0.9.8k/crypto/aes/asm/aes-x86_64.pl
-===================================================================
---- openssl-0.9.8k.orig/crypto/aes/asm/aes-x86_64.pl 2008-12-27 14:34:30.000000000 +0100
-+++ openssl-0.9.8k/crypto/aes/asm/aes-x86_64.pl 2009-07-19 11:36:00.000000000 +0200
-@@ -974,7 +974,11 @@
- .align 16
- AES_set_decrypt_key:
- push %rdx
-+#ifdef OPENSSL_PIC
-+ call AES_set_encrypt_key\@PLT
-+#else
- call AES_set_encrypt_key
-+#endif
- cmp \$0,%eax
- je .Lproceed
- lea 24(%rsp),%rsp
More information about the Pkg-openssl-changes
mailing list