Merge tag 'upstream/2.4.0'

Upstream version 2.4.0

1 files changed, 16 insertions, 16 deletions

diff --git a/src/openvpn/pkcs11_backend.h b/src/openvpn/pkcs11_backend.h
index 7b7ec45..9606899 100644
--- a/src/openvpn/pkcs11_backend.h
+++ b/src/openvpn/pkcs11_backend.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
@@ -41,35 +41,35 @@
 /**
  * Retrieve PKCS #11 Certificate's DN in a printable format.
  *
- * @param certificate 	The PKCS #11 helper certificate object
- * @param gc		Garbage collection pool to allocate memory in
+ * @param certificate   The PKCS #11 helper certificate object
+ * @param gc            Garbage collection pool to allocate memory in
  *
- * @return 		Certificate's DN on success, NULL on failure
+ * @return              Certificate's DN on success, NULL on failure
  */
-char * pkcs11_certificate_dn (pkcs11h_certificate_t certificate, struct gc_arena *gc);
+char *pkcs11_certificate_dn(pkcs11h_certificate_t certificate, struct gc_arena *gc);
 
 /**
  * Retrieve PKCS #11 Certificate's serial number in a printable format.
  *
- * @param certificate 	The PKCS #11 helper certificate object
- * @param serial	Buffer that the certificate's serial will be placed in.
- * @param serial_len	Size of said buffer.
+ * @param certificate   The PKCS #11 helper certificate object
+ * @param serial        Buffer that the certificate's serial will be placed in.
+ * @param serial_len    Size of said buffer.
  *
- * @return 		1 on failure, 0 on success
+ * @return              1 on failure, 0 on success
  */
-int pkcs11_certificate_serial (pkcs11h_certificate_t certificate, char *serial,
-    size_t serial_len);
+int pkcs11_certificate_serial(pkcs11h_certificate_t certificate, char *serial,
+                              size_t serial_len);
 
 /**
  * Load PKCS #11 Certificate's information into the given TLS context
  *
- * @param certificate 	The PKCS #11 helper certificate object
- * @param ssl_ctx	TLS context to use.
+ * @param certificate   The PKCS #11 helper certificate object
+ * @param ssl_ctx       TLS context to use.
  *
- * @return 		1 on failure, 0 on success
+ * @return              1 on failure, 0 on success
  */
 int pkcs11_init_tls_session(pkcs11h_certificate_t certificate,
-    struct tls_root_ctx * const ssl_ctx);
+                            struct tls_root_ctx *const ssl_ctx);
 
 #endif /* defined(ENABLE_PKCS11) */
 #endif /* PKCS11_BACKEND_H_ */