Help libzrtp build without ECC files

More build system work may be needed.

diff --git a/include/zrtp_config_user.h b/include/zrtp_config_user.h
index c87a6c790eef3931801d042c76fd564aa038443e..352770eaa47283815a37cf226d7f23adc73c9e92 100644 (file)
--- a/include/zrtp_config_user.h
+++ b/include/zrtp_config_user.h
@@ -123,7 +123,7 @@
 #endif
 
 #ifndef ZRTP_ENABLE_EC
-#define ZRTP_ENABLE_EC                         1
+#define ZRTP_ENABLE_EC                         0
 #endif
 
 #ifndef ZRTP_DEBUG_WITH_PJSIP

diff --git a/projects/win/libzrtp.vcproj b/projects/win/libzrtp.vcproj
index 485bd2f02d527932ab8528e81422a5d661332ea0..38fd62fbb47e31214be90eb9785a0c3f64079a20 100644 (file)
--- a/projects/win/libzrtp.vcproj
+++ b/projects/win/libzrtp.vcproj
@@ -43,7 +43,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="../../include;../../third_party/bnlib;../../third_party/bgaes;../../test/include"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H=1;ZRTP_ENABLE_EC=1"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H=1;ZRTP_ENABLE_EC=0"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
@@ -109,7 +109,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="../../include;../../third_party/bnlib;../../third_party/bgaes"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H=1;ZRTP_ENABLE_EC=1"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H=1;ZRTP_ENABLE_EC=0"\r
                                ExceptionHandling="0"\r
                                RuntimeLibrary="0"\r
                                StructMemberAlignment="0"\r
@@ -180,10 +180,6 @@
                                RelativePath="..\..\include\zrtp_crypto.h"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\include\zrtp_ec.h"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\include\zrtp_engine.h"\r
                                >\r
@@ -248,10 +244,6 @@
                                RelativePath="..\..\include\zrtp_utils.h"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\include\zrtp_version.h"\r
-                               >\r
-                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="src"\r
@@ -272,14 +264,6 @@
                                RelativePath="..\..\src\zrtp_crypto_atl.c"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\src\zrtp_crypto_ec.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\zrtp_crypto_ecdh.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\src\zrtp_crypto_hash.c"\r
                                >\r

diff --git a/projects/win_ce/libzrtp_wince.vcproj b/projects/win_ce/libzrtp_wince.vcproj
index cbe4fb4389fe411b32cf066805faecd51cdd01cc..d16b5559d6078dd489632d2503f96537a545496b 100644 (file)
--- a/projects/win_ce/libzrtp_wince.vcproj
+++ b/projects/win_ce/libzrtp_wince.vcproj
@@ -52,7 +52,7 @@
                                ExecutionBucket="7"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="../../third_party/bnlib;../../include;../../include/enterprise;../../third_party/bgaes;../../test/include"\r
-                               PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;ZRTP_ENABLE_EC=1"\r
+                               PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;ZRTP_ENABLE_EC=0"\r
                                MinimalRebuild="true"\r
                                RuntimeLibrary="1"\r
                                StructMemberAlignment="0"\r
@@ -136,7 +136,7 @@
                                ExecutionBucket="7"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="../../third_party/bnlib;../../include;../../include/enterprise;../../third_party/bgaes;../../test/include"\r
-                               PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;ZRTP_ENABLE_EC=1"\r
+                               PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;ZRTP_ENABLE_EC=0"\r
                                MinimalRebuild="true"\r
                                RuntimeLibrary="1"\r
                                BufferSecurityCheck="false"\r
@@ -219,7 +219,7 @@
                                ExecutionBucket="7"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="../../third_party/bnlib;../../include;../../include/enterprise;../../third_party/bgaes;../../test/include"\r
-                               PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;ZRTP_ENABLE_EC=1"\r
+                               PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;ZRTP_ENABLE_EC=0"\r
                                RuntimeLibrary="0"\r
                                BufferSecurityCheck="false"\r
                                UsePrecompiledHeader="0"\r
@@ -300,7 +300,7 @@
                                ExecutionBucket="7"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="../../third_party/bnlib;../../include;../../include/enterprise;../../third_party/bgaes;../../test/include"\r
-                               PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;ZRTP_ENABLE_EC=1"\r
+                               PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;ZRTP_ENABLE_EC=0"\r
                                RuntimeLibrary="0"\r
                                BufferSecurityCheck="false"\r
                                UsePrecompiledHeader="0"\r
@@ -382,10 +382,6 @@
                                RelativePath="..\..\include\zrtp_crypto.h"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\include\zrtp_ec.h"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\include\zrtp_engine.h"\r
                                >\r
@@ -466,18 +462,6 @@
                                RelativePath="..\..\src\zrtp_crypto_atl.c"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\src\zrtp_crypto_ec.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\zrtp_crypto_ecdh.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\zrtp_crypto_ecdsa.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\src\zrtp_crypto_hash.c"\r
                                >\r
@@ -498,10 +482,6 @@
                                RelativePath="..\..\src\zrtp_engine.c"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\src\zrtp_engine_driven.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\src\zrtp_iface_cache.c"\r
                                >\r

diff --git a/projects/win_kernel/MAKEFILE.WIN32 b/projects/win_kernel/MAKEFILE.WIN32
index 8a1a5e2802af072f5bbd0a285d30f65e68674f15..e44b9559338a2521c01c628d043ac6d4146d6cc9 100644 (file)
--- a/projects/win_kernel/MAKEFILE.WIN32
+++ b/projects/win_kernel/MAKEFILE.WIN32
@@ -43,9 +43,6 @@ protocol = \
                ../../src/zrtp_crypto_sas.obj \\r
                ../../src/zrtp_datatypes.obj \\r
                ../../src/zrtp_engine.obj \\r
-               ../../src/enterprise/zrtp_engine_driven.obj \\r
-               ../../src/enterprise/zrtp_crypto_ec.obj  \\r
-               ../../src/enterprise/zrtp_crypto_ecdh.obj  \\r
                ../../src/zrtp_iface_sys.obj \\r
                ../../src/zrtp_initiator.obj \\r
                ../../src/zrtp_legal.obj \\r
@@ -74,13 +71,13 @@ OBJECTS  = $(bnlib) $(protocol) $(bgaes)
 \r
 # Debug\r
 \r
-OUT_DIR = debug_ec.km\r
+OUT_DIR = debug.km\r
 \r
 DEFINES_D = -D_X86_=1 -Di386=1 -DSTD_CALL -DCONDITION_HANDLING=1 \\r
 -DNT_UP=1 -DNT_INST=0 -DWIN32=100 -D_NT1X_=100 \\r
 -DWINNT=1 -D_WIN32_WINNT=0x0500 -DWIN32_LEAN_AND_MEAN=1 -DDBG=1 -D_DEBUG -DDEBUG -DDEVL=1 \\r
 -DFPO=0 -D_DLL=1 -D_IDWBUILD -DRDRDBG -DSRVDBG -DDBG_MESSAGES=1 \\r
--D_UNICODE -DLITTLE_ENDIAN -DZRTP_USE_ENTERPRISE=1\r
+-D_UNICODE -DLITTLE_ENDIAN -DZRTP_USE_ENTERPRISE=0\r
 \r
 CFLAGS_D = $(DEFINES_D) -Zel -Zp8 -Gy -cbstring -Gz -QIfdiv- -QIf -Gi- -Gm- -GX- \\r
 -GR- -GF -FI$(DDK)\inc\$(OS)\warning.h -Z7 -Od -Oi -Oy- -W3\r
@@ -89,13 +86,13 @@ CFLAGS_D = $(DEFINES_D) -Zel -Zp8 -Gy -cbstring -Gz -QIfdiv- -QIf -Gi- -Gm- -GX-
 \r
 # Release\r
 \r
-OUT_DIR = release_ec.km\r
+OUT_DIR = release.km\r
 \r
 DEFINES_D = -D_X86_=1 -Di386=1 -DSTD_CALL -DCONDITION_HANDLING=1 \\r
 -DNT_UP=1 -DNO_DISK_ACCESS -DNT_INST=0 -DWIN32=100 -D_NT1X_=100 \\r
 -DWINNT=1 -D_WIN32_WINNT=0x0500 -DWIN32_LEAN_AND_MEAN=1 -DDEVL=1 \\r
 -DFPO=1 -DNDEBUG -D_DLL=1 -D_IDWBUILD -D_UNICODE \\r
--DLITTLE_ENDIAN -DZRTP_USE_ENTERPRISE=1\r
+-DLITTLE_ENDIAN  -DZRTP_USE_ENTERPRISE=0\r
 \r
 CFLAGS_D = $(DEFINES_D) -Zel -Zp8 -Gy -cbstring -Gz -QIfdiv- -QIf -Gi- -Gm- -GX- \\r
 -GR- -GF -Oxs -Oy -FI$(DDK)\inc\$(OS)\warning.h -W3 -FAcs -Z7\r
@@ -108,6 +105,7 @@ AINCLUDE = -I. -I$(DDK)\inc
 \r
 CFLAGS = $(CFLAGS_D) -nologo -DHAVE_CONFIG_H=1 -DNT_DRIVER -D__BUILDMACHINE__=WinDDK \\r
        -I$(DDK)\inc\$(OS) -I$(DDK)\inc\ddk\$(OS)  -I$(DDK)\inc\ddk\wdm\$(OS) \\r
+       -I. -Ibnlib -Iinclude \\r
        -I$(DDK)\inc\crt -I..\..\third_party\bnlib\config -I..\..\third_party\bnlib \\r
        -I..\..\third_party\bgaes -I..\..\test\include -I..\..\include -I..\..\include\enterprise\r
 \r

diff --git a/projects/win_kernel/MAKEFILE.WIN64 b/projects/win_kernel/MAKEFILE.WIN64
index ad8a4297eb8a6840d6edc5937181b57dc636d0ce..52a1cb7e4d7f433120ad99b997db28a88dbc6eef 100644 (file)
--- a/projects/win_kernel/MAKEFILE.WIN64
+++ b/projects/win_kernel/MAKEFILE.WIN64
@@ -44,9 +44,6 @@ protocol = \
                ../../src/zrtp_crypto_sas.obj \\r
                ../../src/zrtp_datatypes.obj \\r
                ../../src/zrtp_engine.obj \\r
-               ../../src/enterprise/zrtp_engine_driven.obj \\r
-               ../../src/enterprise/zrtp_crypto_ec.obj  \\r
-               ../../src/enterprise/zrtp_crypto_ecdh.obj  \\r
                ../../src/zrtp_iface_sys.obj \\r
                ../../src/zrtp_initiator.obj \\r
                ../../src/zrtp_legal.obj \\r
@@ -69,21 +66,20 @@ bgaes      = \
                ../../third_party/bgaes/sha1.obj \\r
                ../../third_party/bgaes/sha2.obj\r
 \r
-\r
 OBJECTS  = $(bnlib) $(protocol) $(bgaes) \r
 \r
 !IFNDEF RELEASE\r
 \r
 # Debug\r
 \r
-OUT_DIR = debug64_ec.km\r
+OUT_DIR = debug64.km\r
 \r
 DEFINES_D = -DWIN64=1 -D_WIN64=1 -D_AMD64_=1 -D_M_AMD64 -D_WINDOWS \\r
 -DSTD_CALL -DCONDITION_HANDLING=1 \\r
 -DNT_UP=1 -DNT_INST=0 -D_NT1X_=100 \\r
 -DWINNT=1 -D_WIN32_WINNT=0x0500 -DWIN32_LEAN_AND_MEAN=1 -DDBG=1 -D_DEBUG -DDEBUG -DDEVL=1 \\r
 -DFPO=0 -D_DLL=1 -D_IDWBUILD -DRDRDBG -DSRVDBG -DDBG_MESSAGES=1 \\r
--D_UNICODE -DLITTLE_ENDIAN -DZRTP_USE_ENTERPRISE=1\r
+-D_UNICODE -DLITTLE_ENDIAN -DZRTP_USE_ENTERPRISE=0\r
 \r
 CFLAGS_D = $(DEFINES_D) -Zp8 -Gy -cbstring -Gz -Gm- -EHs-c- \\r
 -GR- -GF -FI$(DDK)\inc\$(OS)\warning.h -Z7 -Od -Oi -Oy- -W3\r
@@ -92,14 +88,14 @@ CFLAGS_D = $(DEFINES_D) -Zp8 -Gy -cbstring -Gz -Gm- -EHs-c- \
 \r
 # Release\r
 \r
-OUT_DIR = release64_ec.km\r
+OUT_DIR = release64.km\r
 \r
 DEFINES_D = -DWIN64=1 -D_WIN64=1 -D_AMD64_=1 -D_M_AMD64 -D_WINDOWS \\r
 -DSTD_CALL -DCONDITION_HANDLING=1 \\r
 -DNT_UP=1 -DNO_DISK_ACCESS -DNT_INST=0 -DWIN32=100 -D_NT1X_=100 \\r
 -DWINNT=1 -D_WIN32_WINNT=0x0500 -DWIN32_LEAN_AND_MEAN=1 -DDEVL=1 \\r
 -DFPO=1 -DNDEBUG -D_DLL=1 -D_IDWBUILD -D_UNICODE \\r
--DLITTLE_ENDIAN -DZRTP_USE_ENTERPRISE=1\r
+-DLITTLE_ENDIAN  -DZRTP_USE_ENTERPRISE=0\r
 \r
 CFLAGS_D = $(DEFINES_D) -Zel -Zp8 -Gy -cbstring -Gz -QIfdiv- -QIf -Gi- -Gm- -GX- \\r
 -GR- -GF -Oxs -Oy -FI$(DDK)\inc\$(OS)\warning.h -W3 -FAcs -Z7\r