X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util%2Fpl%2Funix.pl;h=df4de71f5067f872ed625fe972c666145081930f;hb=c436e05bdc7f49985a750df64122c960240b3ae1;hp=b76981dc55d1bee5ccd213b8ebdd9c59037d93fe;hpb=342ec250c34ba854eb2a9803c5401972fcecc13d;p=oweals%2Fopenssl.git

diff --git a/util/pl/unix.pl b/util/pl/unix.pl
index b76981dc55..df4de71f50 100644
--- 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',
@@ -70,7 +69,16 @@ $bf_enc_src="";
 	  'rc4-x86_64' => 'crypto/rc4',
 	  'rc4-md5-x86_64' => 'crypto/rc4',
 	  'ghash-x86_64' => 'crypto/modes',
-          'aesni-gcm-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
@@ -81,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";
@@ -129,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;
@@ -393,6 +404,9 @@ sub get_tests
 		 'testrsa.pem',
 		 'testsid.pem',
 		 'testss',
+		 'testssl',
+		 'testsslproxy',
+		 'serverinfo.pem',
 	       );
   my $copies = copy_scripts(1, 'test', @copies);
   $copies .= copy_scripts(0, 'test', ('smcont.txt'));
@@ -404,6 +418,7 @@ sub get_tests
 
   my @apps = ( 'CA.sh',
 	       'openssl.cnf',
+	       'server2.pem',
 	     );
   $copies .= copy_scripts(1, 'apps', @apps);