import OpenSSL-1.0.1c

4 files changed, 276 insertions, 47 deletions

diff --git a/src/lib/libcrypto/perlasm/ppc-xlate.pl b/src/lib/libcrypto/perlasm/ppc-xlate.pl
index 4579671c97..a3edd982b6 100755
--- a/src/lib/libcrypto/perlasm/ppc-xlate.pl
+++ b/src/lib/libcrypto/perlasm/ppc-xlate.pl
@@ -31,10 +31,9 @@ my $globl = sub {
                                 $ret .= ".type  $name,\@function";
                                 last;
                               };
-        /linux.*64/     && do { $ret .= ".globl .$name\n";
-                                $ret .= ".type  .$name,\@function\n";
+        /linux.*64/     && do { $ret .= ".globl $name\n";
+                                $ret .= ".type  $name,\@function\n";
                                 $ret .= ".section       \".opd\",\"aw\"\n";
-                                $ret .= ".globl $name\n";
                                 $ret .= ".align 3\n";
                                 $ret .= "$name:\n";
                                 $ret .= ".quad  .$name,.TOC.\@tocbase,0\n";
@@ -62,6 +61,14 @@ my $machine = sub {
     }
     ".machine   $arch";
 };
+my $size = sub {
+    if ($flavour =~ /linux.*32/)
+    {   shift;
+        ".size  " . join(",",@_);
+    }
+    else
+    {   "";     }
+};
 my $asciz = sub {
     shift;
     my $line = join(",",@_);
diff --git a/src/lib/libcrypto/perlasm/x86_64-xlate.pl b/src/lib/libcrypto/perlasm/x86_64-xlate.pl
index e47116b74b..56d9b64b6f 100755
--- a/src/lib/libcrypto/perlasm/x86_64-xlate.pl
+++ b/src/lib/libcrypto/perlasm/x86_64-xlate.pl
@@ -62,12 +62,8 @@ my $flavour = shift;
 my $output  = shift;
 if ($flavour =~ /\./) { $output = $flavour; undef $flavour; }
 
-{ my ($stddev,$stdino,@junk)=stat(STDOUT);
-  my ($outdev,$outino,@junk)=stat($output);
-
-    open STDOUT,">$output" || die "can't open $output: $!"
-        if ($stddev!=$outdev || $stdino!=$outino);
-}
+open STDOUT,">$output" || die "can't open $output: $!"
+        if (defined($output));
 
 my $gas=1;      $gas=0 if ($output =~ /\.asm$/);
 my $elf=1;      $elf=0 if (!$gas);
@@ -116,12 +112,16 @@ my %globals;
             $line = substr($line,@+[0]); $line =~ s/^\s+//;
 
             undef $self->{sz};
-            if ($self->{op} =~ /^(movz)b.*/) {  # movz is pain...
+            if ($self->{op} =~ /^(movz)x?([bw]).*/) {   # movz is pain...
                 $self->{op} = $1;
-                $self->{sz} = "b";
+                $self->{sz} = $2;
             } elsif ($self->{op} =~ /call|jmp/) {
                 $self->{sz} = "";
-            } elsif ($self->{op} =~ /^p/ && $' !~ /^(ush|op)/) { # SSEn
+            } elsif ($self->{op} =~ /^p/ && $' !~ /^(ush|op|insrw)/) { # SSEn
+                $self->{sz} = "";
+            } elsif ($self->{op} =~ /^v/) { # VEX
+                $self->{sz} = "";
+            } elsif ($self->{op} =~ /movq/ && $line =~ /%xmm/) {
                 $self->{sz} = "";
             } elsif ($self->{op} =~ /([a-z]{3,})([qlwb])$/) {
                 $self->{op} = $1;
@@ -246,35 +246,39 @@ my %globals;
         $self->{index} =~ s/^[er](.?[0-9xpi])[d]?$/r\1/;
         $self->{base}  =~ s/^[er](.?[0-9xpi])[d]?$/r\1/;
 
+        # Solaris /usr/ccs/bin/as can't handle multiplications
+        # in $self->{label}, new gas requires sign extension...
+        use integer;
+        $self->{label} =~ s/(?<![\w\$\.])(0x?[0-9a-f]+)/oct($1)/egi;
+        $self->{label} =~ s/([0-9]+\s*[\*\/\%]\s*[0-9]+)/eval($1)/eg;
+        $self->{label} =~ s/([0-9]+)/$1<<32>>32/eg;
+
         if ($gas) {
-            # Solaris /usr/ccs/bin/as can't handle multiplications
-            # in $self->{label}, new gas requires sign extension...
-            use integer;
-            $self->{label} =~ s/(?<![\w\$\.])(0x?[0-9a-f]+)/oct($1)/egi;
-            $self->{label} =~ s/([0-9]+\s*[\*\/\%]\s*[0-9]+)/eval($1)/eg;
-            $self->{label} =~ s/([0-9]+)/$1<<32>>32/eg;
             $self->{label} =~ s/^___imp_/__imp__/   if ($flavour eq "mingw64");
 
             if (defined($self->{index})) {
-                sprintf "%s%s(%%%s,%%%s,%d)",$self->{asterisk},
-                                        $self->{label},$self->{base},
+                sprintf "%s%s(%s,%%%s,%d)",$self->{asterisk},
+                                        $self->{label},
+                                        $self->{base}?"%$self->{base}":"",
                                         $self->{index},$self->{scale};
             } else {
                 sprintf "%s%s(%%%s)",   $self->{asterisk},$self->{label},$self->{base};
             }
         } else {
-            %szmap = ( b=>"BYTE$PTR", w=>"WORD$PTR", l=>"DWORD$PTR", q=>"QWORD$PTR" );
+            %szmap = (  b=>"BYTE$PTR", w=>"WORD$PTR", l=>"DWORD$PTR",
+                        q=>"QWORD$PTR",o=>"OWORD$PTR",x=>"XMMWORD$PTR" );
 
             $self->{label} =~ s/\./\$/g;
             $self->{label} =~ s/(?<![\w\$\.])0x([0-9a-f]+)/0$1h/ig;
             $self->{label} = "($self->{label})" if ($self->{label} =~ /[\*\+\-\/]/);
-            $sz="q" if ($self->{asterisk});
+            $sz="q" if ($self->{asterisk} || opcode->mnemonic() eq "movq");
+            $sz="l" if (opcode->mnemonic() eq "movd");
 
             if (defined($self->{index})) {
-                sprintf "%s[%s%s*%d+%s]",$szmap{$sz},
+                sprintf "%s[%s%s*%d%s]",$szmap{$sz},
                                         $self->{label}?"$self->{label}+":"",
                                         $self->{index},$self->{scale},
-                                        $self->{base};
+                                        $self->{base}?"+$self->{base}":"";
             } elsif ($self->{base} eq "rip") {
                 sprintf "%s[%s]",$szmap{$sz},$self->{label};
             } else {
@@ -506,6 +510,12 @@ my %globals;
                     }
                 } elsif ($dir =~ /\.(text|data)/) {
                     $current_segment=".$1";
+                } elsif ($dir =~ /\.hidden/) {
+                    if    ($flavour eq "macosx")  { $self->{value} = ".private_extern\t$prefix$line"; }
+                    elsif ($flavour eq "mingw64") { $self->{value} = ""; }
+                } elsif ($dir =~ /\.comm/) {
+                    $self->{value} = "$dir\t$prefix$line";
+                    $self->{value} =~ s|,([0-9]+),([0-9]+)$|",$1,".log($2)/log(2)|e if ($flavour eq "macosx");
                 }
                 $line = "";
                 return $self;
@@ -555,7 +565,8 @@ my %globals;
                                             $v.=" READONLY";
                                             $v.=" ALIGN(".($1 eq "p" ? 4 : 8).")" if ($masm>=$masmref);
                                         } elsif ($line=~/\.CRT\$/i) {
-                                            $v.=" READONLY DWORD";
+                                            $v.=" READONLY ";
+                                            $v.=$masm>=$masmref ? "ALIGN(8)" : "DWORD";
                                         }
                                     }
                                     $current_segment = $line;
@@ -577,7 +588,7 @@ my %globals;
                                             $self->{value}="${decor}SEH_end_$current_function->{name}:";
                                             $self->{value}.=":\n" if($masm);
                                         }
-                                        $self->{value}.="$current_function->{name}\tENDP" if($masm);
+                                        $self->{value}.="$current_function->{name}\tENDP" if($masm && $current_function->{name});
                                         undef $current_function;
                                     }
                                     last;
@@ -613,6 +624,19 @@ my %globals;
                                                 .join(",",@str) if (@str);
                                     last;
                                   };
+                /\.comm/    && do { my @str=split(/,\s*/,$line);
+                                    my $v=undef;
+                                    if ($nasm) {
+                                        $v.="common     $prefix@str[0] @str[1]";
+                                    } else {
+                                        $v="$current_segment\tENDS\n" if ($current_segment);
+                                        $current_segment = "_DATA";
+                                        $v.="$current_segment\tSEGMENT\n";
+                                        $v.="COMM       @str[0]:DWORD:".@str[1]/4;
+                                    }
+                                    $self->{value} = $v;
+                                    last;
+                                  };
             }
             $line = "";
         }
@@ -625,9 +649,133 @@ my %globals;
     }
 }
 
+sub rex {
+ local *opcode=shift;
+ my ($dst,$src,$rex)=@_;
+
+   $rex|=0x04 if($dst>=8);
+   $rex|=0x01 if($src>=8);
+   push @opcode,($rex|0x40) if ($rex);
+}
+
+# older gas and ml64 don't handle SSE>2 instructions
+my %regrm = (   "%eax"=>0, "%ecx"=>1, "%edx"=>2, "%ebx"=>3,
+                "%esp"=>4, "%ebp"=>5, "%esi"=>6, "%edi"=>7      );
+
+my $movq = sub {        # elderly gas can't handle inter-register movq
+  my $arg = shift;
+  my @opcode=(0x66);
+    if ($arg =~ /%xmm([0-9]+),\s*%r(\w+)/) {
+        my ($src,$dst)=($1,$2);
+        if ($dst !~ /[0-9]+/)   { $dst = $regrm{"%e$dst"}; }
+        rex(\@opcode,$src,$dst,0x8);
+        push @opcode,0x0f,0x7e;
+        push @opcode,0xc0|(($src&7)<<3)|($dst&7);       # ModR/M
+        @opcode;
+    } elsif ($arg =~ /%r(\w+),\s*%xmm([0-9]+)/) {
+        my ($src,$dst)=($2,$1);
+        if ($dst !~ /[0-9]+/)   { $dst = $regrm{"%e$dst"}; }
+        rex(\@opcode,$src,$dst,0x8);
+        push @opcode,0x0f,0x6e;
+        push @opcode,0xc0|(($src&7)<<3)|($dst&7);       # ModR/M
+        @opcode;
+    } else {
+        ();
+    }
+};
+
+my $pextrd = sub {
+    if (shift =~ /\$([0-9]+),\s*%xmm([0-9]+),\s*(%\w+)/) {
+      my @opcode=(0x66);
+        $imm=$1;
+        $src=$2;
+        $dst=$3;
+        if ($dst =~ /%r([0-9]+)d/)      { $dst = $1; }
+        elsif ($dst =~ /%e/)            { $dst = $regrm{$dst}; }
+        rex(\@opcode,$src,$dst);
+        push @opcode,0x0f,0x3a,0x16;
+        push @opcode,0xc0|(($src&7)<<3)|($dst&7);       # ModR/M
+        push @opcode,$imm;
+        @opcode;
+    } else {
+        ();
+    }
+};
+
+my $pinsrd = sub {
+    if (shift =~ /\$([0-9]+),\s*(%\w+),\s*%xmm([0-9]+)/) {
+      my @opcode=(0x66);
+        $imm=$1;
+        $src=$2;
+        $dst=$3;
+        if ($src =~ /%r([0-9]+)/)       { $src = $1; }
+        elsif ($src =~ /%e/)            { $src = $regrm{$src}; }
+        rex(\@opcode,$dst,$src);
+        push @opcode,0x0f,0x3a,0x22;
+        push @opcode,0xc0|(($dst&7)<<3)|($src&7);       # ModR/M
+        push @opcode,$imm;
+        @opcode;
+    } else {
+        ();
+    }
+};
+
+my $pshufb = sub {
+    if (shift =~ /%xmm([0-9]+),\s*%xmm([0-9]+)/) {
+      my @opcode=(0x66);
+        rex(\@opcode,$2,$1);
+        push @opcode,0x0f,0x38,0x00;
+        push @opcode,0xc0|($1&7)|(($2&7)<<3);           # ModR/M
+        @opcode;
+    } else {
+        ();
+    }
+};
+
+my $palignr = sub {
+    if (shift =~ /\$([0-9]+),\s*%xmm([0-9]+),\s*%xmm([0-9]+)/) {
+      my @opcode=(0x66);
+        rex(\@opcode,$3,$2);
+        push @opcode,0x0f,0x3a,0x0f;
+        push @opcode,0xc0|($2&7)|(($3&7)<<3);           # ModR/M
+        push @opcode,$1;
+        @opcode;
+    } else {
+        ();
+    }
+};
+
+my $pclmulqdq = sub {
+    if (shift =~ /\$([x0-9a-f]+),\s*%xmm([0-9]+),\s*%xmm([0-9]+)/) {
+      my @opcode=(0x66);
+        rex(\@opcode,$3,$2);
+        push @opcode,0x0f,0x3a,0x44;
+        push @opcode,0xc0|($2&7)|(($3&7)<<3);           # ModR/M
+        my $c=$1;
+        push @opcode,$c=~/^0/?oct($c):$c;
+        @opcode;
+    } else {
+        ();
+    }
+};
+
+my $rdrand = sub {
+    if (shift =~ /%[er](\w+)/) {
+      my @opcode=();
+      my $dst=$1;
+        if ($dst !~ /[0-9]+/) { $dst = $regrm{"%e$dst"}; }
+        rex(\@opcode,0,$1,8);
+        push @opcode,0x0f,0xc7,0xf0|($dst&7);
+        @opcode;
+    } else {
+        ();
+    }
+};
+
 if ($nasm) {
     print <<___;
 default rel
+%define XMMWORD
 ___
 } elsif ($masm) {
     print <<___;
@@ -644,14 +792,22 @@ while($line=<>) {
 
     undef $label;
     undef $opcode;
-    undef $sz;
     undef @args;
 
     if ($label=label->re(\$line))       { print $label->out(); }
 
     if (directive->re(\$line)) {
         printf "%s",directive->out();
-    } elsif ($opcode=opcode->re(\$line)) { ARGUMENT: while (1) {
+    } elsif ($opcode=opcode->re(\$line)) {
+        my $asm = eval("\$".$opcode->mnemonic());
+        undef @bytes;
+        
+        if ((ref($asm) eq 'CODE') && scalar(@bytes=&$asm($line))) {
+            print $gas?".byte\t":"DB\t",join(',',@bytes),"\n";
+            next;
+        }
+
+        ARGUMENT: while (1) {
         my $arg;
 
         if ($arg=register->re(\$line))  { opcode->size($arg->size()); }
@@ -667,19 +823,26 @@ while($line=<>) {
         $line =~ s/^,\s*//;
         } # ARGUMENT:
 
-        $sz=opcode->size();
-
         if ($#args>=0) {
             my $insn;
+            my $sz=opcode->size();
+
             if ($gas) {
                 $insn = $opcode->out($#args>=1?$args[$#args]->size():$sz);
+                @args = map($_->out($sz),@args);
+                printf "\t%s\t%s",$insn,join(",",@args);
             } else {
                 $insn = $opcode->out();
-                $insn .= $sz if (map($_->out() =~ /x?mm/,@args));
+                foreach (@args) {
+                    my $arg = $_->out();
+                    # $insn.=$sz compensates for movq, pinsrw, ...
+                    if ($arg =~ /^xmm[0-9]+$/) { $insn.=$sz; $sz="x" if(!$sz); last; }
+                    if ($arg =~ /^mm[0-9]+$/)  { $insn.=$sz; $sz="q" if(!$sz); last; }
+                }
                 @args = reverse(@args);
                 undef $sz if ($nasm && $opcode->mnemonic() eq "lea");
+                printf "\t%s\t%s",$insn,join(",",map($_->out($sz),@args));
             }
-            printf "\t%s\t%s",$insn,join(",",map($_->out($sz),@args));
         } else {
             printf "\t%s",$opcode->out();
         }
diff --git a/src/lib/libcrypto/perlasm/x86asm.pl b/src/lib/libcrypto/perlasm/x86asm.pl
index 28080caaa6..eb543db2f6 100644
--- a/src/lib/libcrypto/perlasm/x86asm.pl
+++ b/src/lib/libcrypto/perlasm/x86asm.pl
@@ -80,6 +80,57 @@ sub ::movq
     {   &::generic("movq",@_);                  }
 }
 
+# SSE>2 instructions
+my %regrm = (   "eax"=>0, "ecx"=>1, "edx"=>2, "ebx"=>3,
+                "esp"=>4, "ebp"=>5, "esi"=>6, "edi"=>7  );
+sub ::pextrd
+{ my($dst,$src,$imm)=@_;
+    if ("$dst:$src" =~ /(e[a-dsd][ixp]):xmm([0-7])/)
+    {   &::data_byte(0x66,0x0f,0x3a,0x16,0xc0|($2<<3)|$regrm{$1},$imm); }
+    else
+    {   &::generic("pextrd",@_);                }
+}
+
+sub ::pinsrd
+{ my($dst,$src,$imm)=@_;
+    if ("$dst:$src" =~ /xmm([0-7]):(e[a-dsd][ixp])/)
+    {   &::data_byte(0x66,0x0f,0x3a,0x22,0xc0|($1<<3)|$regrm{$2},$imm); }
+    else
+    {   &::generic("pinsrd",@_);                }
+}
+
+sub ::pshufb
+{ my($dst,$src)=@_;
+    if ("$dst:$src" =~ /xmm([0-7]):xmm([0-7])/)
+    {   &data_byte(0x66,0x0f,0x38,0x00,0xc0|($1<<3)|$2);        }
+    else
+    {   &::generic("pshufb",@_);                }
+}
+
+sub ::palignr
+{ my($dst,$src,$imm)=@_;
+    if ("$dst:$src" =~ /xmm([0-7]):xmm([0-7])/)
+    {   &::data_byte(0x66,0x0f,0x3a,0x0f,0xc0|($1<<3)|$2,$imm); }
+    else
+    {   &::generic("palignr",@_);               }
+}
+
+sub ::pclmulqdq
+{ my($dst,$src,$imm)=@_;
+    if ("$dst:$src" =~ /xmm([0-7]):xmm([0-7])/)
+    {   &::data_byte(0x66,0x0f,0x3a,0x44,0xc0|($1<<3)|$2,$imm); }
+    else
+    {   &::generic("pclmulqdq",@_);             }
+}
+
+sub ::rdrand
+{ my ($dst)=@_;
+    if ($dst =~ /(e[a-dsd][ixp])/)
+    {   &::data_byte(0x0f,0xc7,0xf0|$regrm{$dst});      }
+    else
+    {   &::generic("rdrand",@_);        }
+}
+
 # label management
 $lbdecor="L";           # local label decoration, set by package
 $label="000";
@@ -167,7 +218,7 @@ sub ::asm_init
     $filename=$fn;
     $i386=$cpu;
 
-    $elf=$cpp=$coff=$aout=$macosx=$win32=$netware=$mwerks=0;
+    $elf=$cpp=$coff=$aout=$macosx=$win32=$netware=$mwerks=$android=0;
     if    (($type eq "elf"))
     {   $elf=1;                 require "x86gas.pl";    }
     elsif (($type eq "a\.out"))
@@ -184,6 +235,8 @@ sub ::asm_init
     {   $win32=1;               require "x86masm.pl";   }
     elsif (($type eq "macosx"))
     {   $aout=1; $macosx=1;     require "x86gas.pl";    }
+    elsif (($type eq "android"))
+    {   $elf=1; $android=1;     require "x86gas.pl";    }
     else
     {   print STDERR <<"EOF";
 Pick one target type from
diff --git a/src/lib/libcrypto/perlasm/x86gas.pl b/src/lib/libcrypto/perlasm/x86gas.pl
index 6eab727fd4..682a3a3163 100644
--- a/src/lib/libcrypto/perlasm/x86gas.pl
+++ b/src/lib/libcrypto/perlasm/x86gas.pl
@@ -45,9 +45,8 @@ sub ::generic
     undef $suffix if ($dst =~ m/^%[xm]/o || $src =~ m/^%[xm]/o);
 
     if ($#_==0)                         { &::emit($opcode);             }
-    elsif ($opcode =~ m/^j/o && $#_==1) { &::emit($opcode,@arg);        }
-    elsif ($opcode eq "call" && $#_==1) { &::emit($opcode,@arg);        }
-    elsif ($opcode =~ m/^set/&& $#_==1) { &::emit($opcode,@arg);        }
+    elsif ($#_==1 && $opcode =~ m/^(call|clflush|j|loop|set)/o)
+                                        { &::emit($opcode,@arg);        }
     else                                { &::emit($opcode.$suffix,@arg);}
 
   1;
@@ -91,6 +90,7 @@ sub ::DWP
 }
 sub ::QWP       { &::DWP(@_);   }
 sub ::BP        { &::DWP(@_);   }
+sub ::WP        { &::DWP(@_);   }
 sub ::BC        { @_;           }
 sub ::DWC       { @_;           }
 
@@ -149,22 +149,24 @@ sub ::public_label
 {   push(@out,".globl\t".&::LABEL($_[0],$nmdecor.$_[0])."\n");   }
 
 sub ::file_end
-{   if (grep {/\b${nmdecor}OPENSSL_ia32cap_P\b/i} @out) {
-        my $tmp=".comm\t${nmdecor}OPENSSL_ia32cap_P,4";
-        if ($::elf)     { push (@out,"$tmp,4\n"); }
-        else            { push (@out,"$tmp\n"); }
-    }
-    if ($::macosx)
+{   if ($::macosx)
     {   if (%non_lazy_ptr)
         {   push(@out,".section __IMPORT,__pointers,non_lazy_symbol_pointers\n");
             foreach $i (keys %non_lazy_ptr)
             {   push(@out,"$non_lazy_ptr{$i}:\n.indirect_symbol\t$i\n.long\t0\n");   }
         }
     }
+    if (grep {/\b${nmdecor}OPENSSL_ia32cap_P\b/i} @out) {
+        my $tmp=".comm\t${nmdecor}OPENSSL_ia32cap_P,8";
+        if ($::macosx)  { push (@out,"$tmp,2\n"); }
+        elsif ($::elf)  { push (@out,"$tmp,4\n"); }
+        else            { push (@out,"$tmp\n"); }
+    }
     push(@out,$initseg) if ($initseg);
 }
 
 sub ::data_byte {   push(@out,".byte\t".join(',',@_)."\n");   }
+sub ::data_short{   push(@out,".value\t".join(',',@_)."\n");  }
 sub ::data_word {   push(@out,".long\t".join(',',@_)."\n");   }
 
 sub ::align
@@ -180,7 +182,7 @@ sub ::align
 sub ::picmeup
 { my($dst,$sym,$base,$reflabel)=@_;
 
-    if ($::pic && ($::elf || $::aout))
+    if (($::pic && ($::elf || $::aout)) || $::macosx)
     {   if (!defined($base))
         {   &::call(&::label("PIC_me_up"));
             &::set_label("PIC_me_up");
@@ -206,13 +208,17 @@ sub ::picmeup
 sub ::initseg
 { my $f=$nmdecor.shift;
 
-    if ($::elf)
+    if ($::android)
+    {   $initseg.=<<___;
+.section        .init_array
+.align  4
+.long   $f
+___
+    }
+    elsif ($::elf)
     {   $initseg.=<<___;
 .section        .init
         call    $f
-        jmp     .Linitalign
-.align  $align
-.Linitalign:
 ___
     }
     elsif ($::coff)