*Merge.

--HG--
branch : trunk

1 files changed, 52 insertions, 52 deletions

diff --git a/dep/include/openssl/kssl.h b/dep/include/openssl/kssl.h
index a3d20e1ccbd..de1f8f04d01 100644
--- a/dep/include/openssl/kssl.h
+++ b/dep/include/openssl/kssl.h
@@ -10,7 +10,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -57,11 +57,11 @@
  */
 
 /*
-**	19990701	VRS 	Started.
+**  19990701    VRS     Started.
 */
 
-#ifndef	KSSL_H
-#define	KSSL_H
+#ifndef KSSL_H
+#define KSSL_H
 
 #include <openssl/opensslconf.h>
 
@@ -76,8 +76,8 @@ extern "C" {
 #endif
 
 /*
-**	Depending on which KRB5 implementation used, some types from
-**	the other may be missing.  Resolve that here and now
+**  Depending on which KRB5 implementation used, some types from
+**  the other may be missing.  Resolve that here and now
 */
 #ifdef KRB5_HEIMDAL
 typedef unsigned char krb5_octet;
@@ -90,64 +90,64 @@ typedef unsigned char krb5_octet;
 
 #endif
 
-/*	Uncomment this to debug kssl problems or
-**	to trace usage of the Kerberos session key
+/*  Uncomment this to debug kssl problems or
+**  to trace usage of the Kerberos session key
 **
-**	#define		KSSL_DEBUG
+**  #define     KSSL_DEBUG
 */
 
-#ifndef	KRB5SVC
-#define KRB5SVC	"host"
+#ifndef KRB5SVC
+#define KRB5SVC "host"
 #endif
 
-#ifndef	KRB5KEYTAB
-#define KRB5KEYTAB	"/etc/krb5.keytab"
+#ifndef KRB5KEYTAB
+#define KRB5KEYTAB  "/etc/krb5.keytab"
 #endif
 
 #ifndef KRB5SENDAUTH
-#define KRB5SENDAUTH	1
+#define KRB5SENDAUTH    1
 #endif
 
 #ifndef KRB5CHECKAUTH
-#define KRB5CHECKAUTH	1
+#define KRB5CHECKAUTH   1
 #endif
 
 #ifndef KSSL_CLOCKSKEW
-#define	KSSL_CLOCKSKEW	300;
+#define KSSL_CLOCKSKEW  300;
 #endif
 
-#define	KSSL_ERR_MAX	255
+#define KSSL_ERR_MAX    255
 typedef struct kssl_err_st  {
-	int  reason;
-	char text[KSSL_ERR_MAX+1];
-	} KSSL_ERR;
+    int  reason;
+    char text[KSSL_ERR_MAX+1];
+    } KSSL_ERR;
 
 
-/*	Context for passing
-**		(1) Kerberos session key to SSL, and
-**		(2)	Config data between application and SSL lib
+/*  Context for passing
+**      (1) Kerberos session key to SSL, and
+**      (2) Config data between application and SSL lib
 */
 typedef struct kssl_ctx_st
         {
-                                /*	used by:    disposition:            */
-	char *service_name;	/*	C,S	    default ok (kssl)       */
-	char *service_host;	/*	C	    input, REQUIRED         */
-	char *client_princ;	/*	S	    output from krb5 ticket */
-	char *keytab_file;	/*      S	    NULL (/etc/krb5.keytab) */
-	char *cred_cache;	/*	C	    NULL (default)          */
-	krb5_enctype enctype;
-	int length;
-	krb5_octet FAR *key;
-	} KSSL_CTX;
-
-#define	KSSL_CLIENT 	1
-#define KSSL_SERVER 	2
-#define	KSSL_SERVICE	3
-#define	KSSL_KEYTAB 	4
-
-#define KSSL_CTX_OK 	0
-#define KSSL_CTX_ERR	1
-#define KSSL_NOMEM	2
+                                /*  used by:    disposition:            */
+    char *service_name; /*  C,S     default ok (kssl)       */
+    char *service_host; /*  C       input, REQUIRED         */
+    char *client_princ; /*  S       output from krb5 ticket */
+    char *keytab_file;  /*      S       NULL (/etc/krb5.keytab) */
+    char *cred_cache;   /*  C       NULL (default)          */
+    krb5_enctype enctype;
+    int length;
+    krb5_octet FAR *key;
+    } KSSL_CTX;
+
+#define KSSL_CLIENT     1
+#define KSSL_SERVER     2
+#define KSSL_SERVICE    3
+#define KSSL_KEYTAB     4
+
+#define KSSL_CTX_OK     0
+#define KSSL_CTX_ERR    1
+#define KSSL_NOMEM  2
 
 /* Public (for use by applications that use OpenSSL with Kerberos 5 support */
 krb5_error_code kssl_ctx_setstring(KSSL_CTX *kssl_ctx, int which, char *text);
@@ -156,24 +156,24 @@ KSSL_CTX *kssl_ctx_free(KSSL_CTX *kssl_ctx);
 void kssl_ctx_show(KSSL_CTX *kssl_ctx);
 krb5_error_code kssl_ctx_setprinc(KSSL_CTX *kssl_ctx, int which,
         krb5_data *realm, krb5_data *entity, int nentities);
-krb5_error_code	kssl_cget_tkt(KSSL_CTX *kssl_ctx,  krb5_data **enc_tktp,
+krb5_error_code kssl_cget_tkt(KSSL_CTX *kssl_ctx,  krb5_data **enc_tktp,
         krb5_data *authenp, KSSL_ERR *kssl_err);
-krb5_error_code	kssl_sget_tkt(KSSL_CTX *kssl_ctx,  krb5_data *indata,
+krb5_error_code kssl_sget_tkt(KSSL_CTX *kssl_ctx,  krb5_data *indata,
         krb5_ticket_times *ttimes, KSSL_ERR *kssl_err);
 krb5_error_code kssl_ctx_setkey(KSSL_CTX *kssl_ctx, krb5_keyblock *session);
-void	kssl_err_set(KSSL_ERR *kssl_err, int reason, char *text);
+void    kssl_err_set(KSSL_ERR *kssl_err, int reason, char *text);
 void kssl_krb5_free_data_contents(krb5_context context, krb5_data *data);
 krb5_error_code  kssl_build_principal_2(krb5_context context,
-			krb5_principal *princ, int rlen, const char *realm,
-			int slen, const char *svc, int hlen, const char *host);
+            krb5_principal *princ, int rlen, const char *realm,
+            int slen, const char *svc, int hlen, const char *host);
 krb5_error_code  kssl_validate_times(krb5_timestamp atime,
-					krb5_ticket_times *ttimes);
+                    krb5_ticket_times *ttimes);
 krb5_error_code  kssl_check_authent(KSSL_CTX *kssl_ctx, krb5_data *authentp,
-			            krb5_timestamp *atimep, KSSL_ERR *kssl_err);
-unsigned char	*kssl_skip_confound(krb5_enctype enctype, unsigned char *authn);
+                        krb5_timestamp *atimep, KSSL_ERR *kssl_err);
+unsigned char   *kssl_skip_confound(krb5_enctype enctype, unsigned char *authn);
 
 #ifdef  __cplusplus
 }
 #endif
-#endif	/* OPENSSL_NO_KRB5	*/
-#endif	/* KSSL_H 	*/
+#endif  /* OPENSSL_NO_KRB5  */
+#endif  /* KSSL_H   */