From: Ben Laurie <ben@links.org>
Date: Sat, 4 Oct 2014 21:58:13 +0000 (+0100)
Subject: Fix single makefile.
X-Git-Tag: OpenSSL_1_0_2-pre-reformat~166
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f58cfe0422bc8a9bbeee3b9e3794df347a43d001;p=thirdparty%2Fopenssl.git

Fix single makefile.

Reviewed-by: Geoffrey Thorpe <geoff@geoffthorpe.net>
---

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 24302e12ea0..be7d383f567 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -52,6 +52,7 @@ my %mf_import = (
         ENGINES_ASM_OBJ=> \$mf_engines_asm,
 	BASEADDR       => \$baseaddr,
 	FIPSDIR        => \$fipsdir,
+	EC_ASM	       => \$mf_ec_asm,
 );
 
 open(IN,"<Makefile") || die "unable to open Makefile!\n";
@@ -730,6 +731,7 @@ if ($orig_platform eq 'copy') {
 	$lib_obj{CRYPTO} .= fix_asm($mf_engines_asm, 'engines');
 	$lib_obj{CRYPTO} .= fix_asm($mf_rc4_asm, 'crypto/rc4');
 	$lib_obj{CRYPTO} .= fix_asm($mf_modes_asm, 'crypto/modes');
+	$lib_obj{CRYPTO} .= fix_asm($mf_ec_asm, 'crypto/ec');
 }
 
 foreach (values %lib_nam)
diff --git a/util/pl/unix.pl b/util/pl/unix.pl
index 7b6162e2375..82f1aa76e86 100644
--- a/util/pl/unix.pl
+++ b/util/pl/unix.pl
@@ -77,6 +77,7 @@ $bf_enc_src="";
 	  'aesni-mb-x86_64' => 'crypto/aes',
 	  'sha1-mb-x86_64' => 'crypto/sha',
 	  'sha256-mb-x86_64' => 'crypto/sha',
+	  'ecp_nistz256-x86_64' => 'crypto/ec',
          );
 
 # If I were feeling more clever, these could probably be extracted