From 74586c6508e5dd283eaef9d098644a7800beec01 Mon Sep 17 00:00:00 2001 From: Steffan Karger Date: Sun, 17 Apr 2016 20:35:43 +0200 Subject: [PATCH] Rename files with 'polarssl' in the name to 'mbedtls' The patch looks huge, but it's just file renames, and required changes in includes / Makefiles. Use 'git diff -C' or a tool like gitk to easily review this patch. Signed-off-by: Steffan Karger Acked-by: Arne Schwabe Message-Id: <1460918143-408-2-git-send-email-steffan@karger.me> URL: http://article.gmane.org/gmane.network.openvpn.devel/11459 Signed-off-by: Gert Doering --- src/openvpn/Makefile.am | 8 ++++---- src/openvpn/crypto_backend.h | 2 +- src/openvpn/{crypto_polarssl.c => crypto_mbedtls.c} | 0 src/openvpn/{crypto_polarssl.h => crypto_mbedtls.h} | 0 src/openvpn/{pkcs11_polarssl.c => pkcs11_mbedtls.c} | 0 src/openvpn/plugin.h | 2 +- src/openvpn/ssl_backend.h | 4 ++-- src/openvpn/{ssl_polarssl.c => ssl_mbedtls.c} | 2 +- src/openvpn/{ssl_polarssl.h => ssl_mbedtls.h} | 0 src/openvpn/ssl_verify.h | 2 +- .../{ssl_verify_polarssl.c => ssl_verify_mbedtls.c} | 2 +- .../{ssl_verify_polarssl.h => ssl_verify_mbedtls.h} | 0 12 files changed, 11 insertions(+), 11 deletions(-) rename src/openvpn/{crypto_polarssl.c => crypto_mbedtls.c} (100%) rename src/openvpn/{crypto_polarssl.h => crypto_mbedtls.h} (100%) rename src/openvpn/{pkcs11_polarssl.c => pkcs11_mbedtls.c} (100%) rename src/openvpn/{ssl_polarssl.c => ssl_mbedtls.c} (99%) rename src/openvpn/{ssl_polarssl.h => ssl_mbedtls.h} (100%) rename src/openvpn/{ssl_verify_polarssl.c => ssl_verify_mbedtls.c} (99%) rename src/openvpn/{ssl_verify_polarssl.h => ssl_verify_mbedtls.h} (100%) diff --git a/src/openvpn/Makefile.am b/src/openvpn/Makefile.am index bf1d749da..9d4bf6182 100644 --- a/src/openvpn/Makefile.am +++ b/src/openvpn/Makefile.am @@ -46,7 +46,7 @@ openvpn_SOURCES = \ comp-lz4.c comp-lz4.h \ crypto.c crypto.h crypto_backend.h \ crypto_openssl.c crypto_openssl.h \ - crypto_polarssl.c crypto_polarssl.h \ + crypto_mbedtls.c crypto_mbedtls.h \ dhcp.c dhcp.h \ errlevel.h \ error.c error.h \ @@ -80,7 +80,7 @@ openvpn_SOURCES = \ occ.c occ.h occ-inline.h \ pkcs11.c pkcs11.h pkcs11_backend.h \ pkcs11_openssl.c \ - pkcs11_polarssl.c \ + pkcs11_mbedtls.c \ openvpn.c openvpn.h \ options.c options.h \ otime.c otime.h \ @@ -105,11 +105,11 @@ openvpn_SOURCES = \ socks.c socks.h \ ssl.c ssl.h ssl_backend.h \ ssl_openssl.c ssl_openssl.h \ - ssl_polarssl.c ssl_polarssl.h \ + ssl_mbedtls.c ssl_mbedtls.h \ ssl_common.h \ ssl_verify.c ssl_verify.h ssl_verify_backend.h \ ssl_verify_openssl.c ssl_verify_openssl.h \ - ssl_verify_polarssl.c ssl_verify_polarssl.h \ + ssl_verify_mbedtls.c ssl_verify_mbedtls.h \ status.c status.h \ syshead.h \ tun.c tun.h \ diff --git a/src/openvpn/crypto_backend.h b/src/openvpn/crypto_backend.h index c4986f558..3893f1402 100644 --- a/src/openvpn/crypto_backend.h +++ b/src/openvpn/crypto_backend.h @@ -34,7 +34,7 @@ #include "crypto_openssl.h" #endif #ifdef ENABLE_CRYPTO_MBEDTLS -#include "crypto_polarssl.h" +#include "crypto_mbedtls.h" #endif #include "basic.h" diff --git a/src/openvpn/crypto_polarssl.c b/src/openvpn/crypto_mbedtls.c similarity index 100% rename from src/openvpn/crypto_polarssl.c rename to src/openvpn/crypto_mbedtls.c diff --git a/src/openvpn/crypto_polarssl.h b/src/openvpn/crypto_mbedtls.h similarity index 100% rename from src/openvpn/crypto_polarssl.h rename to src/openvpn/crypto_mbedtls.h diff --git a/src/openvpn/pkcs11_polarssl.c b/src/openvpn/pkcs11_mbedtls.c similarity index 100% rename from src/openvpn/pkcs11_polarssl.c rename to src/openvpn/pkcs11_mbedtls.c diff --git a/src/openvpn/plugin.h b/src/openvpn/plugin.h index 74ac8b1e5..3c010476a 100644 --- a/src/openvpn/plugin.h +++ b/src/openvpn/plugin.h @@ -33,7 +33,7 @@ #include "ssl_verify_openssl.h" #endif #ifdef ENABLE_CRYPTO_MBEDTLS -#include "ssl_verify_polarssl.h" +#include "ssl_verify_mbedtls.h" #endif #include "openvpn-plugin.h" diff --git a/src/openvpn/ssl_backend.h b/src/openvpn/ssl_backend.h index dfccb4472..542c373d6 100644 --- a/src/openvpn/ssl_backend.h +++ b/src/openvpn/ssl_backend.h @@ -39,8 +39,8 @@ #define SSLAPI SSLAPI_OPENSSL #endif #ifdef ENABLE_CRYPTO_MBEDTLS -#include "ssl_polarssl.h" -#include "ssl_verify_polarssl.h" +#include "ssl_mbedtls.h" +#include "ssl_verify_mbedtls.h" #define SSLAPI SSLAPI_MBEDTLS #endif diff --git a/src/openvpn/ssl_polarssl.c b/src/openvpn/ssl_mbedtls.c similarity index 99% rename from src/openvpn/ssl_polarssl.c rename to src/openvpn/ssl_mbedtls.c index 483ec1cd3..9da33adfe 100644 --- a/src/openvpn/ssl_polarssl.c +++ b/src/openvpn/ssl_mbedtls.c @@ -48,7 +48,7 @@ #include -#include "ssl_verify_polarssl.h" +#include "ssl_verify_mbedtls.h" #include #include #include diff --git a/src/openvpn/ssl_polarssl.h b/src/openvpn/ssl_mbedtls.h similarity index 100% rename from src/openvpn/ssl_polarssl.h rename to src/openvpn/ssl_mbedtls.h diff --git a/src/openvpn/ssl_verify.h b/src/openvpn/ssl_verify.h index 5eb184352..f693b2a48 100644 --- a/src/openvpn/ssl_verify.h +++ b/src/openvpn/ssl_verify.h @@ -41,7 +41,7 @@ #include "ssl_verify_openssl.h" #endif #ifdef ENABLE_CRYPTO_MBEDTLS -#include "ssl_verify_polarssl.h" +#include "ssl_verify_mbedtls.h" #endif #include "ssl_verify_backend.h" diff --git a/src/openvpn/ssl_verify_polarssl.c b/src/openvpn/ssl_verify_mbedtls.c similarity index 99% rename from src/openvpn/ssl_verify_polarssl.c rename to src/openvpn/ssl_verify_mbedtls.c index ff76d3d38..ffe196ec0 100644 --- a/src/openvpn/ssl_verify_polarssl.c +++ b/src/openvpn/ssl_verify_mbedtls.c @@ -37,7 +37,7 @@ #if defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_MBEDTLS) -#include "crypto_polarssl.h" +#include "crypto_mbedtls.h" #include "ssl_verify.h" #include #include diff --git a/src/openvpn/ssl_verify_polarssl.h b/src/openvpn/ssl_verify_mbedtls.h similarity index 100% rename from src/openvpn/ssl_verify_polarssl.h rename to src/openvpn/ssl_verify_mbedtls.h -- 2.47.3