Adjust unixly mk1mf after introduction of tkey

[openssl.git] / util / pl / unix.pl

diff --git a/util/pl/unix.pl b/util/pl/unix.pl
index 9c258c4df7b33b862d3676eb75a1f7a6524a008e..40bbe0d84212590294aaa2b9b1ce5f0da8e3f6e2 100644 (file)
--- a/util/pl/unix.pl
+++ b/util/pl/unix.pl
@@ -59,7 +59,6 @@ $bf_enc_src="";
          'x86_64-mont' => 'crypto/bn',
          'x86_64-mont5' => 'crypto/bn',
          'x86_64-gf2m' => 'crypto/bn',
-         'modexp512-x86_64' => 'crypto/bn',
          'aes-x86_64' => 'crypto/aes',
          'vpaes-x86_64' => 'crypto/aes',
          'bsaes-x86_64' => 'crypto/aes',
@@ -72,6 +71,14 @@ $bf_enc_src="";
          'ghash-x86_64' => 'crypto/modes',
          'aesni-gcm-x86_64' => 'crypto/modes',
          'aesni-sha256-x86_64' => 'crypto/aes',
+          'rsaz-x86_64' => 'crypto/bn',
+          'rsaz-avx2' => 'crypto/bn',
+         'aesni-mb-x86_64' => 'crypto/aes',
+         'sha1-mb-x86_64' => 'crypto/sha',
+         'sha256-mb-x86_64' => 'crypto/sha',
+         'ecp_nistz256-x86_64' => 'crypto/ec',
+         'wp-x86_64' => 'crypto/whrlpool',
+         'cmll-x86_64' => 'crypto/camellia',
          );
 
 # If I were feeling more clever, these could probably be extracted
@@ -82,6 +89,9 @@ sub platform_perlasm_compile_target
 
        for $p (keys %perl1)
                {
+# FIXME: export CC so rsaz-avx2 can test for it, since BSD make does
+# not export variables, unlike GNU make. But this also requires fixing
+# the .s.o rule to use CC!
                if ($target eq "\$(OBJ_D)/$p.o")
                        {
                        return << "EOF";
@@ -130,7 +140,7 @@ sub special_compile_target
                {
                return << "EOF";
 \$(TMP_D)/x86_64-gcc.o:        crypto/bn/asm/x86_64-gcc.c
-       \$(CC) \$(CFLAGS) -c -o \$@ crypto/bn/asm/x86_64-gcc.c
+       \$(CC) \$(LIB_CFLAGS) -c -o \$@ crypto/bn/asm/x86_64-gcc.c
 EOF
                }
        return undef;
@@ -220,8 +230,8 @@ sub fixrules
   my ($str) = @_;
 
   # Compatible with -j...
-  $str =~ s/^(\s+@?)/$1cd \$(TEST_D) && /;
-  return $str;
+#  $str =~ s/^(\s+@?)/$1cd \$(TEST_D) && /;
+#  return $str;
 
   # Compatible with not -j.
   my @t = split("\n", $str);
@@ -233,11 +243,11 @@ sub fixrules
     if (!$prev)
       {
       if ($t =~ /^@/)
-       {
+        {
         $t =~ s/^@/\@cd \$(TEST_D) && /;
         }
-      elsif ($t !~ /^\s*#/)
-       {
+      elsif ($t !~ /^\s*#/ && $t !~ /^echo/)
+        {
         $t = 'cd $(TEST_D) && ' . $t;
         }
       }
@@ -383,6 +393,7 @@ sub get_tests
                 'treq',
                 'tpkcs7',
                 'tpkcs7d',
+                'tkey',
                 'testcrl.pem',
                 'testx509.pem',
                 'v3-cert1.pem',
@@ -391,7 +402,12 @@ sub get_tests
                 'testp7.pem',
                 'pkcs7-1.pem',
                 'trsa',
+                'testdsa.pem',
+                'testdsapub.pem',
+                'testec-p256.pem',
+                'testecpub-p256.pem',
                 'testrsa.pem',
+                'testrsapub.pem',
                 'testsid.pem',
                 'testss',
                 'testssl',
@@ -399,22 +415,21 @@ sub get_tests
                 'serverinfo.pem',
               );
   my $copies = copy_scripts(1, 'test', @copies);
-  $copies .= copy_scripts(0, 'test', ('smcont.txt'));
+  $copies .= copy_scripts(0, 'test', ('smcont.txt', 'evptests.txt'));
+
 
   my @utils = ( 'shlib_wrap.sh',
                'opensslwrap.sh',
              );
   $copies .= copy_scripts(1, 'util', @utils);
 
-  my @apps = ( 'CA.sh',
+  my @apps = ( 'CA.pl',
               'openssl.cnf',
               'server2.pem',
             );
   $copies .= copy_scripts(1, 'apps', @apps);
 
-  $copies .= copy_scripts(1, 'crypto/evp', ('evptests.txt'));
-
-  $scripts = "test_scripts: \$(TEST_D)/CA.sh \$(TEST_D)/opensslwrap.sh \$(TEST_D)/openssl.cnf \$(TEST_D)/shlib_wrap.sh ocsp smime\n";
+  $scripts = "test_scripts: \$(TEST_D)/CA.pl \$(TEST_D)/opensslwrap.sh \$(TEST_D)/openssl.cnf \$(TEST_D)/shlib_wrap.sh ocsp smime\n";
   $scripts .= "\nocsp:\n\tcp -R test/ocsp-tests \$(TEST_D)\n";
   $scripts .= "\smime:\n\tcp -R test/smime-certs \$(TEST_D)\n";