Omit convenience mbed TLS copy

Gbp-Pq: Name system_mbedtls_only

diff --git a/c++/src/connect/Makefile.connssl.lib b/c++/src/connect/Makefile.connssl.lib
index eeaf741377fdd41af1ea0c7f6c28b65b225aaf04..dc23a28b08d81230356ced055003dc1b88e7ae5f 100644 (file)
--- a/c++/src/connect/Makefile.connssl.lib
+++ b/c++/src/connect/Makefile.connssl.lib
@@ -2,7 +2,9 @@
 
 CPPFLAGS = $(TLS_INCLUDE) $(ORIG_CPPFLAGS)
 
-SRC_TLS  = ncbi_gnutls ncbi_mbedtls ncbi_tls \
+SRC_TLS  = ncbi_gnutls ncbi_mbedtls ncbi_tls
+
+SRC_MBEDTLS_UNUSED = \
            mbedtls/aes mbedtls/aesni mbedtls/arc4 mbedtls/asn1parse \
            mbedtls/asn1write mbedtls/base64 mbedtls/bignum mbedtls/blowfish \
            mbedtls/camellia mbedtls/ccm mbedtls/cipher mbedtls/cipher_wrap \

diff --git a/c++/src/connect/connect_misc_impl.hpp b/c++/src/connect/connect_misc_impl.hpp
index a0fad1fe7503c31d786ebfc28c905ca0f7f5c805..a68a931cab385b59e80478bca7ff137368fb6e5f 100644 (file)
--- a/c++/src/connect/connect_misc_impl.hpp
+++ b/c++/src/connect/connect_misc_impl.hpp
@@ -30,11 +30,10 @@
  *
  */
 
-#include "mbedtls/mbedtls/ncbicxx_rename_mbedtls.h"
-#include "mbedtls/mbedtls/error.h"
-#include "mbedtls/mbedtls/ctr_drbg.h"
-#include "mbedtls/mbedtls/entropy.h"
-#include "mbedtls/mbedtls/ssl.h"
+#include <mbedtls/error.h>
+#include <mbedtls/ctr_drbg.h>
+#include <mbedtls/entropy.h>
+#include <mbedtls/ssl.h>
 
 #include <corelib/ncbimisc.hpp>