Merge tag 'upstream/2.4.0'

Upstream version 2.4.0

1 files changed, 13 insertions, 13 deletions

diff --git a/src/openvpn/ssl_mbedtls.h b/src/openvpn/ssl_mbedtls.h
index a4a7f05..1bc53ce 100644
--- a/src/openvpn/ssl_mbedtls.h
+++ b/src/openvpn/ssl_mbedtls.h
@@ -5,8 +5,8 @@
  *             packet encryption, packet authentication, and
  *             packet compression.
  *
- *  Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
- *  Copyright (C) 2010 Fox Crypto B.V. <openvpn@fox-it.com>
+ *  Copyright (C) 2002-2017 OpenVPN Technologies, Inc. <sales@openvpn.net>
+ *  Copyright (C) 2010-2017 Fox Crypto B.V. <openvpn@fox-it.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
@@ -65,29 +65,29 @@ typedef struct {
  * Either \c priv_key_pkcs11 or \c priv_key must be filled in.
  */
 struct tls_root_ctx {
-    bool initialised; 		/**< True if the context has been initialised */
+    bool initialised;           /**< True if the context has been initialised */
 
-    int endpoint; 		/**< Whether or not this is a server or a client */
+    int endpoint;               /**< Whether or not this is a server or a client */
 
-    mbedtls_dhm_context *dhm_ctx;	/**< Diffie-Helmann-Merkle context */
-    mbedtls_x509_crt *crt_chain;	/**< Local Certificate chain */
-    mbedtls_x509_crt *ca_chain;		/**< CA chain for remote verification */
-    mbedtls_pk_context *priv_key;	/**< Local private key */
+    mbedtls_dhm_context *dhm_ctx;       /**< Diffie-Helmann-Merkle context */
+    mbedtls_x509_crt *crt_chain;        /**< Local Certificate chain */
+    mbedtls_x509_crt *ca_chain;         /**< CA chain for remote verification */
+    mbedtls_pk_context *priv_key;       /**< Local private key */
     mbedtls_x509_crl *crl;              /**< Certificate Revocation List */
     struct timespec crl_last_mtime;     /**< CRL last modification time */
-    off_t crl_last_size;		/**< size of last loaded CRL */
+    off_t crl_last_size;                /**< size of last loaded CRL */
 #if defined(ENABLE_PKCS11)
-    mbedtls_pkcs11_context *priv_key_pkcs11;	/**< PKCS11 private key */
+    mbedtls_pkcs11_context *priv_key_pkcs11;    /**< PKCS11 private key */
 #endif
 #ifdef MANAGMENT_EXTERNAL_KEY
     struct external_context *external_key; /**< Management external key */
 #endif
-    int * allowed_ciphers;	/**< List of allowed ciphers for this connection */
+    int *allowed_ciphers;       /**< List of allowed ciphers for this connection */
 };
 
 struct key_state_ssl {
-    mbedtls_ssl_config ssl_config;	/**< mbedTLS global ssl config */
-    mbedtls_ssl_context *ctx;		/**< mbedTLS connection context */
+    mbedtls_ssl_config ssl_config;      /**< mbedTLS global ssl config */
+    mbedtls_ssl_context *ctx;           /**< mbedTLS connection context */
     bio_ctx bio_ctx;
 };