Fix single makefile.

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

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 66ff994852f2a06fe9125ddc6e38c92c40271d30..2495e6006a850917468d296fcc8675dfde045373 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -67,7 +67,8 @@ my %mf_import = (
        MODES_ASM_OBJ  => \$mf_modes_asm,
         ENGINES_ASM_OBJ=> \$mf_engines_asm,
        FIPSCANISTERONLY  => \$mf_fipscanisteronly,
        MODES_ASM_OBJ  => \$mf_modes_asm,
         ENGINES_ASM_OBJ=> \$mf_engines_asm,
        FIPSCANISTERONLY  => \$mf_fipscanisteronly,

-       FIPSCANISTERINTERNAL  => \$mf_fipscanisterinternal
+       FIPSCANISTERINTERNAL  => \$mf_fipscanisterinternal,
+       EC_ASM         => \$mf_ec_asm,

 );
 
 open(IN,"<Makefile") || die "unable to open Makefile!\n";
 );
 
 open(IN,"<Makefile") || die "unable to open Makefile!\n";


@@ -911,6 +912,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_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)
 }
 
 foreach (values %lib_nam)

diff --git a/util/pl/unix.pl b/util/pl/unix.pl
index dbe8fc2ed28e9193a3b47639742a58d97b812424..aee4e1db24515ea775dac7dc5cd27c30764e4ad2 100644 (file)
--- 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',
          '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
          );
 
 # If I were feeling more clever, these could probably be extracted