Fix compiler warnings in ssl_polarssl.c.
PATCH 1/1 Fix compiler warnings in ssl_polarssl.c.
No functional changes, just add missing includes and make casts explicit.
Signed-off-by Steffan Karger <[email protected]...>
--- src/openvpn/ssl_polarssl.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-)
src/openvpn/ssl_polarssl.c +15 -11
@@ -40,6 +40,7 @@#include "errlevel.h" #include "ssl_backend.h" +#include "base64.h" #include "buffer.h" #include "misc.h" #include "manage.h"
@@ -49,8 +50,10 @@#include "ssl_verify_polarssl.h" #include <polarssl/error.h> +#include <polarssl/oid.h> #include <polarssl/pem.h> #include <polarssl/sha256.h> +#include <polarssl/version.h> void tls_init_lib ()
@@ -210,12 +213,13 @@ tls_ctx_restrict_ciphers(struct tls_root_ctx *ctx, const char *ciphers)void tls_ctx_load_dh_params (struct tls_root_ctx *ctx,const char *dh_file, -const char *dh_file_inline +const char *dh_inline ) { -if (!strcmp (dh_file,INLINE_FILE_TAG ) && dh_file_inline) +if (!strcmp (dh_file,INLINE_FILE_TAG ) && dh_inline) { -if (0 !=dhm_parse_dhm (ctx->dhm_ctx, dh_file_inline,strlen (dh_file_inline))) +if (0 !=dhm_parse_dhm (ctx->dhm_ctx, (const unsigned char *) dh_inline, +strlen (dh_inline)))msg (M_FATAL ,"Cannot read inline DH parameters" ); }else
@@ -257,15 +261,15 @@ tls_ctx_load_cryptoapi(struct tls_root_ctx *ctx, const char *cryptoapi_cert)void tls_ctx_load_cert_file (struct tls_root_ctx *ctx,const char *cert_file, -const char *cert_file_inline +const char *cert_inline ) {ASSERT (NULL != ctx); -if (!strcmp (cert_file,INLINE_FILE_TAG ) && cert_file_inline) +if (!strcmp (cert_file,INLINE_FILE_TAG ) && cert_inline) { -if (0 !=x509_crt_parse (ctx->crt_chain, cert_file_inline, -strlen (cert_file_inline))) +if (0 !=x509_crt_parse (ctx->crt_chain, + (const unsigned char *) cert_inline,strlen (cert_inline)))msg (M_FATAL ,"Cannot load inline certificate file" ); }else
@@ -282,16 +286,16 @@ tls_ctx_load_cert_file (struct tls_root_ctx *ctx, const char *cert_file,int tls_ctx_load_priv_file (struct tls_root_ctx *ctx,const char *priv_key_file, -const char *priv_key_file_inline +const char *priv_key_inline ) {int status;ASSERT (NULL != ctx); -if (!strcmp (priv_key_file,INLINE_FILE_TAG ) && priv_key_file_inline) +if (!strcmp (priv_key_file,INLINE_FILE_TAG ) && priv_key_inline) { status =pk_parse_key (ctx->priv_key, - priv_key_file_inline,strlen (priv_key_file_inline), + (const unsigned char *) priv_key_inline,strlen (priv_key_inline),NULL ,0 );if (POLARSSL_ERR_PEM_PASSWORD_REQUIRED == status)
@@ -299,7 +303,7 @@ tls_ctx_load_priv_file (struct tls_root_ctx *ctx, const char *priv_key_file,char passbuf[512 ] = {0 };pem_password_callback (passbuf,512 ,0 ,NULL ); status =pk_parse_key (ctx->priv_key, - priv_key_file_inline,strlen (priv_key_file_inline), + (const unsigned char *) priv_key_inline,strlen (priv_key_inline), (unsigned char *) passbuf,strlen (passbuf)); } }
Signature · 1 line
1.9.1
ACK. Your patch has been applied to the master branch.
commit 9048d50b0a27a724ad088dc4904eb4888b0bca87 (master)
Author: Steffan Karger Date: Mon Aug 18 23:09:15 2014 +0200
Fix compiler warnings in ssl_polarssl.c.
Signed-off-by: Steffan Karger <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: http://article.gmane.org/gmane.network.openvpn.devel/8991
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering