Fix single makefile.
authorBen Laurie <ben@links.org>
Sat, 4 Oct 2014 21:58:13 +0000 (22:58 +0100)
committerBen Laurie <ben@links.org>
Mon, 6 Oct 2014 17:06:18 +0000 (18:06 +0100)
Reviewed-by: Geoffrey Thorpe <geoff@geoffthorpe.net>
util/mk1mf.pl
util/pl/unix.pl

index 24302e12ea05c6a54785c80f58f98823332ad521..be7d383f567f1a61eae2d7c5cd46ef5ecb1b6dd7 100755 (executable)
@@ -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)
index 7b6162e2375204d3590d2adf57a208ca3d222795..82f1aa76e8695bd739a6ca4af2e9b5ce2bd90727 100644 (file)
@@ -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