Make sure ec and ecdsa is properly handled in Windows.

Notified by Bernd Matthes <bernd.matthes@gemplus.com>

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index fdaf642c654bfd57a08f8483c260f32ac4b94470..1f8b839e41cbefb38fee9047a2e4fd27a3eb2d7b 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -62,6 +62,8 @@ and [options] can be one of
        just-ssl                                - remove all non-ssl keys/digest
        no-asm                                  - No x86 asm
        no-krb5                                 - No KRB5
        just-ssl                                - remove all non-ssl keys/digest
        no-asm                                  - No x86 asm
        no-krb5                                 - No KRB5

+       no-ec                                   - No EC
+       no-ecdsa                                - No ECDSA

        nasm                                    - Use NASM for x86 asm
        gaswin                                  - Use GNU as with Mingw32
        no-socks                                - No socket code
        nasm                                    - Use NASM for x86 asm
        gaswin                                  - Use GNU as with Mingw32
        no-socks                                - No socket code


@@ -224,7 +226,9 @@ $cflags.=" -DOPENSSL_NO_SOCK" if $no_sock;
 $cflags.=" -DOPENSSL_NO_SSL2" if $no_ssl2;
 $cflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3;
 $cflags.=" -DOPENSSL_NO_ERR"  if $no_err;
 $cflags.=" -DOPENSSL_NO_SSL2" if $no_ssl2;
 $cflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3;
 $cflags.=" -DOPENSSL_NO_ERR"  if $no_err;

-$cflags.=" -DOPENSSL_NO_KRB5"  if $no_krb5;
+$cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5;
+$cflags.=" -DOPENSSL_NO_EC"   if $no_ec;
+$cflags.=" -DOPENSSL_NO_ECDSA" if $no_ecdsa;

 #$cflags.=" -DRSAref"  if $rsaref ne "";
 
 ## if ($unix)
 #$cflags.=" -DRSAref"  if $rsaref ne "";
 
 ## if ($unix)


@@ -882,6 +886,8 @@ sub read_options
        elsif (/^no-err$/)      { $no_err=1; }
        elsif (/^no-sock$/)     { $no_sock=1; }
        elsif (/^no-krb5$/)     { $no_krb5=1; }
        elsif (/^no-err$/)      { $no_err=1; }
        elsif (/^no-sock$/)     { $no_sock=1; }
        elsif (/^no-krb5$/)     { $no_krb5=1; }

+       elsif (/^no-ec$/)       { $no_ec=1; }
+       elsif (/^no-ecdsa$/)    { $no_ecdsa=1; }

 
        elsif (/^just-ssl$/)    { $no_rc2=$no_idea=$no_des=$no_bf=$no_cast=1;
                                  $no_md2=$no_sha=$no_mdc2=$no_dsa=$no_dh=1;
 
        elsif (/^just-ssl$/)    { $no_rc2=$no_idea=$no_des=$no_bf=$no_cast=1;
                                  $no_md2=$no_sha=$no_mdc2=$no_dsa=$no_dh=1;

diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index 29e1404c695083d933bc35c9cc2c2f889dbf4929..0ae8695bec93a1be187f7ff759754254184a7189 100755 (executable)
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -30,6 +30,7 @@ my @dirs = (
 "crypto/dso",
 "crypto/dh",
 "crypto/ec",
 "crypto/dso",
 "crypto/dh",
 "crypto/ec",

+"crypto/ecdsa",

 "crypto/buffer",
 "crypto/bio",
 "crypto/stack",
 "crypto/buffer",
 "crypto/bio",
 "crypto/stack",