reindented code

1 files changed, 153 insertions, 157 deletions

diff --git a/extra/includes/gnutls/openssl.h b/extra/includes/gnutls/openssl.h
index fd59d335b6..ec9fd3cc61 100644
--- a/extra/includes/gnutls/openssl.h
+++ b/extra/includes/gnutls/openssl.h
@@ -35,8 +35,7 @@
 #define GNUTLS_OPENSSL_H
 
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
 
 #include <gnutls/gnutls.h>
@@ -51,16 +50,15 @@ extern "C"
 #define GNUTLS_X509_S_SIZE 256
 #define GNUTLS_X509_EMAIL_SIZE 256
 
-  typedef struct
-  {
-    char common_name[GNUTLS_X509_CN_SIZE];
-    char country[GNUTLS_X509_C_SIZE];
-    char organization[GNUTLS_X509_O_SIZE];
-    char organizational_unit_name[GNUTLS_X509_OU_SIZE];
-    char locality_name[GNUTLS_X509_L_SIZE];
-    char state_or_province_name[GNUTLS_X509_S_SIZE];
-    char email[GNUTLS_X509_EMAIL_SIZE];
-  } gnutls_x509_dn;
+	typedef struct {
+		char common_name[GNUTLS_X509_CN_SIZE];
+		char country[GNUTLS_X509_C_SIZE];
+		char organization[GNUTLS_X509_O_SIZE];
+		char organizational_unit_name[GNUTLS_X509_OU_SIZE];
+		char locality_name[GNUTLS_X509_L_SIZE];
+		char state_or_province_name[GNUTLS_X509_S_SIZE];
+		char email[GNUTLS_X509_EMAIL_SIZE];
+	} gnutls_x509_dn;
 
 
 #define OPENSSL_VERSION_NUMBER (0x0090604F)
@@ -93,86 +91,79 @@ extern "C"
 
 #undef X509_NAME
 #undef X509
-  typedef gnutls_x509_dn X509_NAME;
-  typedef gnutls_datum_t X509;
-
-  typedef struct _SSL SSL;
-
-  typedef struct
-  {
-    char priority_string[256];
-    unsigned int connend;
-  } SSL_METHOD;
-
-  typedef struct
-  {
-    gnutls_protocol_t version;
-    gnutls_cipher_algorithm_t cipher;
-    gnutls_kx_algorithm_t kx;
-    gnutls_mac_algorithm_t mac;
-    gnutls_compression_method_t compression;
-    gnutls_certificate_type_t cert;
-  } SSL_CIPHER;
-
-  typedef struct _BIO
-  {
-    gnutls_transport_ptr_t fd;
-  } BIO;
-
-  typedef struct
-  {
-    SSL *ssl;
-    int error;
-    const gnutls_datum_t *cert_list;
+	typedef gnutls_x509_dn X509_NAME;
+	typedef gnutls_datum_t X509;
+
+	typedef struct _SSL SSL;
+
+	typedef struct {
+		char priority_string[256];
+		unsigned int connend;
+	} SSL_METHOD;
+
+	typedef struct {
+		gnutls_protocol_t version;
+		gnutls_cipher_algorithm_t cipher;
+		gnutls_kx_algorithm_t kx;
+		gnutls_mac_algorithm_t mac;
+		gnutls_compression_method_t compression;
+		gnutls_certificate_type_t cert;
+	} SSL_CIPHER;
+
+	typedef struct _BIO {
+		gnutls_transport_ptr_t fd;
+	} BIO;
+
+	typedef struct {
+		SSL *ssl;
+		int error;
+		const gnutls_datum_t *cert_list;
 #define current_cert cert_list
-  } X509_STORE_CTX;
+	} X509_STORE_CTX;
 
 #define X509_STORE_CTX_get_current_cert(ctx) ((ctx)->current_cert)
 
-  typedef struct _SSL_CTX
-  {
-    SSL_METHOD *method;
-    char *certfile;
-    int certfile_type;
-    char *keyfile;
-    int keyfile_type;
-    unsigned long options;
+	typedef struct _SSL_CTX {
+		SSL_METHOD *method;
+		char *certfile;
+		int certfile_type;
+		char *keyfile;
+		int keyfile_type;
+		unsigned long options;
 
-    int (*verify_callback) (int, X509_STORE_CTX *);
-    int verify_mode;
+		int (*verify_callback) (int, X509_STORE_CTX *);
+		int verify_mode;
 
-  } SSL_CTX;
+	} SSL_CTX;
 
-  struct _SSL
-  {
-    gnutls_session_t gnutls_state;
+	struct _SSL {
+		gnutls_session_t gnutls_state;
 
-    gnutls_certificate_client_credentials gnutls_cred;
+		gnutls_certificate_client_credentials gnutls_cred;
 
-    SSL_CTX *ctx;
-    SSL_CIPHER ciphersuite;
+		SSL_CTX *ctx;
+		SSL_CIPHER ciphersuite;
 
-    int last_error;
-    int shutdown;
-    int state;
-    unsigned long options;
+		int last_error;
+		int shutdown;
+		int state;
+		unsigned long options;
 
-    int (*verify_callback) (int, X509_STORE_CTX *);
-    int verify_mode;
+		int (*verify_callback) (int, X509_STORE_CTX *);
+		int verify_mode;
 
-    gnutls_transport_ptr_t rfd;
-    gnutls_transport_ptr_t wfd;
-  };
+		gnutls_transport_ptr_t rfd;
+		gnutls_transport_ptr_t wfd;
+	};
 
 #define rbio gnutls_state
 
-  typedef struct
-  {
-    void *handle;
-  } MD_CTX;
+	typedef struct {
+		void *handle;
+	} MD_CTX;
 
-  struct rsa_st;
-  typedef struct rsa_st RSA;
+	struct rsa_st;
+	typedef struct rsa_st RSA;
 
 #define MD5_CTX MD_CTX
 #define RIPEMD160_CTX MD_CTX
@@ -189,65 +180,68 @@ extern "C"
 
 /* Library initialisation functions */
 
-  int SSL_library_init (void);
-  void OpenSSL_add_all_algorithms (void);
+	int SSL_library_init(void);
+	void OpenSSL_add_all_algorithms(void);
 
 
 /* SSL_CTX structure handling */
 
-  SSL_CTX *SSL_CTX_new (SSL_METHOD * method);
-  void SSL_CTX_free (SSL_CTX * ctx);
-  int SSL_CTX_set_default_verify_paths (SSL_CTX * ctx);
-  int SSL_CTX_use_certificate_file (SSL_CTX * ctx, const char *certfile,
-                                    int type);
-  int SSL_CTX_use_PrivateKey_file (SSL_CTX * ctx, const char *keyfile,
-                                   int type);
-  void SSL_CTX_set_verify (SSL_CTX * ctx, int verify_mode,
-                           int (*verify_callback) (int, X509_STORE_CTX *));
-  unsigned long SSL_CTX_set_options (SSL_CTX * ctx, unsigned long options);
-  long SSL_CTX_set_mode (SSL_CTX * ctx, long mode);
-  int SSL_CTX_set_cipher_list (SSL_CTX * ctx, const char *list);
+	SSL_CTX *SSL_CTX_new(SSL_METHOD * method);
+	void SSL_CTX_free(SSL_CTX * ctx);
+	int SSL_CTX_set_default_verify_paths(SSL_CTX * ctx);
+	int SSL_CTX_use_certificate_file(SSL_CTX * ctx,
+					 const char *certfile, int type);
+	int SSL_CTX_use_PrivateKey_file(SSL_CTX * ctx, const char *keyfile,
+					int type);
+	void SSL_CTX_set_verify(SSL_CTX * ctx, int verify_mode,
+				int (*verify_callback) (int,
+							X509_STORE_CTX *));
+	unsigned long SSL_CTX_set_options(SSL_CTX * ctx,
+					  unsigned long options);
+	long SSL_CTX_set_mode(SSL_CTX * ctx, long mode);
+	int SSL_CTX_set_cipher_list(SSL_CTX * ctx, const char *list);
 
 
 /* SSL_CTX statistics */
 
-  long SSL_CTX_sess_number (SSL_CTX * ctx);
-  long SSL_CTX_sess_connect (SSL_CTX * ctx);
-  long SSL_CTX_sess_connect_good (SSL_CTX * ctx);
-  long SSL_CTX_sess_connect_renegotiate (SSL_CTX * ctx);
-  long SSL_CTX_sess_accept (SSL_CTX * ctx);
-  long SSL_CTX_sess_accept_good (SSL_CTX * ctx);
-  long SSL_CTX_sess_accept_renegotiate (SSL_CTX * ctx);
-  long SSL_CTX_sess_hits (SSL_CTX * ctx);
-  long SSL_CTX_sess_misses (SSL_CTX * ctx);
-  long SSL_CTX_sess_timeouts (SSL_CTX * ctx);
+	long SSL_CTX_sess_number(SSL_CTX * ctx);
+	long SSL_CTX_sess_connect(SSL_CTX * ctx);
+	long SSL_CTX_sess_connect_good(SSL_CTX * ctx);
+	long SSL_CTX_sess_connect_renegotiate(SSL_CTX * ctx);
+	long SSL_CTX_sess_accept(SSL_CTX * ctx);
+	long SSL_CTX_sess_accept_good(SSL_CTX * ctx);
+	long SSL_CTX_sess_accept_renegotiate(SSL_CTX * ctx);
+	long SSL_CTX_sess_hits(SSL_CTX * ctx);
+	long SSL_CTX_sess_misses(SSL_CTX * ctx);
+	long SSL_CTX_sess_timeouts(SSL_CTX * ctx);
 
 
 /* SSL structure handling */
 
-  SSL *SSL_new (SSL_CTX * ctx);
-  void SSL_free (SSL * ssl);
-  void SSL_load_error_strings (void);
-  int SSL_get_error (SSL * ssl, int ret);
-  int SSL_set_fd (SSL * ssl, int fd);
-  int SSL_set_rfd (SSL * ssl, int fd);
-  int SSL_set_wfd (SSL * ssl, int fd);
-  void SSL_set_bio (SSL * ssl, BIO * rbio, BIO * wbio);
-  void SSL_set_connect_state (SSL * ssl);
-  int SSL_pending (SSL * ssl);
-  void SSL_set_verify (SSL * ssl, int verify_mode,
-                       int (*verify_callback) (int, X509_STORE_CTX *));
-  const X509 *SSL_get_peer_certificate (SSL * ssl);
+	SSL *SSL_new(SSL_CTX * ctx);
+	void SSL_free(SSL * ssl);
+	void SSL_load_error_strings(void);
+	int SSL_get_error(SSL * ssl, int ret);
+	int SSL_set_fd(SSL * ssl, int fd);
+	int SSL_set_rfd(SSL * ssl, int fd);
+	int SSL_set_wfd(SSL * ssl, int fd);
+	void SSL_set_bio(SSL * ssl, BIO * rbio, BIO * wbio);
+	void SSL_set_connect_state(SSL * ssl);
+	int SSL_pending(SSL * ssl);
+	void SSL_set_verify(SSL * ssl, int verify_mode,
+			    int (*verify_callback) (int,
+						    X509_STORE_CTX *));
+	const X509 *SSL_get_peer_certificate(SSL * ssl);
 
 /* SSL connection open/close/read/write functions */
 
-  int SSL_connect (SSL * ssl);
-  int SSL_accept (SSL * ssl);
-  int SSL_shutdown (SSL * ssl);
-  int SSL_read (SSL * ssl, void *buf, int len);
-  int SSL_write (SSL * ssl, const void *buf, int len);
+	int SSL_connect(SSL * ssl);
+	int SSL_accept(SSL * ssl);
+	int SSL_shutdown(SSL * ssl);
+	int SSL_read(SSL * ssl, void *buf, int len);
+	int SSL_write(SSL * ssl, const void *buf, int len);
 
-  int SSL_want (SSL * ssl);
+	int SSL_want(SSL * ssl);
 
 #define SSL_NOTHING (1)
 #define SSL_WRITING (2)
@@ -262,70 +256,72 @@ extern "C"
 
 /* SSL_METHOD functions */
 
-  SSL_METHOD *SSLv23_client_method (void);
-  SSL_METHOD *SSLv23_server_method (void);
-  SSL_METHOD *SSLv3_client_method (void);
-  SSL_METHOD *SSLv3_server_method (void);
-  SSL_METHOD *TLSv1_client_method (void);
-  SSL_METHOD *TLSv1_server_method (void);
+	SSL_METHOD *SSLv23_client_method(void);
+	SSL_METHOD *SSLv23_server_method(void);
+	SSL_METHOD *SSLv3_client_method(void);
+	SSL_METHOD *SSLv3_server_method(void);
+	SSL_METHOD *TLSv1_client_method(void);
+	SSL_METHOD *TLSv1_server_method(void);
 
 
 /* SSL_CIPHER functions */
 
-  SSL_CIPHER *SSL_get_current_cipher (SSL * ssl);
-  const char *SSL_CIPHER_get_name (SSL_CIPHER * cipher);
-  int SSL_CIPHER_get_bits (SSL_CIPHER * cipher, int *bits);
-  const char *SSL_CIPHER_get_version (SSL_CIPHER * cipher);
-  char *SSL_CIPHER_description (SSL_CIPHER * cipher, char *buf, int size);
+	SSL_CIPHER *SSL_get_current_cipher(SSL * ssl);
+	const char *SSL_CIPHER_get_name(SSL_CIPHER * cipher);
+	int SSL_CIPHER_get_bits(SSL_CIPHER * cipher, int *bits);
+	const char *SSL_CIPHER_get_version(SSL_CIPHER * cipher);
+	char *SSL_CIPHER_description(SSL_CIPHER * cipher, char *buf,
+				     int size);
 
 
 /* X509 functions */
 
-  X509_NAME *X509_get_subject_name (const X509 * cert);
-  X509_NAME *X509_get_issuer_name (const X509 * cert);
-  char *X509_NAME_oneline (gnutls_x509_dn * name, char *buf, int len);
-  void X509_free (const X509 * cert);
+	X509_NAME *X509_get_subject_name(const X509 * cert);
+	X509_NAME *X509_get_issuer_name(const X509 * cert);
+	char *X509_NAME_oneline(gnutls_x509_dn * name, char *buf, int len);
+	void X509_free(const X509 * cert);
 
 
 /* BIO functions */
 
-  void BIO_get_fd (gnutls_session_t gnutls_state, int *fd);
-  BIO *BIO_new_socket (int sock, int close_flag);
+	void BIO_get_fd(gnutls_session_t gnutls_state, int *fd);
+	BIO *BIO_new_socket(int sock, int close_flag);
 
 /* error handling */
 
-  unsigned long ERR_get_error (void);
-  const char *ERR_error_string (unsigned long e, char *buf);
+	unsigned long ERR_get_error(void);
+	const char *ERR_error_string(unsigned long e, char *buf);
 
 
 /* RAND functions */
 
-  int RAND_status (void);
-  void RAND_seed (const void *buf, int num);
-  int RAND_bytes (unsigned char *buf, int num);
-  int RAND_pseudo_bytes (unsigned char *buf, int num);
-  const char *RAND_file_name (char *buf, size_t len);
-  int RAND_load_file (const char *name, long maxbytes);
-  int RAND_write_file (const char *name);
+	int RAND_status(void);
+	void RAND_seed(const void *buf, int num);
+	int RAND_bytes(unsigned char *buf, int num);
+	int RAND_pseudo_bytes(unsigned char *buf, int num);
+	const char *RAND_file_name(char *buf, size_t len);
+	int RAND_load_file(const char *name, long maxbytes);
+	int RAND_write_file(const char *name);
 
-  int RAND_egd_bytes (const char *path, int bytes);
+	int RAND_egd_bytes(const char *path, int bytes);
 #define RAND_egd(p) RAND_egd_bytes((p), 255)
 
 /* message digest functions */
 
 #define MD5_DIGEST_LENGTH 16
 
-  void MD5_Init (MD5_CTX * ctx);
-  void MD5_Update (MD5_CTX * ctx, const void *buf, int len);
-  void MD5_Final (unsigned char *md, MD5_CTX * ctx);
-  unsigned char *MD5 (const unsigned char *buf, unsigned long len,
-                      unsigned char *md);
-
-  void RIPEMD160_Init (RIPEMD160_CTX * ctx);
-  void RIPEMD160_Update (RIPEMD160_CTX * ctx, const void *buf, int len);
-  void RIPEMD160_Final (unsigned char *md, RIPEMD160_CTX * ctx);
-  unsigned char *RIPEMD160 (const unsigned char *buf, unsigned long len,
-                            unsigned char *md);
+	void MD5_Init(MD5_CTX * ctx);
+	void MD5_Update(MD5_CTX * ctx, const void *buf, int len);
+	void MD5_Final(unsigned char *md, MD5_CTX * ctx);
+	unsigned char *MD5(const unsigned char *buf, unsigned long len,
+			   unsigned char *md);
+
+	void RIPEMD160_Init(RIPEMD160_CTX * ctx);
+	void RIPEMD160_Update(RIPEMD160_CTX * ctx, const void *buf,
+			      int len);
+	void RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX * ctx);
+	unsigned char *RIPEMD160(const unsigned char *buf,
+				 unsigned long len, unsigned char *md);
 
 #ifdef __cplusplus
 }