[Pkg-openssl-changes] r379 - in openssl/trunk: crypto/aes crypto/aes/asm crypto/perlasm debian

[Kurt Roeckx]

Author: kroeckx
Date: 2009-05-16 22:59:57 +0000 (Sat, 16 May 2009)
New Revision: 379

Modified:
   openssl/trunk/crypto/aes/Makefile
   openssl/trunk/crypto/aes/asm/aes-x86_64.pl
   openssl/trunk/crypto/perlasm/x86_64-xlate.pl
   openssl/trunk/debian/changelog
Log:
Make aes-x86_64.pl use PIC.


Modified: openssl/trunk/crypto/aes/Makefile
===================================================================
--- openssl/trunk/crypto/aes/Makefile	2009-05-16 22:46:37 UTC (rev 378)
+++ openssl/trunk/crypto/aes/Makefile	2009-05-16 22:59:57 UTC (rev 379)
@@ -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:

Modified: openssl/trunk/crypto/aes/asm/aes-x86_64.pl
===================================================================
--- openssl/trunk/crypto/aes/asm/aes-x86_64.pl	2009-05-16 22:46:37 UTC (rev 378)
+++ openssl/trunk/crypto/aes/asm/aes-x86_64.pl	2009-05-16 22:59:57 UTC (rev 379)
@@ -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

Modified: openssl/trunk/crypto/perlasm/x86_64-xlate.pl
===================================================================
--- openssl/trunk/crypto/perlasm/x86_64-xlate.pl	2009-05-16 22:46:37 UTC (rev 378)
+++ openssl/trunk/crypto/perlasm/x86_64-xlate.pl	2009-05-16 22:59:57 UTC (rev 379)
@@ -433,7 +433,7 @@
 
     chomp($line);
 
-    $line =~ s|[#!].*$||;	# get rid of asm-style comments...
+#    $line =~ s|[#!].*$||;	# get rid of asm-style comments...
     $line =~ s|/\*.*\*/||;	# ... and C-style comments...
     $line =~ s|^\s+||;		# ... and skip white spaces in beginning
 

Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2009-05-16 22:46:37 UTC (rev 378)
+++ openssl/trunk/debian/changelog	2009-05-16 22:59:57 UTC (rev 379)
@@ -1,6 +1,7 @@
 openssl (0.9.8k-1) unstable; urgency=low
 
   * New upstream release
+  * Make aes-x86_64.pl use PIC.
 
  -- Kurt Roeckx <kurt at roeckx.be>  Sat, 16 May 2009 17:33:55 +0200