merge with head of branch

cmake_targets/CMakeLists.txt

@@ -1662,18 +1662,6 @@ endif()
 
 message ("NETTLE VERSION_INSTALLED  = ${NETTLE_VERSION}")
 
-string(REGEX REPLACE "([0-9]+).*" "\\1" NETTLE_VERSION_MAJOR ${NETTLE_VERSION})
-string(REGEX REPLACE "[0-9]+\\.([0-9]+).*" "\\1" NETTLE_VERSION_MINOR ${NETTLE_VERSION})
-message ("NETTLE_VERSION_MAJOR = ${NETTLE_VERSION_MAJOR}")
-message ("NETTLE_VERSION_MINOR = ${NETTLE_VERSION_MINOR}")
-
-if ("${NETTLE_VERSION_MAJOR}" STREQUAL "" OR "${NETTLE_VERSION_MINOR}" STREQUAL "")
-  message( FATAL_ERROR "The nettle version not detected properly. Try to run build_oai -I again" )
-endif()
-
-add_definitions("-DNETTLE_VERSION_MAJOR=${NETTLE_VERSION_MAJOR}")
-add_definitions("-DNETTLE_VERSION_MINOR=${NETTLE_VERSION_MINOR}")
-
 pkg_search_module(XPM xpm)
 if(NOT ${XPM_FOUND})
   message("PACKAGE xpm not found: some targets will fail")

common/utils/T/T.h

@@ -188,12 +188,6 @@ extern T_cache_t *T_cache;
 
 #define T_HEADER(x) \
   do { \
-    if (!__builtin_types_compatible_p(typeof(x), struct T_header *)) { \
-      printf("%s:%d:%s: " \
-             "bad use of T, pass a message ID as first parameter\n", \
-             __FILE__, __LINE__, __FUNCTION__); \
-      abort(); \
-    } \
     struct timespec T_HEADER_time; \
     if (clock_gettime(CLOCK_REALTIME, &T_HEADER_time)) abort(); \
     memcpy(T_LOCAL_buf, &T_HEADER_time, sizeof(struct timespec)); \
@@ -205,12 +199,6 @@ extern T_cache_t *T_cache;
 
 #define T_HEADER(x) \
   do { \
-    if (!__builtin_types_compatible_p(typeof(x), struct T_header *)) { \
-      printf("%s:%d:%s: " \
-             "bad use of T, pass a message ID as first parameter\n", \
-             __FILE__, __LINE__, __FUNCTION__); \
-      abort(); \
-    } \
     T_PUT_int(1, (int)(uintptr_t)(x)); \
   } while (0)
 

openair2/UTIL/OSA/osa_stream_eea.c

@@ -192,7 +192,7 @@ int stream_encrypt_eea2(stream_cipher_t *stream_cipher, uint8_t **out)
   }
 #endif
 
-#if NETTLE_VERSION_MAJOR < 3
+#if !defined(NETTLE_VERSION_MAJOR) || NETTLE_VERSION_MAJOR < 3
   nettle_aes128.set_encrypt_key(ctx, stream_cipher->key_length,
                                 stream_cipher->key);
 #else

openair3/SECU/nas_stream_eea2.c

@@ -27,6 +27,7 @@
 #include <nettle/nettle-meta.h>
 #include <nettle/aes.h>
 #include <nettle/ctr.h>
+#include <nettle/bignum.h>
 
 #include "assertions.h"
 #include "conversions.h"
@@ -78,7 +79,7 @@ int nas_stream_encrypt_eea2(nas_stream_cipher_t *stream_cipher, uint8_t *out)
   }
 #endif
 
-#if NETTLE_VERSION_MAJOR < 3
+#if !defined(NETTLE_VERSION_MAJOR) || NETTLE_VERSION_MAJOR < 3
   nettle_aes128.set_encrypt_key(ctx, stream_cipher->key_length,
                                 stream_cipher->key);
 #else

openair3/TEST/test_aes128_ctr_decrypt.c

@@ -31,6 +31,7 @@
 #include <nettle/nettle-meta.h>
 #include <nettle/aes.h>
 #include <nettle/ctr.h>
+#include <nettle/bignum.h>
 
 static
 void test_uncipher_ctr(const struct nettle_cipher *cipher, const uint8_t *key,
@@ -41,7 +42,7 @@ void test_uncipher_ctr(const struct nettle_cipher *cipher, const uint8_t *key,
   uint8_t *data = malloc(length);
   uint8_t *ctr = malloc(cipher->block_size);
 
-#if NETTLE_VERSION_MAJOR < 3
+#if !defined(NETTLE_VERSION_MAJOR) || NETTLE_VERSION_MAJOR < 3
   cipher->set_encrypt_key(ctx, key_length,  key);
 #else
   cipher->set_encrypt_key(ctx,  key);