import OpenSSL 1.0.0e

2 files changed, 5 insertions, 3 deletions

diff --git a/src/lib/libcrypto/perlasm/cbc.pl b/src/lib/libcrypto/perlasm/cbc.pl
index e43dc9ae15..6fc2510905 100644
--- a/src/lib/libcrypto/perlasm/cbc.pl
+++ b/src/lib/libcrypto/perlasm/cbc.pl
@@ -158,7 +158,6 @@ sub cbc
         &jmp_ptr($count);
 
 &set_label("ej7");
-        &xor("edx",             "edx") if $ppro; # ppro friendly
         &movb(&HB("edx"),       &BP(6,$in,"",0));
         &shl("edx",8);
 &set_label("ej6");
@@ -170,7 +169,6 @@ sub cbc
         &jmp(&label("ejend"));
 &set_label("ej3");
         &movb(&HB("ecx"),       &BP(2,$in,"",0));
-        &xor("ecx",             "ecx") if $ppro; # ppro friendly
         &shl("ecx",8);
 &set_label("ej2");
         &movb(&HB("ecx"),       &BP(1,$in,"",0));
diff --git a/src/lib/libcrypto/perlasm/x86_64-xlate.pl b/src/lib/libcrypto/perlasm/x86_64-xlate.pl
index 354673acc1..e47116b74b 100755
--- a/src/lib/libcrypto/perlasm/x86_64-xlate.pl
+++ b/src/lib/libcrypto/perlasm/x86_64-xlate.pl
@@ -167,7 +167,7 @@ my %globals;
             } elsif ($self->{op} =~ /^(pop|push)f/) {
                 $self->{op} .= $self->{sz};
             } elsif ($self->{op} eq "call" && $current_segment eq ".CRT\$XCU") {
-                $self->{op} = "ALIGN\t8\n\tDQ";
+                $self->{op} = "\tDQ";
             } 
             $self->{op};
         }
@@ -545,6 +545,8 @@ my %globals;
                                         if ($line=~/\.([px])data/) {
                                             $v.=" rdata align=";
                                             $v.=$1 eq "p"? 4 : 8;
+                                        } elsif ($line=~/\.CRT\$/i) {
+                                            $v.=" rdata align=8";
                                         }
                                     } else {
                                         $v="$current_segment\tENDS\n" if ($current_segment);
@@ -552,6 +554,8 @@ my %globals;
                                         if ($line=~/\.([px])data/) {
                                             $v.=" READONLY";
                                             $v.=" ALIGN(".($1 eq "p" ? 4 : 8).")" if ($masm>=$masmref);
+                                        } elsif ($line=~/\.CRT\$/i) {
+                                            $v.=" READONLY DWORD";
                                         }
                                     }
                                     $current_segment = $line;