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 <steffan@karger.me>
Acked-by: Arne Schwabe <arne@rfc2549.org>
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 <gert@greenie.muc.de>

diff --git a/src/openvpn/Makefile.am b/src/openvpn/Makefile.am
index bf1d749da4f11c5d2a7a296ff8a1fb8e155501e2..9d4bf618237b062c8451ba974c9073ce82b3f79a 100644 (file)
--- 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 c4986f558e5bc8ce912d62964bcc63c42639527a..3893f140244e0408c23c5bab12e3468857a5c33a 100644 (file)
--- 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 74ac8b1e56678bce15c19165e8e0b93b2b6ef323..3c010476afefe357b7d7ba0ebd98bcfc3e3bf1d0 100644 (file)
--- 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 dfccb4472cd7966b43aca1ee4cc803fe7a3cc640..542c373d6f4f1e5c35e97b5036045d007043d46c 100644 (file)
--- 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 483ec1cd38a549f2061195386a3c9223149928df..9da33adfea9c5c8f7aa3bce988d7c3d32403db08 100644 (file)
--- a/src/openvpn/ssl_polarssl.c
+++ b/src/openvpn/ssl_mbedtls.c
@@ -48,7 +48,7 @@
 
 #include <mbedtls/havege.h>
 
-#include "ssl_verify_polarssl.h"
+#include "ssl_verify_mbedtls.h"
 #include <mbedtls/debug.h>
 #include <mbedtls/error.h>
 #include <mbedtls/net.h>

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 5eb18435295685aac18976dd70ae99643b1c59ca..f693b2a48746e536d3116a617fb1a3538f691fbc 100644 (file)
--- 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 ff76d3d38b9ac81e533285078ee1b62877578518..ffe196ec08f6373da0019aa0e9890d5e96ba8e75 100644 (file)
--- 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 <mbedtls/asn1.h>
 #include <mbedtls/error.h>

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