Always build with ECC support

diff --git a/libs/libzrtp/Makefile.am b/libs/libzrtp/Makefile.am
index f42a72dbe97d10378abdc1b4657e509c1be80bfa..2d3b82421da3d7972553a9e3357a7daa58193139 100644 (file)
--- a/libs/libzrtp/Makefile.am
+++ b/libs/libzrtp/Makefile.am
@@ -13,6 +13,7 @@ libzrtp_include_HEADERS = \
                                        $(top_srcdir)/include/zrtp_config_user.h \
                                        $(top_srcdir)/include/zrtp_config_unix.h \
                                        $(top_srcdir)/include/zrtp_crypto.h \
+                                       $(top_srcdir)/include/zrtp_ec.h \
                                        $(top_srcdir)/include/zrtp_engine.h \
                                        $(top_srcdir)/include/zrtp_error.h \
                                        $(top_srcdir)/include/zrtp_iface.h \
@@ -40,10 +41,6 @@ libzrtp_include_HEADERS = \
                                        $(top_srcdir)/third_party/bgaes/sha1.h \
                                        $(top_srcdir)/third_party/bgaes/sha2.h
 
-if ZRTP_BUILD_ENTERPRISE
-libzrtp_include_HEADERS += $(top_srcdir)/include/zrtp_ec.h
-endif
-
 lib_LIBRARIES = libzrtp.a
 
 libzrtp_a_CPPFLAGS = \
@@ -58,6 +55,8 @@ libzrtp_a_SOURCES = $(top_srcdir)/src/zrtp.c \
                                        $(top_srcdir)/src/zrtp_crc.c \
                                        $(top_srcdir)/src/zrtp_crypto_aes.c \
                                        $(top_srcdir)/src/zrtp_crypto_atl.c \
+                                       $(top_srcdir)/src/zrtp_crypto_ec.c \
+                                       $(top_srcdir)/src/zrtp_crypto_ecdh.c \
                                        $(top_srcdir)/src/zrtp_crypto_hash.c \
                                        $(top_srcdir)/src/zrtp_crypto_pk.c \
                                        $(top_srcdir)/src/zrtp_crypto_sas.c \
@@ -87,10 +86,6 @@ libzrtp_a_SOURCES = $(top_srcdir)/src/zrtp.c \
                                        \
                                        $(top_srcdir)/src/zrtp_iface_cache.c
                                        $(top_srcdir)/src/zrtp_engine_driven.c
-if ZRTP_BUILD_ENTERPRISE
-libzrtp_a_SOURCES +=$(top_srcdir)/src/zrtp_crypto_ec.c \
-                                       $(top_srcdir)/src/zrtp_crypto_ecdh.c
-endif
 
 check_PROGRAMS = cache_test
 

diff --git a/libs/libzrtp/configure.in b/libs/libzrtp/configure.in
index 1e637031c1fb926319f65e5fae9d4ec6f437a8f5..f6001d75154979d4703ee4e042e975ab09c4108b 100644 (file)
--- a/libs/libzrtp/configure.in
+++ b/libs/libzrtp/configure.in
@@ -49,10 +49,6 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_RANLIB
 
-# Apply configure options
-AC_ARG_ENABLE(enterprise, [  --enable-enterprise enable building of enterprise components).], enable_enterprise=$enableval,enable_enterprise="no")
-AM_CONDITIONAL(ZRTP_BUILD_ENTERPRISE, [test "x$enable_enterprise" = "xyes"])
-
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([linux/version.h endian.h])
@@ -85,13 +81,6 @@ AC_DEFINE(PRAGMA_PACK_PUSH,[#pragma pack(push, 1)],[Define pragma pack(push) for
 AC_DEFINE(PRAGMA_PACK_POP,[#pragma pack(pop)],[Define pragma pack(pop) for your platform])
 AC_DEFINE(INLINE,[static inline],[Define inline construction for your platform])
 
-if test "x$enable_enterprise" = "xyes" ; then
-       AC_DEFINE(ENABLE_EC,1,Enterprise)
-       CFLAGS="$CFLAGS -DZRTP_ENABLE_EC=1"
-fi
-
-AC_SUBST(ENABLE_EC)
-
 #
 # Documentation
 #

diff --git a/libs/libzrtp/include/zrtp.h b/libs/libzrtp/include/zrtp.h
index 185ffdfe30dbfe531ff6644296ad929d947d06f0..c2ff1c2c783e1b1fd898e1151347f5841281b48e 100644 (file)
--- a/libs/libzrtp/include/zrtp.h
+++ b/libs/libzrtp/include/zrtp.h
@@ -35,9 +35,7 @@
 #include "zrtp_legal.h"
 #include "zrtp_version.h"
 #include "zrtp_iface_cache.h"
-#if (defined(ZRTP_ENABLE_EC) && (ZRTP_ENABLE_EC == 1))
 #include "zrtp_ec.h"
-#endif
 
 
 

diff --git a/libs/libzrtp/include/zrtp_config_android.h b/libs/libzrtp/include/zrtp_config_android.h
index b13bc3f6b58e78ec978f80ad3644312c65735f58..06d379939e1cb1f6993e646c4b7f4e4dc08d7629 100644 (file)
--- a/libs/libzrtp/include/zrtp_config_android.h
+++ b/libs/libzrtp/include/zrtp_config_android.h
@@ -94,8 +94,6 @@
 #define ZRTP_USE_BUILTIN_SCEHDULER 1
 #undef ZRTP_USE_STACK_MINIM
 #define ZRTP_USE_STACK_MINIM 1
-#undef ZRTP_ENABLE_EC
-#define ZRTP_ENABLE_EC                         0
 #define ALIGNMENT_32BIT_REQUIRED
 
 #endif /* ZRTP_WIN_CONFIG_H__ */

diff --git a/libs/libzrtp/include/zrtp_config_user.h b/libs/libzrtp/include/zrtp_config_user.h
index c87a6c790eef3931801d042c76fd564aa038443e..2989878d087af8960dd83a67592d652e7b748486 100644 (file)
--- a/libs/libzrtp/include/zrtp_config_user.h
+++ b/libs/libzrtp/include/zrtp_config_user.h
@@ -122,10 +122,6 @@
 #      endif
 #endif
 
-#ifndef ZRTP_ENABLE_EC
-#define ZRTP_ENABLE_EC                         1
-#endif
-
 #ifndef ZRTP_DEBUG_WITH_PJSIP
 #define ZRTP_DEBUG_WITH_PJSIP          0
 #endif

diff --git a/libs/libzrtp/include/zrtp_crypto.h b/libs/libzrtp/include/zrtp_crypto.h
index f4ad639710452636f7ae4d9dd4df0641f72ce439..bb191bdedd83bd8dcc7b5e2fc8740a18c0a65848 100644 (file)
--- a/libs/libzrtp/include/zrtp_crypto.h
+++ b/libs/libzrtp/include/zrtp_crypto.h
@@ -15,10 +15,7 @@
 #include "zrtp_error.h"
 #include "zrtp_engine.h"
 #include "zrtp_config_user.h"
-
-#if (defined(ZRTP_ENABLE_EC) && (ZRTP_ENABLE_EC == 1))
 #include "zrtp_ec.h"
-#endif
 
 
 

diff --git a/libs/libzrtp/include/zrtp_ec.h b/libs/libzrtp/include/zrtp_ec.h
index 42e68c553fb00715d4603881746bf1be78667fe3..75497979a5eeba261c50cee0710e44c134e67520 100644 (file)
--- a/libs/libzrtp/include/zrtp_ec.h
+++ b/libs/libzrtp/include/zrtp_ec.h
@@ -14,8 +14,6 @@
 #include "zrtp_types.h"
 #include "zrtp_error.h"
 
-#if (defined(ZRTP_ENABLE_EC) && (ZRTP_ENABLE_EC == 1))
-
 #define ZRTP_MAXECBITS 521
 #define ZRTP_MAXECWORDS        ((ZRTP_MAXECBITS+7)/8)
 
@@ -80,6 +78,4 @@ int bnSquareMod_ (struct BigNum *rslt, struct BigNum *n1, struct BigNum *mod);
 }
 #endif
 
-#endif /*ZRTP_ENABLE_EC*/
-
 #endif /* __ZRTP_CRYPTO_EC_H__ */

diff --git a/libs/libzrtp/src/zrtp.c b/libs/libzrtp/src/zrtp.c
index 3842da10d4d2bfb96d3391259f5c558a6bee38ef..de630d23ef88f4fc5e8ccb47ca665c168f6a8521 100644 (file)
--- a/libs/libzrtp/src/zrtp.c
+++ b/libs/libzrtp/src/zrtp.c
@@ -802,7 +802,6 @@ void zrtp_profile_defaults(zrtp_profile_t* profile, zrtp_global_t* zrtp)
        profile->auth_tag_lens[0]       = ZRTP_ATL_HS32;
        profile->hash_schemes[0]        = ZRTP_HASH_SHA256;
 
-#if (defined(ZRTP_ENABLE_EC) && (ZRTP_ENABLE_EC == 1))
        if (zrtp && (ZRTP_LICENSE_MODE_PASSIVE == zrtp->lic_mode)) {
                profile->pk_schemes[0]          = ZRTP_PKTYPE_DH2048;
                profile->pk_schemes[1]          = ZRTP_PKTYPE_EC256P;
@@ -813,16 +812,6 @@ void zrtp_profile_defaults(zrtp_profile_t* profile, zrtp_global_t* zrtp)
                profile->pk_schemes[2]          = ZRTP_PKTYPE_DH2048;
        }
        profile->pk_schemes[3]          = ZRTP_PKTYPE_MULT;
-#else
-       if (zrtp && (ZRTP_LICENSE_MODE_PASSIVE == zrtp->lic_mode)) {
-               profile->pk_schemes[0]  = ZRTP_PKTYPE_DH2048;
-               profile->pk_schemes[1]  = ZRTP_PKTYPE_DH3072;
-       } else {
-               profile->pk_schemes[0]  = ZRTP_PKTYPE_DH3072;
-               profile->pk_schemes[1]  = ZRTP_PKTYPE_DH2048;
-       }
-       profile->pk_schemes[2]          = ZRTP_PKTYPE_MULT;
-#endif 
 }
 
 /*----------------------------------------------------------------------------*/

diff --git a/libs/libzrtp/src/zrtp_crypto_ec.c b/libs/libzrtp/src/zrtp_crypto_ec.c
index a593bc07e5e8a1439b4e44a6b5667042c246477e..6a7fd2907d1a03beabc671a18fca51d66b4ab84b 100644 (file)
--- a/libs/libzrtp/src/zrtp_crypto_ec.c
+++ b/libs/libzrtp/src/zrtp_crypto_ec.c
@@ -7,8 +7,6 @@
 
 #include "zrtp.h"
 
-#if (defined(ZRTP_ENABLE_EC) && (ZRTP_ENABLE_EC == 1))
-
 /* Size of extra random data to approximate a uniform distribution mod n */
 #define UNIFORMBYTES   8
 
@@ -461,5 +459,3 @@ zrtp_status_t zrtp_ec_init_params( struct zrtp_ec_params *params, uint32_t bits
        
        return zrtp_status_ok;
 }
-
-#endif /*ZRTP_ENABLE_EC*/

diff --git a/libs/libzrtp/src/zrtp_crypto_ecdh.c b/libs/libzrtp/src/zrtp_crypto_ecdh.c
index 96840fee29a9e26c31731ecfd7ee177a352d9b18..7a47e6c4749a8bae788b8f7fc3791042362edf9b 100644 (file)
--- a/libs/libzrtp/src/zrtp_crypto_ecdh.c
+++ b/libs/libzrtp/src/zrtp_crypto_ecdh.c
@@ -8,8 +8,6 @@
 #include "zrtp.h"
 
 
-#if (defined(ZRTP_ENABLE_EC) && (ZRTP_ENABLE_EC == 1))
-
 #define _ZTU_ "zrtp ecdh"
 
 static unsigned get_pbits(zrtp_pk_scheme_t *self)
@@ -559,5 +557,3 @@ zrtp_status_t zrtp_defaults_ec_pkt(zrtp_global_t* zrtp)
 
     return zrtp_status_ok;
 }
-
-#endif /*ZRTP_ENABLE_EC*/

diff --git a/libs/libzrtp/src/zrtp_crypto_pk.c b/libs/libzrtp/src/zrtp_crypto_pk.c
index 5961b047944517e410a84aa7a28e647bf0bf8960..4130d6cbed24ae92a46c0b0ffc7ee6c8dcdedd38 100644 (file)
--- a/libs/libzrtp/src/zrtp_crypto_pk.c
+++ b/libs/libzrtp/src/zrtp_crypto_pk.c
@@ -214,9 +214,7 @@ static zrtp_status_t zrtp_dh_self_test(zrtp_pk_scheme_t *self)
 }
 
 /*----------------------------------------------------------------------------*/
-#if (defined(ZRTP_ENABLE_EC) && (ZRTP_ENABLE_EC == 1))
 extern zrtp_status_t zrtp_defaults_ec_pkt(zrtp_global_t* zrtp);
-#endif
 
 zrtp_status_t zrtp_defaults_pkt(zrtp_global_t* zrtp)
 {
@@ -329,11 +327,7 @@ zrtp_status_t zrtp_defaults_pkt(zrtp_global_t* zrtp)
        presh->base.id                          = ZRTP_PKTYPE_PRESH;
        zrtp_comp_register(ZRTP_CC_PKT, presh,  zrtp);  
     
-#if (defined(ZRTP_ENABLE_EC) && (ZRTP_ENABLE_EC == 1))
                return zrtp_defaults_ec_pkt(zrtp);
-#else
-               return zrtp_status_ok;
-#endif
 }
 
 /*----------------------------------------------------------------------------*/