ccsrc/Protocols/IVIM/module.mk

+sources := ivim_codec.cc ivim_layer.cc ivim_pdu_codec.cc
+includes := .
+

ccsrc/Protocols/MapemSpatem/module.mk

+sources := mapem_codec.cc mapem_pdu_codec.cc mapem_spatem_layer.cc spatem_codec.cc spatem_pdu_codec.cc 
+includes := .
+

ccsrc/Protocols/Pcap/module.mk

+sources := pcap_cygwin_layer.cc pcap_layer.cc pcap_linux_layer.cc pcap_offline_layer.cc 
+includes := .
+

ccsrc/Protocols/Qualcomm/module.mk

+sources := qualcomm_layer.cc 
+includes := .
+

ccsrc/Protocols/RawSocket/module.mk

+sources := raw_socket_layer.cc 
+includes := .
+

ccsrc/Protocols/Rtcmem/module.mk

+sources := RtcmemCodec.cc RtcmemLayer.cc
+includes := .
+

ccsrc/Protocols/Security/module.mk

+sources := certificates_loader.cc \
+           etsi_ts102941_base_types_public_keys.cc \
+           etsi_ts102941_data_codec.cc \
+           etsi_ts102941_data_content_codec.cc \
+           etsi_ts102941_types_authorization_inner_request.cc \
+           etsi_ts102941_types_authorization_inner_response.cc \
+           etsi_ts102941_types_authorization_shared_at_request.cc \
+           etsi_ts102941_types_authorization_validation_request.cc \
+           etsi_ts102941_types_authorization_validation_response.cc \
+           etsi_ts102941_types_enrolment_inner_request.cc \
+           etsi_ts102941_types_enrolment_inner_response.cc \
+           etsi_ts103097_certificate_codec.cc \
+           etsi_ts103097_data_codec.cc \
+           etsi_ts103097_tobesigned_certificate_codec.cc \
+           etsi_ts103097_tobesigned_data_codec.cc \
+           hmac.cc \
+           ieee_1609dot2_base_types_public_encryption_key.cc \
+           ieee_1609dot2_base_types_public_verification_key.cc \
+           security_cache.cc \
+           security_db.cc \
+           security_db_record.cc \
+           security_ecc.cc \
+           security_services.cc \
+           sha256.cc \
+           sha384.cc 
+
+ifeq (AtsPki, $(ATS))
+sources += http_etsi_ieee1609dot2_codec.cc
+endif
+
+ifeq (AtsRSUsSimulator, $(ATS))
+sources += http_etsi_ieee1609dot2_codec.cc
+endif
+           
+includes := .
+

ccsrc/Protocols/Security/security_ecc.cc

@@ -20,6 +20,15 @@
 
 #include "loggers.hh"
 
+#if OPENSSL_VERSION_NUMBER >= 0x10101000L
+#define EC_POINT_get_affine_coordinates_GFp  EC_POINT_get_affine_coordinates
+#define EC_POINT_get_affine_coordinates_GF2m EC_POINT_get_affine_coordinates
+#define EC_POINT_set_affine_coordinates_GFp  EC_POINT_set_affine_coordinates 
+#define EC_POINT_set_affine_coordinates_GF2m EC_POINT_set_affine_coordinates 
+#define EC_POINT_set_compressed_coordinates_GFp  EC_POINT_set_compressed_coordinates 
+#define EC_POINT_set_compressed_coordinates_GF2m EC_POINT_set_compressed_coordinates 
+#endif
+
 security_ecc::security_ecc(const ec_elliptic_curves p_elliptic_curve): _elliptic_curve(p_elliptic_curve), _encryption_algotithm(encryption_algotithm::aes_128_ccm), _ec_key(nullptr), _ec_group(nullptr), _bn_ctx(nullptr), _pri_key(), _pub_key_x(), _pub_key_y(), _pub_key_compressed(), _pub_key_compressed_mode{ecc_compressed_mode::compressed_y_0}, _secret_key(), _enc_key_x(), _enc_key_y(), _sym_key(), _nonce(), _tag() {
   loggers::get_instance().log(">>> security_ecc::security_ecc: %d", static_cast<int>(p_elliptic_curve));
   

ccsrc/Protocols/SremSsem/module.mk

+sources  := SremCodec.cc SremSsemLayer.cc SsemCodec.cc 
+includes := .
+

ccsrc/Protocols/Tcp/module.mk

+sources := tcp_layer.cc 
+includes := .
+

ccsrc/Protocols/UDP/module.mk

+#sources := udp_layer.cc udp_pcap_layer.cc 
+sources := udp_layer.cc
+includes := .
+

ccsrc/Protocols/UpperTester/UpperTesterRtcmemCodec.cc

@@ -4,10 +4,7 @@
 #include "UpperTesterRtcmemCodec.hh"
 #include "loggers.hh"
 
-#include "uppertester_types.hh"
-
 #include "RtcmemCodec.hh"
-#include "SsemCodec.hh"
 
 template <typename T_type> class OPTIONAL;
 class TTCN_EncDec;

ccsrc/Protocols/UpperTester/UpperTesterRtcmemLayer.cc

 #include "UpperTesterRtcmemFactory.hh"
 
-#include "uppertester_types.hh"
+#include "LibItsRtcmem_TypesAndValues.hh"
+#include "LibItsRtcmem_TestSystem.hh"
 
 #include "loggers.hh"
 

ccsrc/Protocols/UpperTester/UpperTesterSremSsemCodec.cc

@@ -4,7 +4,8 @@
 #include "UpperTesterSremSsemCodec.hh"
 #include "loggers.hh"
 
-#include "uppertester_types.hh"
+#include "LibItsSremSsem_TypesAndValues.hh"
+#include "LibItsSremSsem_TestSystem.hh"
 
 #include "SremCodec.hh"
 #include "SsemCodec.hh"

ccsrc/Protocols/UpperTester/UpperTesterSremSsemLayer.cc

 #include "UpperTesterSremSsemFactory.hh"
 
-#include "uppertester_types.hh"
+#include "LibItsSremSsem_TypesAndValues.hh"
+#include "LibItsSremSsem_TestSystem.hh"
 
 #include "loggers.hh"
 

ccsrc/Protocols/UpperTester/module.mk

+#to be added globally
+sources += uppertester_geonetworking_codec.cc uppertester_geonetworking_layer.cc
+
+ifeq (AtsCAM, $(ATS))
+sources += uppertester_cam_codec.cc uppertester_cam_layer.cc
+endif
+#ifeq (AtsGeoNetworking, $(ATS))
+#sources += uppertester_geonetworking_codec.cc uppertester_geonetworking_layer.cc
+#endif
+ifeq (AtsIVIM, $(ATS))
+sources += uppertester_ivim_codec.cc uppertester_ivim_layer.cc
+endif
+ifeq (AtsMapemSpatem, $(ATS))
+sources += uppertester_mapem_spatem_codec.cc uppertester_mapem_spatem_layer.cc
+endif
+ifeq (AtsPki, $(ATS))
+sources += uppertester_pki_codec.cc uppertester_pki_layer.cc
+endif
+ifeq (AtsSremSsem, $(ATS))
+sources += UpperTesterSremSsemCodec.cc UpperTesterSremSsemLayer.cc
+endif
+ifeq (AtsRtcmem, $(ATS))
+sources += UpperTesterRtcmemCodec.cc UpperTesterRtcmemLayer.cc
+endif
+ifeq (AtsDENM, $(ATS))
+sources += uppertester_denm_codec.cc uppertester_denm_layer.cc
+endif
+
+ifeq (AtsSecurity, $(ATS))
+sources += uppertester_cam_codec.cc uppertester_cam_layer.cc \
+           uppertester_denm_codec.cc uppertester_denm_layer.cc \
+
+endif
+
+ifeq (AtsRSUsSimulator, $(ATS))
+sources += uppertester_cam_codec.cc uppertester_cam_layer.cc \
+           uppertester_denm_codec.cc uppertester_denm_layer.cc \
+           uppertester_ivim_codec.cc uppertester_ivim_layer.cc \
+           UpperTesterSremSsemCodec.cc UpperTesterSremSsemLayer.cc \
+           uppertester_mapem_spatem_codec.cc uppertester_mapem_spatem_layer.cc \
+           UpperTesterRtcmemCodec.cc UpperTesterRtcmemLayer.cc \
+           uppertester_pki_codec.cc uppertester_pki_layer.cc \
+
+endif
+
+
+includes := .
+
+modules += ../UDP

ccsrc/Protocols/UpperTester/uppertester_cam_codec.cc

@@ -4,7 +4,8 @@
 #include "uppertester_cam_codec.hh"
 #include "loggers.hh"
 
-#include "uppertester_types.hh"
+#include "LibItsCam_TypesAndValues.hh"
+#include "LibItsCam_TestSystem.hh"
 
 #include "cam_codec.hh"
 

ccsrc/Protocols/UpperTester/uppertester_cam_layer.cc

 #include "uppertester_cam_layer_factory.hh"
 
-#include "uppertester_types.hh"
+#include "LibItsCam_TypesAndValues.hh"
+#include "LibItsCam_TestSystem.hh"
 
 #include "loggers.hh"
 

ccsrc/Protocols/UpperTester/uppertester_denm_codec.cc

@@ -4,7 +4,8 @@
 #include "uppertester_denm_codec.hh"
 #include "loggers.hh"
 
-#include "uppertester_types.hh"
+#include "LibItsDenm_TypesAndValues.hh"
+#include "LibItsDenm_TestSystem.hh"
 
 #include "denm_codec.hh"
 

ccsrc/Protocols/UpperTester/uppertester_denm_layer.cc

 #include "uppertester_denm_layer_factory.hh"
 
-#include "uppertester_types.hh"
+#include "LibItsDenm_TypesAndValues.hh"
+#include "LibItsDenm_TestSystem.hh"
 
 #include "loggers.hh"