Reindent include directory, reformatting prototypes as necessary.

Exclude include/gssrpc due to its Sun origin and k5-platform.h due to
macros too hairy for emacs c-mode to handle.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23180 dc483132-0cff-0310-8789-dd5450dbe970

1 files changed, 1552 insertions, 1688 deletions

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index a9769234c..01f76de60 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -1,3 +1,4 @@
+/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
  * Copyright (C) 1989,1990,1991,1992,1993,1994,1995,2000,2001, 2003,2006,2007,2008,2009 by the Massachusetts Institute of Technology,
  * Cambridge, MA, USA.  All Rights Reserved.
@@ -84,9 +85,9 @@
 #include "osconf.h"
 
 #if defined(__MACH__) && defined(__APPLE__)
-#	include <TargetConditionals.h>
+#       include <TargetConditionals.h>
 #    if TARGET_RT_MAC_CFM
-#	error "Use KfM 4.0 SDK headers for CFM compilation."
+#       error "Use KfM 4.0 SDK headers for CFM compilation."
 #    endif
 #endif
 
@@ -104,10 +105,10 @@
 #include "win-mac.h"
 
 /* Kerberos Windows initialization file */
-#define KERBEROS_INI	"kerberos.ini"
-#define INI_FILES	"Files"
-#define INI_KRB_CCACHE	"krb5cc"	/* Location of the ccache */
-#define INI_KRB5_CONF	"krb5.ini"	/* Location of krb5.conf file */
+#define KERBEROS_INI    "kerberos.ini"
+#define INI_FILES       "Files"
+#define INI_KRB_CCACHE  "krb5cc"        /* Location of the ccache */
+#define INI_KRB5_CONF   "krb5.ini"      /* Location of krb5.conf file */
 #define ANSI_STDIO
 #endif
 
@@ -116,13 +117,13 @@
 #ifndef KRB5_SYSTYPES__
 #define KRB5_SYSTYPES__
 
-#ifdef HAVE_SYS_TYPES_H		/* From autoconf.h */
+#ifdef HAVE_SYS_TYPES_H         /* From autoconf.h */
 #include <sys/types.h>
 #else /* HAVE_SYS_TYPES_H */
-typedef unsigned long 	u_long;
-typedef unsigned int	u_int;
-typedef unsigned short	u_short;
-typedef unsigned char	u_char;
+typedef unsigned long   u_long;
+typedef unsigned int    u_int;
+typedef unsigned short  u_short;
+typedef unsigned char   u_char;
 #endif /* HAVE_SYS_TYPES_H */
 #endif /* KRB5_SYSTYPES__ */
 
@@ -136,9 +137,9 @@ typedef INT64_TYPE krb5_int64;
 #define DEFAULT_PWD_STRING1 "Enter password"
 #define DEFAULT_PWD_STRING2 "Re-enter password for verification"
 
-#define	KRB5_KDB_MAX_LIFE	(60*60*24) /* one day */
-#define	KRB5_KDB_MAX_RLIFE	(60*60*24*7) /* one week */
-#define	KRB5_KDB_EXPIRATION	2145830400 /* Thu Jan  1 00:00:00 2038 UTC */
+#define KRB5_KDB_MAX_LIFE       (60*60*24) /* one day */
+#define KRB5_KDB_MAX_RLIFE      (60*60*24*7) /* one week */
+#define KRB5_KDB_EXPIRATION     2145830400 /* Thu Jan  1 00:00:00 2038 UTC */
 
 /*
  * Windows requires a different api interface to each function. Here
@@ -262,95 +263,95 @@ typedef INT64_TYPE krb5_int64;
    (which allows non-ambiguous error codes between subsystems) */
 
 /* KDC errors */
-#define	KDC_ERR_NONE			0 /* No error */
-#define	KDC_ERR_NAME_EXP		1 /* Client's entry in DB expired */
-#define	KDC_ERR_SERVICE_EXP		2 /* Server's entry in DB expired */
-#define	KDC_ERR_BAD_PVNO		3 /* Requested pvno not supported */
-#define	KDC_ERR_C_OLD_MAST_KVNO		4 /* C's key encrypted in old master */
-#define	KDC_ERR_S_OLD_MAST_KVNO		5 /* S's key encrypted in old master */
-#define	KDC_ERR_C_PRINCIPAL_UNKNOWN	6 /* Client not found in Kerberos DB */
-#define	KDC_ERR_S_PRINCIPAL_UNKNOWN	7 /* Server not found in Kerberos DB */
-#define	KDC_ERR_PRINCIPAL_NOT_UNIQUE	8 /* Multiple entries in Kerberos DB */
-#define	KDC_ERR_NULL_KEY		9 /* The C or S has a null key */
-#define	KDC_ERR_CANNOT_POSTDATE		10 /* Tkt ineligible for postdating */
-#define	KDC_ERR_NEVER_VALID		11 /* Requested starttime > endtime */
-#define	KDC_ERR_POLICY			12 /* KDC policy rejects request */
-#define	KDC_ERR_BADOPTION		13 /* KDC can't do requested opt. */
-#define	KDC_ERR_ENCTYPE_NOSUPP		14 /* No support for encryption type */
-#define KDC_ERR_SUMTYPE_NOSUPP		15 /* No support for checksum type */
-#define KDC_ERR_PADATA_TYPE_NOSUPP	16 /* No support for padata type */
-#define KDC_ERR_TRTYPE_NOSUPP		17 /* No support for transited type */
-#define KDC_ERR_CLIENT_REVOKED		18 /* C's creds have been revoked */
-#define KDC_ERR_SERVICE_REVOKED		19 /* S's creds have been revoked */
-#define KDC_ERR_TGT_REVOKED		20 /* TGT has been revoked */
-#define KDC_ERR_CLIENT_NOTYET		21 /* C not yet valid */
-#define KDC_ERR_SERVICE_NOTYET		22 /* S not yet valid */
-#define KDC_ERR_KEY_EXP			23 /* Password has expired */
-#define KDC_ERR_PREAUTH_FAILED		24 /* Preauthentication failed */
-#define KDC_ERR_PREAUTH_REQUIRED	25 /* Additional preauthentication */
-					   /* required */
-#define KDC_ERR_SERVER_NOMATCH		26 /* Requested server and */
-					   /* ticket don't match*/
-#define KDC_ERR_MUST_USE_USER2USER	27 /* Server principal valid for */
-					   /*	user2user only */
-#define KDC_ERR_PATH_NOT_ACCEPTED	28 /* KDC policy rejected transited */
-					   /*	path */
-#define KDC_ERR_SVC_UNAVAILABLE		29 /* A service is not
-					    * available that is
-					    * required to process the
-					    * request */
+#define KDC_ERR_NONE                    0 /* No error */
+#define KDC_ERR_NAME_EXP                1 /* Client's entry in DB expired */
+#define KDC_ERR_SERVICE_EXP             2 /* Server's entry in DB expired */
+#define KDC_ERR_BAD_PVNO                3 /* Requested pvno not supported */
+#define KDC_ERR_C_OLD_MAST_KVNO         4 /* C's key encrypted in old master */
+#define KDC_ERR_S_OLD_MAST_KVNO         5 /* S's key encrypted in old master */
+#define KDC_ERR_C_PRINCIPAL_UNKNOWN     6 /* Client not found in Kerberos DB */
+#define KDC_ERR_S_PRINCIPAL_UNKNOWN     7 /* Server not found in Kerberos DB */
+#define KDC_ERR_PRINCIPAL_NOT_UNIQUE    8 /* Multiple entries in Kerberos DB */
+#define KDC_ERR_NULL_KEY                9 /* The C or S has a null key */
+#define KDC_ERR_CANNOT_POSTDATE         10 /* Tkt ineligible for postdating */
+#define KDC_ERR_NEVER_VALID             11 /* Requested starttime > endtime */
+#define KDC_ERR_POLICY                  12 /* KDC policy rejects request */
+#define KDC_ERR_BADOPTION               13 /* KDC can't do requested opt. */
+#define KDC_ERR_ENCTYPE_NOSUPP          14 /* No support for encryption type */
+#define KDC_ERR_SUMTYPE_NOSUPP          15 /* No support for checksum type */
+#define KDC_ERR_PADATA_TYPE_NOSUPP      16 /* No support for padata type */
+#define KDC_ERR_TRTYPE_NOSUPP           17 /* No support for transited type */
+#define KDC_ERR_CLIENT_REVOKED          18 /* C's creds have been revoked */
+#define KDC_ERR_SERVICE_REVOKED         19 /* S's creds have been revoked */
+#define KDC_ERR_TGT_REVOKED             20 /* TGT has been revoked */
+#define KDC_ERR_CLIENT_NOTYET           21 /* C not yet valid */
+#define KDC_ERR_SERVICE_NOTYET          22 /* S not yet valid */
+#define KDC_ERR_KEY_EXP                 23 /* Password has expired */
+#define KDC_ERR_PREAUTH_FAILED          24 /* Preauthentication failed */
+#define KDC_ERR_PREAUTH_REQUIRED        25 /* Additional preauthentication */
+                                           /* required */
+#define KDC_ERR_SERVER_NOMATCH          26 /* Requested server and */
+                                           /* ticket don't match*/
+#define KDC_ERR_MUST_USE_USER2USER      27 /* Server principal valid for */
+                                           /*   user2user only */
+#define KDC_ERR_PATH_NOT_ACCEPTED       28 /* KDC policy rejected transited */
+                                           /*   path */
+#define KDC_ERR_SVC_UNAVAILABLE         29 /* A service is not
+                                            * available that is
+                                            * required to process the
+                                            * request */
 /* Application errors */
-#define	KRB_AP_ERR_BAD_INTEGRITY 31	/* Decrypt integrity check failed */
-#define	KRB_AP_ERR_TKT_EXPIRED	32	/* Ticket expired */
-#define	KRB_AP_ERR_TKT_NYV	33	/* Ticket not yet valid */
-#define	KRB_AP_ERR_REPEAT	34	/* Request is a replay */
-#define	KRB_AP_ERR_NOT_US	35	/* The ticket isn't for us */
-#define	KRB_AP_ERR_BADMATCH	36	/* Ticket/authenticator don't match */
-#define	KRB_AP_ERR_SKEW		37	/* Clock skew too great */
-#define	KRB_AP_ERR_BADADDR	38	/* Incorrect net address */
-#define	KRB_AP_ERR_BADVERSION	39	/* Protocol version mismatch */
-#define	KRB_AP_ERR_MSG_TYPE	40	/* Invalid message type */
-#define	KRB_AP_ERR_MODIFIED	41	/* Message stream modified */
-#define	KRB_AP_ERR_BADORDER	42	/* Message out of order */
-#define	KRB_AP_ERR_BADKEYVER	44	/* Key version is not available */
-#define	KRB_AP_ERR_NOKEY	45	/* Service key not available */
-#define	KRB_AP_ERR_MUT_FAIL	46	/* Mutual authentication failed */
-#define KRB_AP_ERR_BADDIRECTION	47 	/* Incorrect message direction */
-#define KRB_AP_ERR_METHOD	48 	/* Alternative authentication */
-					/* method required */
-#define KRB_AP_ERR_BADSEQ	49 	/* Incorrect sequence numnber */
-					/* in message */
-#define KRB_AP_ERR_INAPP_CKSUM	50	/* Inappropriate type of */
-					/* checksum in message */
-#define KRB_AP_PATH_NOT_ACCEPTED 51	/* Policy rejects transited path */
-#define KRB_ERR_RESPONSE_TOO_BIG 52	/* Response too big for UDP, */
-					/*   retry with TCP */
+#define KRB_AP_ERR_BAD_INTEGRITY 31     /* Decrypt integrity check failed */
+#define KRB_AP_ERR_TKT_EXPIRED  32      /* Ticket expired */
+#define KRB_AP_ERR_TKT_NYV      33      /* Ticket not yet valid */
+#define KRB_AP_ERR_REPEAT       34      /* Request is a replay */
+#define KRB_AP_ERR_NOT_US       35      /* The ticket isn't for us */
+#define KRB_AP_ERR_BADMATCH     36      /* Ticket/authenticator don't match */
+#define KRB_AP_ERR_SKEW         37      /* Clock skew too great */
+#define KRB_AP_ERR_BADADDR      38      /* Incorrect net address */
+#define KRB_AP_ERR_BADVERSION   39      /* Protocol version mismatch */
+#define KRB_AP_ERR_MSG_TYPE     40      /* Invalid message type */
+#define KRB_AP_ERR_MODIFIED     41      /* Message stream modified */
+#define KRB_AP_ERR_BADORDER     42      /* Message out of order */
+#define KRB_AP_ERR_BADKEYVER    44      /* Key version is not available */
+#define KRB_AP_ERR_NOKEY        45      /* Service key not available */
+#define KRB_AP_ERR_MUT_FAIL     46      /* Mutual authentication failed */
+#define KRB_AP_ERR_BADDIRECTION 47      /* Incorrect message direction */
+#define KRB_AP_ERR_METHOD       48      /* Alternative authentication */
+                                        /* method required */
+#define KRB_AP_ERR_BADSEQ       49      /* Incorrect sequence numnber */
+                                        /* in message */
+#define KRB_AP_ERR_INAPP_CKSUM  50      /* Inappropriate type of */
+                                        /* checksum in message */
+#define KRB_AP_PATH_NOT_ACCEPTED 51     /* Policy rejects transited path */
+#define KRB_ERR_RESPONSE_TOO_BIG 52     /* Response too big for UDP, */
+                                        /*   retry with TCP */
 
 /* other errors */
-#define KRB_ERR_GENERIC		60 	/* Generic error (description */
-					/* in e-text) */
-#define	KRB_ERR_FIELD_TOOLONG	61	/* Field is too long for impl. */
+#define KRB_ERR_GENERIC         60      /* Generic error (description */
+                                        /* in e-text) */
+#define KRB_ERR_FIELD_TOOLONG   61      /* Field is too long for impl. */
 
 /* PKINIT server-reported errors */
-#define KDC_ERR_CLIENT_NOT_TRUSTED		62 /* client cert not trusted */
-#define KDC_ERR_KDC_NOT_TRUSTED			63
-#define KDC_ERR_INVALID_SIG			64 /* client signature verify failed */
-#define KDC_ERR_DH_KEY_PARAMETERS_NOT_ACCEPTED	65 /* invalid Diffie-Hellman parameters */
-#define KDC_ERR_CERTIFICATE_MISMATCH		66
-#define KRB_AP_ERR_NO_TGT			67
-#define KDC_ERR_WRONG_REALM			68
-#define KRB_AP_ERR_USER_TO_USER_REQUIRED	69
-#define KDC_ERR_CANT_VERIFY_CERTIFICATE		70 /* client cert not verifiable to */
-						   /* trusted root cert */
-#define KDC_ERR_INVALID_CERTIFICATE		71 /* client cert had invalid signature */
-#define KDC_ERR_REVOKED_CERTIFICATE		72 /* client cert was revoked */
-#define KDC_ERR_REVOCATION_STATUS_UNKNOWN	73 /* client cert revoked, reason unknown */
-#define KDC_ERR_REVOCATION_STATUS_UNAVAILABLE	74
-#define KDC_ERR_CLIENT_NAME_MISMATCH		75 /* mismatch between client cert and */
-						   /* principal name */
-#define KDC_ERR_INCONSISTENT_KEY_PURPOSE	77 /* bad extended key use */
-#define KDC_ERR_DIGEST_IN_CERT_NOT_ACCEPTED	78 /* bad digest algorithm in client cert */
-#define KDC_ERR_PA_CHECKSUM_MUST_BE_INCLUDED	79 /* missing paChecksum in PA-PK-AS-REQ */
+#define KDC_ERR_CLIENT_NOT_TRUSTED              62 /* client cert not trusted */
+#define KDC_ERR_KDC_NOT_TRUSTED                 63
+#define KDC_ERR_INVALID_SIG                     64 /* client signature verify failed */
+#define KDC_ERR_DH_KEY_PARAMETERS_NOT_ACCEPTED  65 /* invalid Diffie-Hellman parameters */
+#define KDC_ERR_CERTIFICATE_MISMATCH            66
+#define KRB_AP_ERR_NO_TGT                       67
+#define KDC_ERR_WRONG_REALM                     68
+#define KRB_AP_ERR_USER_TO_USER_REQUIRED        69
+#define KDC_ERR_CANT_VERIFY_CERTIFICATE         70 /* client cert not verifiable to */
+                                                   /* trusted root cert */
+#define KDC_ERR_INVALID_CERTIFICATE             71 /* client cert had invalid signature */
+#define KDC_ERR_REVOKED_CERTIFICATE             72 /* client cert was revoked */
+#define KDC_ERR_REVOCATION_STATUS_UNKNOWN       73 /* client cert revoked, reason unknown */
+#define KDC_ERR_REVOCATION_STATUS_UNAVAILABLE   74
+#define KDC_ERR_CLIENT_NAME_MISMATCH            75 /* mismatch between client cert and */
+                                                   /* principal name */
+#define KDC_ERR_INCONSISTENT_KEY_PURPOSE        77 /* bad extended key use */
+#define KDC_ERR_DIGEST_IN_CERT_NOT_ACCEPTED     78 /* bad digest algorithm in client cert */
+#define KDC_ERR_PA_CHECKSUM_MUST_BE_INCLUDED    79 /* missing paChecksum in PA-PK-AS-REQ */
 #define KDC_ERR_DIGEST_IN_SIGNED_DATA_NOT_ACCEPTED 80 /* bad digest algorithm in SignedData */
 #define KDC_ERR_PUBLIC_KEY_ENCRYPTION_NOT_SUPPORTED 81
 
@@ -360,10 +361,10 @@ typedef INT64_TYPE krb5_int64;
  * authentication is returned, KRB_AP_METHOD.
  */
 typedef struct _krb5_alt_method {
-	krb5_magic	magic;
-	krb5_int32	method;
-	unsigned int	length;
-	krb5_octet	*data;
+    krb5_magic      magic;
+    krb5_int32      method;
+    unsigned int    length;
+    krb5_octet      *data;
 } krb5_alt_method;
 
 /*
@@ -374,10 +375,10 @@ typedef struct _krb5_alt_method {
  * but s2kparams must be null when encoding etype-info.
  */
 typedef struct _krb5_etype_info_entry {
-	krb5_magic	magic;
-	krb5_enctype	etype;
-	unsigned int	length;
-	krb5_octet	*salt;
+    krb5_magic      magic;
+    krb5_enctype    etype;
+    unsigned int    length;
+    krb5_octet      *salt;
     krb5_data s2kparams;
 } krb5_etype_info_entry;
 
@@ -393,33 +394,33 @@ typedef krb5_etype_info_entry ** krb5_etype_info;
 
 /* RFC 4537 */
 typedef struct _krb5_etype_list {
-	int		length;
-	krb5_enctype	*etypes;
+    int             length;
+    krb5_enctype    *etypes;
 } krb5_etype_list;
 
 /*
  * a sam_challenge is returned for alternate preauth
  */
 /*
-          SAMFlags ::= BIT STRING {
-              use-sad-as-key[0],
-              send-encrypted-sad[1],
-              must-pk-encrypt-sad[2]
-          }
- */
+  SAMFlags ::= BIT STRING {
+  use-sad-as-key[0],
+  send-encrypted-sad[1],
+  must-pk-encrypt-sad[2]
+  }
+*/
 /*
-          PA-SAM-CHALLENGE ::= SEQUENCE {
-              sam-type[0]                 INTEGER,
-              sam-flags[1]                SAMFlags,
-              sam-type-name[2]            GeneralString OPTIONAL,
-              sam-track-id[3]             GeneralString OPTIONAL,
-              sam-challenge-label[4]      GeneralString OPTIONAL,
-              sam-challenge[5]            GeneralString OPTIONAL,
-              sam-response-prompt[6]      GeneralString OPTIONAL,
-              sam-pk-for-sad[7]           EncryptionKey OPTIONAL,
-              sam-nonce[8]                INTEGER OPTIONAL,
-              sam-cksum[9]                Checksum OPTIONAL
-          }
+  PA-SAM-CHALLENGE ::= SEQUENCE {
+  sam-type[0]                 INTEGER,
+  sam-flags[1]                SAMFlags,
+  sam-type-name[2]            GeneralString OPTIONAL,
+  sam-track-id[3]             GeneralString OPTIONAL,
+  sam-challenge-label[4]      GeneralString OPTIONAL,
+  sam-challenge[5]            GeneralString OPTIONAL,
+  sam-response-prompt[6]      GeneralString OPTIONAL,
+  sam-pk-for-sad[7]           EncryptionKey OPTIONAL,
+  sam-nonce[8]                INTEGER OPTIONAL,
+  sam-cksum[9]                Checksum OPTIONAL
+  }
 */
 /* sam_type values -- informational only */
 #define PA_SAM_TYPE_ENIGMA     1   /*  Enigma Logic */
@@ -434,89 +435,89 @@ typedef struct _krb5_etype_list {
 #define PA_SAM_TYPE_DIGI_PATH_HEX  8   /*  Digital Pathways hex mode */
 #endif
 #define PA_SAM_TYPE_EXP_BASE    128 /* experimental */
-#define PA_SAM_TYPE_GRAIL		(PA_SAM_TYPE_EXP_BASE+0) /* testing */
-#define PA_SAM_TYPE_SECURID_PREDICT	(PA_SAM_TYPE_EXP_BASE+1) /* special */
+#define PA_SAM_TYPE_GRAIL               (PA_SAM_TYPE_EXP_BASE+0) /* testing */
+#define PA_SAM_TYPE_SECURID_PREDICT     (PA_SAM_TYPE_EXP_BASE+1) /* special */
 
 typedef struct _krb5_predicted_sam_response {
-	krb5_magic	magic;
-	krb5_keyblock	sam_key;
-	krb5_flags	sam_flags; /* Makes key munging easier */
-	krb5_timestamp  stime;	/* time on server, for replay detection */
-	krb5_int32      susec;
-	krb5_principal  client;
-	krb5_data       msd;	/* mechanism specific data */
+    krb5_magic      magic;
+    krb5_keyblock   sam_key;
+    krb5_flags      sam_flags; /* Makes key munging easier */
+    krb5_timestamp  stime;  /* time on server, for replay detection */
+    krb5_int32      susec;
+    krb5_principal  client;
+    krb5_data       msd;    /* mechanism specific data */
 } krb5_predicted_sam_response;
 
 typedef struct _krb5_sam_challenge {
-	krb5_magic	magic;
-	krb5_int32	sam_type; /* information */
-	krb5_flags	sam_flags; /* KRB5_SAM_* values */
-	krb5_data	sam_type_name;
-	krb5_data	sam_track_id;
-	krb5_data	sam_challenge_label;
-	krb5_data	sam_challenge;
-	krb5_data	sam_response_prompt;
-	krb5_data	sam_pk_for_sad;
-	krb5_int32	sam_nonce;
-	krb5_checksum	sam_cksum;
+    krb5_magic      magic;
+    krb5_int32      sam_type; /* information */
+    krb5_flags      sam_flags; /* KRB5_SAM_* values */
+    krb5_data       sam_type_name;
+    krb5_data       sam_track_id;
+    krb5_data       sam_challenge_label;
+    krb5_data       sam_challenge;
+    krb5_data       sam_response_prompt;
+    krb5_data       sam_pk_for_sad;
+    krb5_int32      sam_nonce;
+    krb5_checksum   sam_cksum;
 } krb5_sam_challenge;
 
-typedef struct _krb5_sam_key {	/* reserved for future use */
-	krb5_magic	magic;
-	krb5_keyblock	sam_key;
+typedef struct _krb5_sam_key {  /* reserved for future use */
+    krb5_magic      magic;
+    krb5_keyblock   sam_key;
 } krb5_sam_key;
 
 typedef struct _krb5_enc_sam_response_enc {
-	krb5_magic	magic;
-	krb5_int32	sam_nonce;
-	krb5_timestamp	sam_timestamp;
-	krb5_int32	sam_usec;
-	krb5_data	sam_sad;
+    krb5_magic      magic;
+    krb5_int32      sam_nonce;
+    krb5_timestamp  sam_timestamp;
+    krb5_int32      sam_usec;
+    krb5_data       sam_sad;
 } krb5_enc_sam_response_enc;
 
 typedef struct _krb5_sam_response {
-	krb5_magic	magic;
-	krb5_int32	sam_type; /* informational */
-	krb5_flags	sam_flags; /* KRB5_SAM_* values */
-	krb5_data	sam_track_id; /* copied */
-	krb5_enc_data	sam_enc_key; /* krb5_sam_key - future use */
-	krb5_enc_data	sam_enc_nonce_or_ts; /* krb5_enc_sam_response_enc */
-	krb5_int32	sam_nonce;
-	krb5_timestamp	sam_patimestamp;
+    krb5_magic      magic;
+    krb5_int32      sam_type; /* informational */
+    krb5_flags      sam_flags; /* KRB5_SAM_* values */
+    krb5_data       sam_track_id; /* copied */
+    krb5_enc_data   sam_enc_key; /* krb5_sam_key - future use */
+    krb5_enc_data   sam_enc_nonce_or_ts; /* krb5_enc_sam_response_enc */
+    krb5_int32      sam_nonce;
+    krb5_timestamp  sam_patimestamp;
 } krb5_sam_response;
 
 typedef struct _krb5_sam_challenge_2 {
-	krb5_data	sam_challenge_2_body;
-	krb5_checksum	**sam_cksum;		/* Array of checksums */
+    krb5_data       sam_challenge_2_body;
+    krb5_checksum   **sam_cksum;            /* Array of checksums */
 } krb5_sam_challenge_2;
 
 typedef struct _krb5_sam_challenge_2_body {
-	krb5_magic	magic;
-	krb5_int32	sam_type; /* information */
-	krb5_flags	sam_flags; /* KRB5_SAM_* values */
-	krb5_data	sam_type_name;
-	krb5_data	sam_track_id;
-	krb5_data	sam_challenge_label;
-	krb5_data	sam_challenge;
-	krb5_data	sam_response_prompt;
-	krb5_data	sam_pk_for_sad;
-	krb5_int32	sam_nonce;
-	krb5_enctype	sam_etype;
+    krb5_magic      magic;
+    krb5_int32      sam_type; /* information */
+    krb5_flags      sam_flags; /* KRB5_SAM_* values */
+    krb5_data       sam_type_name;
+    krb5_data       sam_track_id;
+    krb5_data       sam_challenge_label;
+    krb5_data       sam_challenge;
+    krb5_data       sam_response_prompt;
+    krb5_data       sam_pk_for_sad;
+    krb5_int32      sam_nonce;
+    krb5_enctype    sam_etype;
 } krb5_sam_challenge_2_body;
 
 typedef struct _krb5_sam_response_2 {
-	krb5_magic	magic;
-	krb5_int32	sam_type; /* informational */
-	krb5_flags	sam_flags; /* KRB5_SAM_* values */
-	krb5_data	sam_track_id; /* copied */
-	krb5_enc_data	sam_enc_nonce_or_sad; /* krb5_enc_sam_response_enc */
-	krb5_int32	sam_nonce;
+    krb5_magic      magic;
+    krb5_int32      sam_type; /* informational */
+    krb5_flags      sam_flags; /* KRB5_SAM_* values */
+    krb5_data       sam_track_id; /* copied */
+    krb5_enc_data   sam_enc_nonce_or_sad; /* krb5_enc_sam_response_enc */
+    krb5_int32      sam_nonce;
 } krb5_sam_response_2;
 
 typedef struct _krb5_enc_sam_response_enc_2 {
-	krb5_magic	magic;
-	krb5_int32	sam_nonce;
-	krb5_data	sam_sad;
+    krb5_magic      magic;
+    krb5_int32      sam_nonce;
+    krb5_data       sam_sad;
 } krb5_enc_sam_response_enc_2;
 
 /*
@@ -547,17 +548,17 @@ extern char *strdup (const char *);
 #endif
 
 #ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>			/* struct stat, stat() */
+#include <sys/stat.h>                   /* struct stat, stat() */
 #endif
 
 #ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>			/* MAXPATHLEN */
+#include <sys/param.h>                  /* MAXPATHLEN */
 #endif
 
 #ifdef HAVE_SYS_FILE_H
-#include <sys/file.h>			/* prototypes for file-related
-					   syscalls; flags for open &
-					   friends */
+#include <sys/file.h>                   /* prototypes for file-related
+                                           syscalls; flags for open &
+                                           friends */
 #endif
 
 #ifdef HAVE_FCNTL_H
@@ -572,68 +573,72 @@ struct addrlist;
 struct sendto_callback_info;
 
 /* libos.spec */
-krb5_error_code krb5_lock_file (krb5_context, int, int);
-krb5_error_code krb5_unlock_file (krb5_context, int);
-krb5_error_code krb5_sendto_kdc (krb5_context, const krb5_data *,
-				 const krb5_data *, krb5_data *, int *, int);
-
-krb5_error_code krb5int_sendto (krb5_context context, const krb5_data *message,
-                const struct addrlist *addrs, struct sendto_callback_info* callback_info,
-				krb5_data *reply, struct sockaddr *localaddr, socklen_t *localaddrlen,
-                struct sockaddr *remoteaddr, socklen_t *remoteaddrlen, int *addr_used,
-		int (*msg_handler)(krb5_context, const krb5_data *, void *),
-		void *msg_handler_data);
+krb5_error_code krb5_lock_file(krb5_context, int, int);
+krb5_error_code krb5_unlock_file(krb5_context, int);
+krb5_error_code krb5_sendto_kdc(krb5_context, const krb5_data *,
+                                const krb5_data *, krb5_data *, int *, int);
 
-krb5_error_code krb5_get_krbhst (krb5_context, const krb5_data *, char *** );
-krb5_error_code krb5_free_krbhst (krb5_context, char * const * );
-krb5_error_code krb5_create_secure_file (krb5_context, const char * pathname);
-krb5_error_code krb5_sync_disk_file (krb5_context, FILE *fp);
-
-krb5_error_code krb5int_get_fq_local_hostname (char *, size_t);
+krb5_error_code
+krb5int_sendto(krb5_context context, const krb5_data *message,
+               const struct addrlist *addrs,
+               struct sendto_callback_info* callback_info,
+               krb5_data *reply, struct sockaddr *localaddr,
+               socklen_t *localaddrlen,
+               struct sockaddr *remoteaddr, socklen_t *remoteaddrlen,
+               int *addr_used,
+               int (*msg_handler)(krb5_context, const krb5_data *, void *),
+               void *msg_handler_data);
+
+krb5_error_code krb5_get_krbhst(krb5_context, const krb5_data *, char *** );
+krb5_error_code krb5_free_krbhst(krb5_context, char * const * );
+krb5_error_code krb5_create_secure_file(krb5_context, const char * pathname);
+krb5_error_code krb5_sync_disk_file(krb5_context, FILE *fp);
+
+krb5_error_code krb5int_get_fq_local_hostname(char *, size_t);
 
 krb5_error_code krb5int_init_context_kdc(krb5_context *);
 
-krb5_error_code krb5_os_init_context (krb5_context, krb5_boolean);
+krb5_error_code krb5_os_init_context(krb5_context, krb5_boolean);
 
-void krb5_os_free_context (krb5_context);
+void krb5_os_free_context(krb5_context);
 
 /* This function is needed by KfM's KerberosPreferences API
  * because it needs to be able to specify "secure" */
-krb5_error_code os_get_default_config_files
-    (profile_filespec_t **pfiles, krb5_boolean secure);
+krb5_error_code
+os_get_default_config_files(profile_filespec_t **pfiles, krb5_boolean secure);
 
-krb5_error_code krb5_os_hostaddr
-	(krb5_context, const char *, krb5_address ***);
+krb5_error_code
+krb5_os_hostaddr(krb5_context, const char *, krb5_address ***);
 
-krb5_error_code krb5int_get_domain_realm_mapping
-        (krb5_context , const char *, char ***);
+krb5_error_code
+krb5int_get_domain_realm_mapping(krb5_context , const char *, char ***);
 
 /* N.B.: You need to include fake-addrinfo.h *before* k5-int.h if you're
    going to use this structure.  */
 struct addrlist {
     struct {
 #ifdef FAI_DEFINED
-	struct addrinfo *ai;
+        struct addrinfo *ai;
 #else
-	struct undefined_addrinfo *ai;
+        struct undefined_addrinfo *ai;
 #endif
-	void (*freefn)(void *);
-	void *data;
+        void (*freefn)(void *);
+        void *data;
     } *addrs;
     size_t naddrs;
     size_t space;
 };
 #define ADDRLIST_INIT { 0, 0, 0 }
-extern void krb5int_free_addrlist (struct addrlist *);
-extern int krb5int_grow_addrlist (struct addrlist *, int);
-extern int krb5int_add_host_to_list (struct addrlist *, const char *,
-				     int, int, int, int);
+extern void krb5int_free_addrlist(struct addrlist *);
+extern int krb5int_grow_addrlist(struct addrlist *, int);
+extern int krb5int_add_host_to_list(struct addrlist *, const char *,
+                                    int, int, int, int);
 
 #include <krb5/locate_plugin.h>
 krb5_error_code
-krb5int_locate_server (krb5_context, const krb5_data *realm,
-		       struct addrlist *, enum locate_service_type svc,
-		       int sockettype, int family);
+krb5int_locate_server(krb5_context, const krb5_data *realm,
+                      struct addrlist *, enum locate_service_type svc,
+                      int sockettype, int family);
 
 struct derived_key {
     krb5_data constant;
@@ -656,34 +661,26 @@ struct krb5_enc_provider {
     size_t block_size, keybytes, keylength;
 
     /* cipher-state == 0 fresh state thrown away at end */
-    krb5_error_code (*encrypt) (krb5_key key,
-				const krb5_data *cipher_state,
-				const krb5_data *input,
-				krb5_data *output);
+    krb5_error_code (*encrypt)(krb5_key key, const krb5_data *cipher_state,
+                               const krb5_data *input, krb5_data *output);
 
-    krb5_error_code (*decrypt) (krb5_key key,
-				const krb5_data *ivec,
-				const krb5_data *input,
-				krb5_data *output);
+    krb5_error_code (*decrypt)(krb5_key key, const krb5_data *ivec,
+                               const krb5_data *input, krb5_data *output);
 
-    krb5_error_code (*make_key) (const krb5_data *randombits,
-				 krb5_keyblock *key);
+    krb5_error_code (*make_key)(const krb5_data *randombits,
+                                krb5_keyblock *key);
 
-  krb5_error_code (*init_state) (const krb5_keyblock *key,
-				 krb5_keyusage keyusage, krb5_data *out_state);
-  krb5_error_code (*free_state) (krb5_data *state);
+    krb5_error_code (*init_state)(const krb5_keyblock *key,
+                                  krb5_keyusage keyusage,
+                                  krb5_data *out_state);
+    krb5_error_code (*free_state)(krb5_data *state);
 
     /* In-place encryption/decryption of multiple buffers */
-    krb5_error_code (*encrypt_iov) (krb5_key key,
-				    const krb5_data *cipher_state,
-				    krb5_crypto_iov *data,
-				    size_t num_data);
-
+    krb5_error_code (*encrypt_iov)(krb5_key key, const krb5_data *cipher_state,
+                                   krb5_crypto_iov *data, size_t num_data);
 
-    krb5_error_code (*decrypt_iov) (krb5_key key,
-				    const krb5_data *cipher_state,
-				    krb5_crypto_iov *data,
-				    size_t num_data);
+    krb5_error_code (*decrypt_iov)(krb5_key key, const krb5_data *cipher_state,
+                                   krb5_crypto_iov *data, size_t num_data);
 
 };
 
@@ -692,99 +689,81 @@ struct krb5_hash_provider {
     size_t hashsize, blocksize;
 
     /* this takes multiple inputs to avoid lots of copying. */
-    krb5_error_code (*hash) (unsigned int icount, const krb5_data *input,
-			     krb5_data *output);
+    krb5_error_code (*hash)(unsigned int icount, const krb5_data *input,
+                            krb5_data *output);
 };
 
 struct krb5_keyhash_provider {
     size_t hashsize;
 
-    krb5_error_code (*hash) (krb5_key key,
-			     krb5_keyusage keyusage,
-			     const krb5_data *ivec,
-			     const krb5_data *input,
-			     krb5_data *output);
-
-    krb5_error_code (*verify) (krb5_key key,
-			       krb5_keyusage keyusage,
-			       const krb5_data *ivec,
-			       const krb5_data *input,
-			       const krb5_data *hash,
-			       krb5_boolean *valid);
-
-    krb5_error_code (*hash_iov) (krb5_key key,
-				 krb5_keyusage keyusage,
-				 const krb5_data *ivec,
-				 const krb5_crypto_iov *data,
-				 size_t num_data,
-				 krb5_data *output);
-
-    krb5_error_code (*verify_iov) (krb5_key key,
-				  krb5_keyusage keyusage,
-				  const krb5_data *ivec,
-				  const krb5_crypto_iov *data,
-				  size_t num_data,
-				  const krb5_data *hash,
-				  krb5_boolean *valid);
+    krb5_error_code (*hash)(krb5_key key, krb5_keyusage keyusage,
+                            const krb5_data *ivec, const krb5_data *input,
+                            krb5_data *output);
+
+    krb5_error_code (*verify)(krb5_key key, krb5_keyusage keyusage,
+                              const krb5_data *ivec, const krb5_data *input,
+                              const krb5_data *hash, krb5_boolean *valid);
+
+    krb5_error_code (*hash_iov)(krb5_key key, krb5_keyusage keyusage,
+                                const krb5_data *ivec,
+                                const krb5_crypto_iov *data, size_t num_data,
+                                krb5_data *output);
+
+    krb5_error_code (*verify_iov)(krb5_key key, krb5_keyusage keyusage,
+                                  const krb5_data *ivec,
+                                  const krb5_crypto_iov *data,
+                                  size_t num_data, const krb5_data *hash,
+                                  krb5_boolean *valid);
 };
 
 struct krb5_aead_provider {
-    krb5_error_code (*crypto_length) (const struct krb5_aead_provider *aead,
-				      const struct krb5_enc_provider *enc,
-				      const struct krb5_hash_provider *hash,
-				      krb5_cryptotype type,
-				      unsigned int *length);
-    krb5_error_code (*encrypt_iov) (const struct krb5_aead_provider *aead,
-				    const struct krb5_enc_provider *enc,
-				    const struct krb5_hash_provider *hash,
-				    krb5_key key,
-				    krb5_keyusage keyusage,
-				    const krb5_data *ivec,
-				    krb5_crypto_iov *data,
-				    size_t num_data);
-    krb5_error_code (*decrypt_iov) (const struct krb5_aead_provider *aead,
-				    const struct krb5_enc_provider *enc,
-				    const struct krb5_hash_provider *hash,
-				    krb5_key key,
-				    krb5_keyusage keyusage,
-				    const krb5_data *ivec,
-				    krb5_crypto_iov *data,
-				    size_t num_data);
+    krb5_error_code (*crypto_length)(const struct krb5_aead_provider *aead,
+                                     const struct krb5_enc_provider *enc,
+                                     const struct krb5_hash_provider *hash,
+                                     krb5_cryptotype type,
+                                     unsigned int *length);
+    krb5_error_code (*encrypt_iov)(const struct krb5_aead_provider *aead,
+                                   const struct krb5_enc_provider *enc,
+                                   const struct krb5_hash_provider *hash,
+                                   krb5_key key, krb5_keyusage keyusage,
+                                   const krb5_data *ivec,
+                                   krb5_crypto_iov *data, size_t num_data);
+    krb5_error_code (*decrypt_iov)(const struct krb5_aead_provider *aead,
+                                   const struct krb5_enc_provider *enc,
+                                   const struct krb5_hash_provider *hash,
+                                   krb5_key key, krb5_keyusage keyusage,
+                                   const krb5_data *ivec,
+                                   krb5_crypto_iov *data, size_t num_data);
 };
 
 /*
  * in here to deal with stuff from lib/crypto
  */
 
-void krb5int_nfold
-(unsigned int inbits, const unsigned char *in,
-		unsigned int outbits, unsigned char *out);
+void krb5int_nfold(unsigned int inbits, const unsigned char *in,
+                   unsigned int outbits, unsigned char *out);
 
-krb5_error_code krb5int_hmac
-(const struct krb5_hash_provider *hash,
-		krb5_key key, unsigned int icount,
-		const krb5_data *input, krb5_data *output);
+krb5_error_code krb5int_hmac(const struct krb5_hash_provider *hash,
+                             krb5_key key, unsigned int icount,
+                             const krb5_data *input, krb5_data *output);
 
-krb5_error_code krb5int_hmac_iov
-(const struct krb5_hash_provider *hash,
-		krb5_key key,
-		const krb5_crypto_iov *data, size_t num_data,
-		krb5_data *output);
+krb5_error_code krb5int_hmac_iov(const struct krb5_hash_provider *hash,
+                                 krb5_key key, const krb5_crypto_iov *data,
+                                 size_t num_data, krb5_data *output);
 
-krb5_error_code krb5int_hmac_keyblock
-(const struct krb5_hash_provider *hash,
-		const krb5_keyblock *key, unsigned int icount,
-		const krb5_data *input, krb5_data *output);
+krb5_error_code
+krb5int_hmac_keyblock(const struct krb5_hash_provider *hash,
+                      const krb5_keyblock *key, unsigned int icount,
+                      const krb5_data *input, krb5_data *output);
 
-krb5_error_code krb5int_hmac_iov_keyblock
-(const struct krb5_hash_provider *hash,
-		const krb5_keyblock *key,
-		const krb5_crypto_iov *data, size_t num_data,
-		krb5_data *output);
+krb5_error_code
+krb5int_hmac_iov_keyblock(const struct krb5_hash_provider *hash,
+                          const krb5_keyblock *key,
+                          const krb5_crypto_iov *data, size_t num_data,
+                          krb5_data *output);
 
-krb5_error_code krb5int_pbkdf2_hmac_sha1 (const krb5_data *, unsigned long,
-					  const krb5_data *,
-					  const krb5_data *);
+krb5_error_code krb5int_pbkdf2_hmac_sha1(const krb5_data *, unsigned long,
+                                         const krb5_data *, const krb5_data *);
 
 /* Make this a function eventually?  */
 #ifdef _WIN32
@@ -805,8 +784,8 @@ static inline void
 zapfree(void *ptr, size_t len)
 {
     if (ptr != NULL) {
-	zap(ptr, len);
-	free(ptr);
+        zap(ptr, len);
+        free(ptr);
     }
 }
 
@@ -814,41 +793,39 @@ zapfree(void *ptr, size_t len)
  * sets up an 8-byte IV of all zeros
  */
 
-krb5_error_code krb5int_des_init_state
-(const krb5_keyblock *key, krb5_keyusage keyusage, krb5_data *new_state);
+krb5_error_code
+krb5int_des_init_state(const krb5_keyblock *key, krb5_keyusage keyusage,
+                       krb5_data *new_state);
 
 /*
  * normally to free a cipher_state you can just memset the length to zero and
  * free it.
  */
-krb5_error_code krb5int_default_free_state
-(krb5_data *state);
+krb5_error_code krb5int_default_free_state(krb5_data *state);
 
 
 /*
  * Combine two keys (normally used by the hardware preauth mechanism)
  */
-krb5_error_code krb5int_c_combine_keys
-(krb5_context context, krb5_keyblock *key1, krb5_keyblock *key2,
-		krb5_keyblock *outkey);
-
-
-void  krb5int_c_free_keyblock
-(krb5_context, krb5_keyblock *key);
-void  krb5int_c_free_keyblock_contents
-	(krb5_context, krb5_keyblock *);
-krb5_error_code krb5int_c_init_keyblock
-		(krb5_context, krb5_enctype enctype,
-		size_t length, krb5_keyblock **out);
-krb5_error_code krb5int_c_copy_keyblock
-(krb5_context context, const krb5_keyblock *from, krb5_keyblock **to);
-krb5_error_code krb5int_c_copy_keyblock_contents
-(krb5_context context, const krb5_keyblock *from, krb5_keyblock *to);
+krb5_error_code
+krb5int_c_combine_keys(krb5_context context, krb5_keyblock *key1,
+                       krb5_keyblock *key2, krb5_keyblock *outkey);
+
+void krb5int_c_free_keyblock(krb5_context, krb5_keyblock *key);
+void krb5int_c_free_keyblock_contents(krb5_context, krb5_keyblock *);
+krb5_error_code krb5int_c_init_keyblock(krb5_context, krb5_enctype enctype,
+                                        size_t length, krb5_keyblock **out);
+krb5_error_code krb5int_c_copy_keyblock(krb5_context context,
+                                        const krb5_keyblock *from,
+                                        krb5_keyblock **to);
+krb5_error_code krb5int_c_copy_keyblock_contents(krb5_context context,
+                                                 const krb5_keyblock *from,
+                                                 krb5_keyblock *to);
 
 /*
  * Internal - for cleanup.
  */
-extern void krb5int_prng_cleanup (void);
+extern void krb5int_prng_cleanup(void);
 
 
 /*
@@ -863,37 +840,34 @@ extern const struct krb5_hash_provider krb5int_hash_md5;
 #ifdef KRB5_OLD_CRYPTO
 /* old provider api */
 
-krb5_error_code krb5_crypto_os_localaddr
-	(krb5_address ***);
+krb5_error_code krb5_crypto_os_localaddr(krb5_address ***);
 
-krb5_error_code krb5_crypto_us_timeofday
-	(krb5_int32 *,
-		krb5_int32 *);
+krb5_error_code krb5_crypto_us_timeofday(krb5_int32 *, krb5_int32 *);
 
 #endif /* KRB5_OLD_CRYPTO */
 
 /* this helper fct is in libkrb5, but it makes sense declared here. */
 
-krb5_error_code krb5_encrypt_helper
-(krb5_context context, const krb5_keyblock *key,
-		krb5_keyusage keyusage, const krb5_data *plain,
-		krb5_enc_data *cipher);
+krb5_error_code
+krb5_encrypt_helper(krb5_context context, const krb5_keyblock *key,
+                    krb5_keyusage keyusage, const krb5_data *plain,
+                    krb5_enc_data *cipher);
 
-krb5_error_code krb5_encrypt_keyhelper
-(krb5_context context, krb5_key key,
-		krb5_keyusage keyusage, const krb5_data *plain,
-		krb5_enc_data *cipher);
+krb5_error_code
+krb5_encrypt_keyhelper(krb5_context context, krb5_key key,
+                       krb5_keyusage keyusage, const krb5_data *plain,
+                       krb5_enc_data *cipher);
 
 /*
  * End "los-proto.h"
  */
 
 typedef struct _krb5_os_context {
-	krb5_magic		magic;
-	krb5_int32		time_offset;
-	krb5_int32		usec_offset;
-	krb5_int32		os_flags;
-	char *			default_ccname;
+    krb5_magic              magic;
+    krb5_int32              time_offset;
+    krb5_int32              usec_offset;
+    krb5_int32              os_flags;
+    char *                  default_ccname;
 } *krb5_os_context;
 
 /*
@@ -910,31 +884,31 @@ typedef struct _krb5_os_context {
  * returned as the time by the krb5 time routines.  This should only
  * be used for testing purposes (obviously!)
  */
-#define KRB5_OS_TOFFSET_VALID	1
-#define KRB5_OS_TOFFSET_TIME	2
+#define KRB5_OS_TOFFSET_VALID   1
+#define KRB5_OS_TOFFSET_TIME    2
 
 /* lock mode flags */
-#define	KRB5_LOCKMODE_SHARED	0x0001
-#define	KRB5_LOCKMODE_EXCLUSIVE	0x0002
-#define	KRB5_LOCKMODE_DONTBLOCK	0x0004
-#define	KRB5_LOCKMODE_UNLOCK	0x0008
+#define KRB5_LOCKMODE_SHARED    0x0001
+#define KRB5_LOCKMODE_EXCLUSIVE 0x0002
+#define KRB5_LOCKMODE_DONTBLOCK 0x0004
+#define KRB5_LOCKMODE_UNLOCK    0x0008
 
 /*
  * Define our view of the size of a DES key.
  */
-#define	KRB5_MIT_DES_KEYSIZE		8
-#define	KRB5_MIT_DES3_KEYSIZE		24
-#define KRB5_MIT_DES3_KEY_BYTES  	21
+#define KRB5_MIT_DES_KEYSIZE            8
+#define KRB5_MIT_DES3_KEYSIZE           24
+#define KRB5_MIT_DES3_KEY_BYTES         21
 
 /*
  * Check if des_int.h has been included before us.  If so, then check to see
  * that our view of the DES key size is the same as des_int.h's.
  */
-#ifdef	MIT_DES_KEYSIZE
-#if	MIT_DES_KEYSIZE != KRB5_MIT_DES_KEYSIZE
+#ifdef  MIT_DES_KEYSIZE
+#if     MIT_DES_KEYSIZE != KRB5_MIT_DES_KEYSIZE
 error(MIT_DES_KEYSIZE does not equal KRB5_MIT_DES_KEYSIZE)
-#endif	/* MIT_DES_KEYSIZE != KRB5_MIT_DES_KEYSIZE */
-#endif	/* MIT_DES_KEYSIZE */
+#endif  /* MIT_DES_KEYSIZE != KRB5_MIT_DES_KEYSIZE */
+#endif  /* MIT_DES_KEYSIZE */
 
 /*
  * Begin "preauth.h"
@@ -958,9 +932,9 @@ error(MIT_DES_KEYSIZE does not equal KRB5_MIT_DES_KEYSIZE)
  * requested information.  It is opaque to the plugin code and can be
  * expanded in the future as new types of requests are defined which
  * may require other things to be passed through. */
-    struct krb5int_fast_request_state;
+struct krb5int_fast_request_state;
 typedef struct _krb5_preauth_client_rock {
-	krb5_magic	magic;
+    krb5_magic      magic;
     krb5_enctype *etype;
     struct krb5int_fast_request_state *fast_state;
 } krb5_preauth_client_rock;
@@ -971,65 +945,65 @@ typedef struct _krb5_preauth_client_rock {
 typedef struct _krb5_preauth_context {
     int n_modules;
     struct _krb5_preauth_context_module {
-	/* Which of the possibly more than one preauth types which the
-	 * module supports we're using at this point in the list. */
-	krb5_preauthtype pa_type;
-	/* Encryption types which the client claims to support -- we
-	 * copy them directly into the krb5_kdc_req structure during
-	 * krb5_preauth_prepare_request(). */
-	krb5_enctype *enctypes;
-	/* The plugin's per-plugin context and a function to clear it. */
-	void *plugin_context;
-	preauth_client_plugin_fini_proc client_fini;
-	/* The module's table, and some of its members, copied here for
-	 * convenience when we populated the list. */
-	struct krb5plugin_preauth_client_ftable_v1 *ftable;
-	const char *name;
-	int flags, use_count;
-	preauth_client_process_proc client_process;
-	preauth_client_tryagain_proc client_tryagain;
-	preauth_client_supply_gic_opts_proc client_supply_gic_opts;
-	preauth_client_request_init_proc client_req_init;
-	preauth_client_request_fini_proc client_req_fini;
-	/* The per-request context which the client_req_init() function
-	 * might allocate, which we'll need to clean up later by
-	 * calling the client_req_fini() function. */
-	void *request_context;
-	/* A pointer to the request_context pointer.  All modules within
-	 * a plugin will point at the request_context of the first
-	 * module within the plugin. */
-	void **request_context_pp;
+        /* Which of the possibly more than one preauth types which the
+         * module supports we're using at this point in the list. */
+        krb5_preauthtype pa_type;
+        /* Encryption types which the client claims to support -- we
+         * copy them directly into the krb5_kdc_req structure during
+         * krb5_preauth_prepare_request(). */
+        krb5_enctype *enctypes;
+        /* The plugin's per-plugin context and a function to clear it. */
+        void *plugin_context;
+        preauth_client_plugin_fini_proc client_fini;
+        /* The module's table, and some of its members, copied here for
+         * convenience when we populated the list. */
+        struct krb5plugin_preauth_client_ftable_v1 *ftable;
+        const char *name;
+        int flags, use_count;
+        preauth_client_process_proc client_process;
+        preauth_client_tryagain_proc client_tryagain;
+        preauth_client_supply_gic_opts_proc client_supply_gic_opts;
+        preauth_client_request_init_proc client_req_init;
+        preauth_client_request_fini_proc client_req_fini;
+        /* The per-request context which the client_req_init() function
+         * might allocate, which we'll need to clean up later by
+         * calling the client_req_fini() function. */
+        void *request_context;
+        /* A pointer to the request_context pointer.  All modules within
+         * a plugin will point at the request_context of the first
+         * module within the plugin. */
+        void **request_context_pp;
     } *modules;
 } krb5_preauth_context;
 
 typedef struct _krb5_pa_enc_ts {
-    krb5_timestamp	patimestamp;
-    krb5_int32		pausec;
+    krb5_timestamp      patimestamp;
+    krb5_int32          pausec;
 } krb5_pa_enc_ts;
 
 typedef struct _krb5_pa_for_user {
-    krb5_principal	user;
-    krb5_checksum	cksum;
-    krb5_data		auth_package;
+    krb5_principal      user;
+    krb5_checksum       cksum;
+    krb5_data           auth_package;
 } krb5_pa_for_user;
 
 typedef struct _krb5_s4u_userid {
-    krb5_int32		nonce;
-    krb5_principal	user;
-    krb5_data		subject_cert;
-    krb5_flags		options;
+    krb5_int32          nonce;
+    krb5_principal      user;
+    krb5_data           subject_cert;
+    krb5_flags          options;
 } krb5_s4u_userid;
 
-#define KRB5_S4U_OPTS_CHECK_LOGON_HOURS		0x40000000 /* check logon hour restrictions */
-#define KRB5_S4U_OPTS_USE_REPLY_KEY_USAGE	0x20000000 /* sign with usage 27 instead of 26 */
+#define KRB5_S4U_OPTS_CHECK_LOGON_HOURS         0x40000000 /* check logon hour restrictions */
+#define KRB5_S4U_OPTS_USE_REPLY_KEY_USAGE       0x20000000 /* sign with usage 27 instead of 26 */
 
 typedef struct _krb5_pa_s4u_x509_user {
-    krb5_s4u_userid	user_id;
-    krb5_checksum	cksum;
+    krb5_s4u_userid     user_id;
+    krb5_checksum       cksum;
 } krb5_pa_s4u_x509_user;
 
 enum {
-  KRB5_FAST_ARMOR_AP_REQUEST = 0x1
+    KRB5_FAST_ARMOR_AP_REQUEST = 0x1
 };
 
 typedef struct _krb5_fast_armor {
@@ -1047,7 +1021,7 @@ typedef struct _krb5_fast_req {
     krb5_magic magic;
     krb5_flags fast_options;
     /* padata from req_body is used*/
-   krb5_kdc_req *req_body;
+    krb5_kdc_req *req_body;
 } krb5_fast_req;
 
 /* Bits 0-15 are critical in fast options.*/
@@ -1090,91 +1064,69 @@ typedef struct _krb5_ad_signedpath {
     krb5_pa_data **method_data;
 } krb5_ad_signedpath;
 
-typedef krb5_error_code (*krb5_preauth_obtain_proc)
-    (krb5_context,
-		    krb5_pa_data *,
-		    krb5_etype_info,
-		    krb5_keyblock *,
-		    krb5_error_code ( * )(krb5_context,
-					  const krb5_enctype,
-					  krb5_data *,
-					  krb5_const_pointer,
-					  krb5_keyblock **),
-		    krb5_const_pointer,
-		    krb5_creds *,
-		    krb5_kdc_req *,
-		    krb5_pa_data **);
-
-typedef krb5_error_code (*krb5_preauth_process_proc)
-    (krb5_context,
-		    krb5_pa_data *,
-		    krb5_kdc_req *,
-		    krb5_kdc_rep *,
-		    krb5_error_code ( * )(krb5_context,
-					  const krb5_enctype,
-					  krb5_data *,
-					  krb5_const_pointer,
-					  krb5_keyblock **),
-		    krb5_const_pointer,
-		    krb5_error_code ( * )(krb5_context,
-					  const krb5_keyblock *,
-					  krb5_const_pointer,
-					  krb5_kdc_rep * ),
-		    krb5_keyblock **,
-		    krb5_creds *,
-		    krb5_int32 *,
-		    krb5_int32 *);
+typedef krb5_error_code
+(*krb5_preauth_obtain_proc)(krb5_context, krb5_pa_data *,
+                            krb5_etype_info, krb5_keyblock *,
+                            krb5_error_code (*)(krb5_context,
+                                                const krb5_enctype,
+                                                krb5_data *,
+                                                krb5_const_pointer,
+                                                krb5_keyblock **),
+                            krb5_const_pointer, krb5_creds *,
+                            krb5_kdc_req *, krb5_pa_data **);
+
+typedef krb5_error_code
+(*krb5_preauth_process_proc)(krb5_context, krb5_pa_data *, krb5_kdc_req *,
+                             krb5_kdc_rep *,
+                             krb5_error_code (*)(krb5_context,
+                                                 const krb5_enctype,
+                                                 krb5_data *,
+                                                 krb5_const_pointer,
+                                                 krb5_keyblock **),
+                             krb5_const_pointer,
+                             krb5_error_code (*)(krb5_context,
+                                                 const krb5_keyblock *,
+                                                 krb5_const_pointer,
+                                                 krb5_kdc_rep * ),
+                             krb5_keyblock **, krb5_creds *, krb5_int32 *,
+                             krb5_int32 *);
 
 typedef struct _krb5_preauth_ops {
     krb5_magic magic;
     int     type;
-    int	flags;
-    krb5_preauth_obtain_proc	obtain;
-    krb5_preauth_process_proc	process;
+    int flags;
+    krb5_preauth_obtain_proc    obtain;
+    krb5_preauth_process_proc   process;
 } krb5_preauth_ops;
 
-krb5_error_code krb5_obtain_padata
-    	(krb5_context,
-		krb5_pa_data **,
-		krb5_error_code ( * )(krb5_context,
-						      const krb5_enctype,
-						      krb5_data *,
-						      krb5_const_pointer,
-						      krb5_keyblock **),
-		krb5_const_pointer,
-		krb5_creds *,
-		krb5_kdc_req *);
-
-krb5_error_code krb5_process_padata
-	(krb5_context,
-		krb5_kdc_req *,
-		krb5_kdc_rep *,
-		krb5_error_code ( * )(krb5_context,
-						      const krb5_enctype,
-						      krb5_data *,
-						      krb5_const_pointer,
-						      krb5_keyblock **),
-		krb5_const_pointer,
-		krb5_error_code ( * )(krb5_context,
-						      const krb5_keyblock *,
-						      krb5_const_pointer,
-						      krb5_kdc_rep * ),
-		krb5_keyblock **,
-		krb5_creds *,
-		krb5_int32 *);
-
-krb5_pa_data * krb5int_find_pa_data
-(krb5_context,  krb5_pa_data * const *, krb5_preauthtype);
+krb5_error_code
+krb5_obtain_padata(krb5_context, krb5_pa_data **,
+                   krb5_error_code (*)(krb5_context, const krb5_enctype,
+                                       krb5_data *, krb5_const_pointer,
+                                       krb5_keyblock **),
+                   krb5_const_pointer, krb5_creds *, krb5_kdc_req *);
+
+krb5_error_code
+krb5_process_padata(krb5_context, krb5_kdc_req *, krb5_kdc_rep *,
+                    krb5_error_code (*)(krb5_context, const krb5_enctype,
+                                        krb5_data *, krb5_const_pointer,
+                                        krb5_keyblock **),
+                    krb5_const_pointer,
+                    krb5_error_code (*)(krb5_context, const krb5_keyblock *,
+                                        krb5_const_pointer, krb5_kdc_rep *),
+                    krb5_keyblock **, krb5_creds *, krb5_int32 *);
+
+krb5_pa_data *
+krb5int_find_pa_data(krb5_context, krb5_pa_data *const *, krb5_preauthtype);
 /* Does not return a copy; original padata sequence responsible for freeing*/
 
-void krb5_free_etype_info
-    (krb5_context, krb5_etype_info);
+void krb5_free_etype_info(krb5_context, krb5_etype_info);
 
 /*
  * Preauthentication property flags
  */
-#define KRB5_PREAUTH_FLAGS_ENCRYPT	0x00000001
-#define KRB5_PREAUTH_FLAGS_HARDWARE	0x00000002
+#define KRB5_PREAUTH_FLAGS_ENCRYPT      0x00000001
+#define KRB5_PREAUTH_FLAGS_HARDWARE     0x00000002
 
 #endif /* KRB5_PREAUTH__ */
 /*
@@ -1210,16 +1162,16 @@ void krb5_free_etype_info
 #define KRB5_GET_INIT_CREDS_OPT_EXTENDED 0x80000000
 #define KRB5_GET_INIT_CREDS_OPT_SHADOWED 0x40000000
 
-#define krb5_gic_opt_is_extended(s) \
+#define krb5_gic_opt_is_extended(s)                                     \
     ((s) && ((s)->flags & KRB5_GET_INIT_CREDS_OPT_EXTENDED) ? 1 : 0)
-#define krb5_gic_opt_is_shadowed(s) \
+#define krb5_gic_opt_is_shadowed(s)                                     \
     ((s) && ((s)->flags & KRB5_GET_INIT_CREDS_OPT_SHADOWED) ? 1 : 0)
 
 
 typedef struct _krb5_gic_opt_private {
     int num_preauth_data;
     krb5_gic_opt_pa_data *preauth_data;
-  char * fast_ccache_name;
+    char * fast_ccache_name;
 } krb5_gic_opt_private;
 
 /*
@@ -1255,154 +1207,158 @@ typedef struct _krb5_gic_opt_ext {
 #endif
 
 krb5_error_code
-krb5int_gic_opt_to_opte(krb5_context context,
-                        krb5_get_init_creds_opt *opt,
-                        krb5_gic_opt_ext **opte,
-                        unsigned int force,
+krb5int_gic_opt_to_opte(krb5_context context, krb5_get_init_creds_opt *opt,
+                        krb5_gic_opt_ext **opte, unsigned int force,
                         const char *where);
 
 krb5_error_code
-krb5int_copy_data_contents (krb5_context, const krb5_data *, krb5_data *);
+krb5int_copy_data_contents(krb5_context, const krb5_data *, krb5_data *);
 
 krb5_error_code
-krb5int_copy_data_contents_add0 (krb5_context, const krb5_data *, krb5_data *);
+krb5int_copy_data_contents_add0(krb5_context, const krb5_data *, krb5_data *);
 
 krb5_error_code
-krb5int_copy_creds_contents (krb5_context, const krb5_creds *, krb5_creds *);
+krb5int_copy_creds_contents(krb5_context, const krb5_creds *, krb5_creds *);
 
-typedef krb5_error_code (*krb5_gic_get_as_key_fct)
-    (krb5_context,
-		     krb5_principal,
-		     krb5_enctype,
-		     krb5_prompter_fct,
-		     void *prompter_data,
-		     krb5_data *salt,
-     krb5_data *s2kparams,
-		     krb5_keyblock *as_key,
-		     void *gak_data);
+typedef krb5_error_code
+(*krb5_gic_get_as_key_fct)(krb5_context, krb5_principal, krb5_enctype,
+                           krb5_prompter_fct, void *prompter_data,
+                           krb5_data *salt, krb5_data *s2kparams,
+                           krb5_keyblock *as_key, void *gak_data);
 
 krb5_error_code KRB5_CALLCONV
-krb5_get_init_creds
-(krb5_context context,
-		krb5_creds *creds,
-		krb5_principal client,
-		krb5_prompter_fct prompter,
-		void *prompter_data,
-		krb5_deltat start_time,
-		char *in_tkt_service,
-		krb5_gic_opt_ext *gic_options,
-		krb5_gic_get_as_key_fct gak,
-		void *gak_data,
-		int *master,
-		krb5_kdc_rep **as_reply);
-
-krb5_error_code krb5int_populate_gic_opt (
-    krb5_context, krb5_gic_opt_ext **,
-    krb5_flags options, krb5_address * const *addrs, krb5_enctype *ktypes,
-    krb5_preauthtype *pre_auth_types, krb5_creds *creds);
-
-
-krb5_error_code KRB5_CALLCONV krb5_do_preauth
-	(krb5_context context,
-	 krb5_kdc_req *request,
-	 krb5_data *encoded_request_body,
-	 krb5_data *encoded_previous_request,
-	 krb5_pa_data **in_padata, krb5_pa_data ***out_padata,
-	 krb5_data *salt, krb5_data *s2kparams,
-	 krb5_enctype *etype, krb5_keyblock *as_key,
-	 krb5_prompter_fct prompter, void *prompter_data,
-	 krb5_gic_get_as_key_fct gak_fct, void *gak_data,
-	 krb5_preauth_client_rock *get_data_rock,
-	 krb5_gic_opt_ext *opte);
-krb5_error_code KRB5_CALLCONV krb5_do_preauth_tryagain
-	(krb5_context context,
-	 krb5_kdc_req *request,
-	 krb5_data *encoded_request_body,
-	 krb5_data *encoded_previous_request,
-	 krb5_pa_data **in_padata, krb5_pa_data ***out_padata,
-	 krb5_error *err_reply,
-	 krb5_data *salt, krb5_data *s2kparams,
-	 krb5_enctype *etype, krb5_keyblock *as_key,
-	 krb5_prompter_fct prompter, void *prompter_data,
-	 krb5_gic_get_as_key_fct gak_fct, void *gak_data,
-	 krb5_preauth_client_rock *get_data_rock,
-	 krb5_gic_opt_ext *opte);
-void KRB5_CALLCONV krb5_init_preauth_context
-	(krb5_context);
-void KRB5_CALLCONV krb5_free_preauth_context
-	(krb5_context);
-void KRB5_CALLCONV krb5_clear_preauth_context_use_counts
-	(krb5_context);
-void KRB5_CALLCONV krb5_preauth_prepare_request
-	(krb5_context, krb5_gic_opt_ext *, krb5_kdc_req *);
-void KRB5_CALLCONV krb5_preauth_request_context_init
-	(krb5_context);
-void KRB5_CALLCONV krb5_preauth_request_context_fini
-	(krb5_context);
-
-void KRB5_CALLCONV krb5_free_sam_challenge
-	(krb5_context, krb5_sam_challenge * );
-void KRB5_CALLCONV krb5_free_sam_challenge_2
-	(krb5_context, krb5_sam_challenge_2 * );
-void KRB5_CALLCONV krb5_free_sam_challenge_2_body
-	(krb5_context, krb5_sam_challenge_2_body *);
-void KRB5_CALLCONV krb5_free_sam_response
-	(krb5_context, krb5_sam_response * );
-void KRB5_CALLCONV krb5_free_sam_response_2
-	(krb5_context, krb5_sam_response_2 * );
-void KRB5_CALLCONV krb5_free_predicted_sam_response
-	(krb5_context, krb5_predicted_sam_response * );
-void KRB5_CALLCONV krb5_free_enc_sam_response_enc
-	(krb5_context, krb5_enc_sam_response_enc * );
-void KRB5_CALLCONV krb5_free_enc_sam_response_enc_2
-	(krb5_context, krb5_enc_sam_response_enc_2 * );
-void KRB5_CALLCONV krb5_free_sam_challenge_contents
-	(krb5_context, krb5_sam_challenge * );
-void KRB5_CALLCONV krb5_free_sam_challenge_2_contents
-	(krb5_context, krb5_sam_challenge_2 * );
-void KRB5_CALLCONV krb5_free_sam_challenge_2_body_contents
-	(krb5_context, krb5_sam_challenge_2_body * );
-void KRB5_CALLCONV krb5_free_sam_response_contents
-	(krb5_context, krb5_sam_response * );
-void KRB5_CALLCONV krb5_free_sam_response_2_contents
-	(krb5_context, krb5_sam_response_2 *);
-void KRB5_CALLCONV krb5_free_predicted_sam_response_contents
-	(krb5_context, krb5_predicted_sam_response * );
-void KRB5_CALLCONV krb5_free_enc_sam_response_enc_contents
-	(krb5_context, krb5_enc_sam_response_enc * );
-void KRB5_CALLCONV krb5_free_enc_sam_response_enc_2_contents
-	(krb5_context, krb5_enc_sam_response_enc_2 * );
-
-void KRB5_CALLCONV krb5_free_pa_enc_ts
-	(krb5_context, krb5_pa_enc_ts *);
-void KRB5_CALLCONV krb5_free_pa_for_user
-	(krb5_context, krb5_pa_for_user * );
-void KRB5_CALLCONV krb5_free_s4u_userid_contents
-	(krb5_context, krb5_s4u_userid * );
-void KRB5_CALLCONV krb5_free_pa_s4u_x509_user
-	(krb5_context, krb5_pa_s4u_x509_user * );
-void KRB5_CALLCONV krb5_free_pa_svr_referral_data
-	(krb5_context, krb5_pa_svr_referral_data * );
-void KRB5_CALLCONV krb5_free_pa_server_referral_data
-	(krb5_context, krb5_pa_server_referral_data * );
-void KRB5_CALLCONV krb5_free_pa_pac_req
-	(krb5_context, krb5_pa_pac_req * );
-void KRB5_CALLCONV krb5_free_etype_list
-	(krb5_context, krb5_etype_list * );
-
-void KRB5_CALLCONV krb5_free_fast_armor
-(krb5_context, krb5_fast_armor *);
-void KRB5_CALLCONV krb5_free_fast_armored_req
-(krb5_context, krb5_fast_armored_req *);
+krb5_get_init_creds(krb5_context context, krb5_creds *creds,
+                    krb5_principal client, krb5_prompter_fct prompter,
+                    void *prompter_data, krb5_deltat start_time,
+                    char *in_tkt_service, krb5_gic_opt_ext *gic_options,
+                    krb5_gic_get_as_key_fct gak, void *gak_data,
+                    int *master, krb5_kdc_rep **as_reply);
+
+krb5_error_code
+krb5int_populate_gic_opt (krb5_context, krb5_gic_opt_ext **,
+                          krb5_flags options, krb5_address *const *addrs,
+                          krb5_enctype *ktypes,
+                          krb5_preauthtype *pre_auth_types, krb5_creds *creds);
+
+
+krb5_error_code KRB5_CALLCONV
+krb5_do_preauth(krb5_context context, krb5_kdc_req *request,
+                krb5_data *encoded_request_body,
+                krb5_data *encoded_previous_request, krb5_pa_data **in_padata,
+                krb5_pa_data ***out_padata, krb5_data *salt,
+                krb5_data *s2kparams, krb5_enctype *etype,
+                krb5_keyblock *as_key, krb5_prompter_fct prompter,
+                void *prompter_data, krb5_gic_get_as_key_fct gak_fct,
+                void *gak_data, krb5_preauth_client_rock *get_data_rock,
+                krb5_gic_opt_ext *opte);
+
+krb5_error_code KRB5_CALLCONV
+krb5_do_preauth_tryagain(krb5_context context, krb5_kdc_req *request,
+                         krb5_data *encoded_request_body,
+                         krb5_data *encoded_previous_request,
+                         krb5_pa_data **in_padata, krb5_pa_data ***out_padata,
+                         krb5_error *err_reply,
+                         krb5_data *salt, krb5_data *s2kparams,
+                         krb5_enctype *etype, krb5_keyblock *as_key,
+                         krb5_prompter_fct prompter, void *prompter_data,
+                         krb5_gic_get_as_key_fct gak_fct, void *gak_data,
+                         krb5_preauth_client_rock *get_data_rock,
+                         krb5_gic_opt_ext *opte);
+
+void KRB5_CALLCONV krb5_init_preauth_context(krb5_context);
+void KRB5_CALLCONV krb5_free_preauth_context(krb5_context);
+void KRB5_CALLCONV krb5_clear_preauth_context_use_counts(krb5_context);
+void KRB5_CALLCONV krb5_preauth_prepare_request(krb5_context,
+                                                krb5_gic_opt_ext *,
+                                                krb5_kdc_req *);
+void KRB5_CALLCONV krb5_preauth_request_context_init(krb5_context);
+void KRB5_CALLCONV krb5_preauth_request_context_fini(krb5_context);
+
+void KRB5_CALLCONV
+krb5_free_sam_challenge(krb5_context, krb5_sam_challenge *);
+
+void KRB5_CALLCONV
+krb5_free_sam_challenge_2(krb5_context, krb5_sam_challenge_2 *);
+
+void KRB5_CALLCONV
+krb5_free_sam_challenge_2_body(krb5_context, krb5_sam_challenge_2_body *);
+
+void KRB5_CALLCONV
+krb5_free_sam_response(krb5_context, krb5_sam_response *);
+
+void KRB5_CALLCONV
+krb5_free_sam_response_2(krb5_context, krb5_sam_response_2 *);
+
+void KRB5_CALLCONV
+krb5_free_predicted_sam_response(krb5_context, krb5_predicted_sam_response *);
+
+void KRB5_CALLCONV
+krb5_free_enc_sam_response_enc(krb5_context, krb5_enc_sam_response_enc *);
+
+void KRB5_CALLCONV
+krb5_free_enc_sam_response_enc_2(krb5_context, krb5_enc_sam_response_enc_2 *);
+
+void KRB5_CALLCONV
+krb5_free_sam_challenge_contents(krb5_context, krb5_sam_challenge *);
+
+void KRB5_CALLCONV
+krb5_free_sam_challenge_2_contents(krb5_context, krb5_sam_challenge_2 *);
+
+void KRB5_CALLCONV
+krb5_free_sam_challenge_2_body_contents(krb5_context,
+                                        krb5_sam_challenge_2_body *);
+
+void KRB5_CALLCONV
+krb5_free_sam_response_contents(krb5_context, krb5_sam_response *);
+
+void KRB5_CALLCONV
+krb5_free_sam_response_2_contents(krb5_context, krb5_sam_response_2 *);
+
+void KRB5_CALLCONV
+krb5_free_predicted_sam_response_contents(krb5_context,
+                                          krb5_predicted_sam_response * );
+
+void KRB5_CALLCONV
+krb5_free_enc_sam_response_enc_contents(krb5_context,
+                                        krb5_enc_sam_response_enc * );
+
+void KRB5_CALLCONV
+krb5_free_enc_sam_response_enc_2_contents(krb5_context,
+                                          krb5_enc_sam_response_enc_2 * );
+
+void KRB5_CALLCONV
+krb5_free_pa_enc_ts(krb5_context, krb5_pa_enc_ts *);
+
+void KRB5_CALLCONV
+krb5_free_pa_for_user(krb5_context, krb5_pa_for_user *);
+
+void KRB5_CALLCONV
+krb5_free_s4u_userid_contents(krb5_context, krb5_s4u_userid *);
+
+void KRB5_CALLCONV
+krb5_free_pa_s4u_x509_user(krb5_context, krb5_pa_s4u_x509_user *);
+
+void KRB5_CALLCONV
+krb5_free_pa_svr_referral_data(krb5_context, krb5_pa_svr_referral_data *);
+
+void KRB5_CALLCONV
+krb5_free_pa_server_referral_data(krb5_context,
+                                  krb5_pa_server_referral_data * );
+
+void KRB5_CALLCONV
+krb5_free_pa_pac_req(krb5_context, krb5_pa_pac_req * );
+
+void KRB5_CALLCONV
+krb5_free_etype_list(krb5_context, krb5_etype_list * );
+
+void KRB5_CALLCONV krb5_free_fast_armor(krb5_context, krb5_fast_armor *);
+void KRB5_CALLCONV krb5_free_fast_armored_req(krb5_context,
+                                              krb5_fast_armored_req *);
 void KRB5_CALLCONV krb5_free_fast_req(krb5_context, krb5_fast_req *);
-void KRB5_CALLCONV krb5_free_fast_finished
-(krb5_context, krb5_fast_finished *);
-void KRB5_CALLCONV krb5_free_fast_response
-(krb5_context, krb5_fast_response *);
-void KRB5_CALLCONV krb5_free_ad_kdcissued
-(krb5_context, krb5_ad_kdcissued *);
-void KRB5_CALLCONV krb5_free_ad_signedpath
-(krb5_context, krb5_ad_signedpath *);
+void KRB5_CALLCONV krb5_free_fast_finished(krb5_context, krb5_fast_finished *);
+void KRB5_CALLCONV krb5_free_fast_response(krb5_context, krb5_fast_response *);
+void KRB5_CALLCONV krb5_free_ad_kdcissued(krb5_context, krb5_ad_kdcissued *);
+void KRB5_CALLCONV krb5_free_ad_signedpath(krb5_context, krb5_ad_signedpath *);
 
 /* #include "krb5/wordsize.h" -- comes in through base-defs.h. */
 #include "com_err.h"
@@ -1414,131 +1370,120 @@ struct _krb5_authdata_context {
     krb5_magic magic;
     int n_modules;
     struct _krb5_authdata_context_module {
-	krb5_authdatatype ad_type;
-	void *plugin_context;
+        krb5_authdatatype ad_type;
+        void *plugin_context;
         authdata_client_plugin_fini_proc client_fini;
-	krb5_flags flags;
-	krb5plugin_authdata_client_ftable_v0 *ftable;
-	authdata_client_request_init_proc client_req_init;
-	authdata_client_request_fini_proc client_req_fini;
-	const char *name;
-	void *request_context;
-	void **request_context_pp;
+        krb5_flags flags;
+        krb5plugin_authdata_client_ftable_v0 *ftable;
+        authdata_client_request_init_proc client_req_init;
+        authdata_client_request_fini_proc client_req_fini;
+        const char *name;
+        void *request_context;
+        void **request_context_pp;
     } *modules;
     struct plugin_dir_handle plugins;
 };
 
 typedef struct _krb5_authdata_context *krb5_authdata_context;
 
-void KRB5_CALLCONV krb5int_free_data_list
-(krb5_context context, krb5_data *data);
+void KRB5_CALLCONV
+krb5int_free_data_list(krb5_context context, krb5_data *data);
 
-krb5_error_code KRB5_CALLCONV krb5_authdata_context_init
-(krb5_context kcontext, krb5_authdata_context *pcontext);
+krb5_error_code KRB5_CALLCONV
+krb5_authdata_context_init(krb5_context kcontext,
+                           krb5_authdata_context *pcontext);
 
 void KRB5_CALLCONV
-krb5_authdata_context_free
-(krb5_context kcontext, krb5_authdata_context context);
+krb5_authdata_context_free(krb5_context kcontext,
+                           krb5_authdata_context context);
+
+krb5_error_code KRB5_CALLCONV
+krb5_authdata_export_authdata(krb5_context kcontext,
+                              krb5_authdata_context context, krb5_flags usage,
+                              krb5_authdata ***pauthdata);
+
+krb5_error_code KRB5_CALLCONV
+krb5_authdata_get_attribute_types(krb5_context kcontext,
+                                  krb5_authdata_context context,
+                                  krb5_data **attrs);
+
+krb5_error_code KRB5_CALLCONV
+krb5_authdata_get_attribute(krb5_context kcontext,
+                            krb5_authdata_context context,
+                            const krb5_data *attribute,
+                            krb5_boolean *authenticated,
+                            krb5_boolean *complete, krb5_data *value,
+                            krb5_data *display_value, int *more);
+
+krb5_error_code KRB5_CALLCONV
+krb5_authdata_set_attribute(krb5_context kcontext,
+                            krb5_authdata_context context,
+                            krb5_boolean complete, const krb5_data *attribute,
+                            const krb5_data *value);
+
+krb5_error_code KRB5_CALLCONV
+krb5_authdata_delete_attribute(krb5_context kcontext,
+                               krb5_authdata_context context,
+                               const krb5_data *attribute);
 
-krb5_error_code KRB5_CALLCONV krb5_authdata_export_authdata
-(krb5_context kcontext,
- krb5_authdata_context context,
- krb5_flags usage,
- krb5_authdata ***pauthdata);
+krb5_error_code KRB5_CALLCONV
+krb5_authdata_import_attributes(krb5_context kcontext,
+                                krb5_authdata_context context,
+                                krb5_flags usage, const krb5_data *attributes);
+
+krb5_error_code KRB5_CALLCONV
+krb5_authdata_export_attributes(krb5_context kcontext,
+                                krb5_authdata_context context,
+                                krb5_flags usage, krb5_data **pattributes);
 
 krb5_error_code KRB5_CALLCONV
-krb5_authdata_get_attribute_types
-(krb5_context kcontext,
- krb5_authdata_context context,
- krb5_data **attrs);
-
-krb5_error_code KRB5_CALLCONV krb5_authdata_get_attribute
-(krb5_context kcontext,
- krb5_authdata_context context,
- const krb5_data *attribute,
- krb5_boolean *authenticated,
- krb5_boolean *complete,
- krb5_data *value,
- krb5_data *display_value,
- int *more);
-
-krb5_error_code KRB5_CALLCONV krb5_authdata_set_attribute
-(krb5_context kcontext,
- krb5_authdata_context context,
- krb5_boolean complete,
- const krb5_data *attribute,
- const krb5_data *value);
+krb5_authdata_export_internal(krb5_context kcontext,
+                              krb5_authdata_context context,
+                              krb5_boolean restrict_authenticated,
+                              const char *module, void **ptr);
 
 krb5_error_code KRB5_CALLCONV
-krb5_authdata_delete_attribute
-(krb5_context kcontext,
- krb5_authdata_context context,
- const krb5_data *attribute);
-
-krb5_error_code KRB5_CALLCONV krb5_authdata_import_attributes
-(krb5_context kcontext,
- krb5_authdata_context context,
- krb5_flags usage,
- const krb5_data *attributes);
-
-krb5_error_code KRB5_CALLCONV krb5_authdata_export_attributes
-(krb5_context kcontext,
- krb5_authdata_context context,
- krb5_flags usage,
- krb5_data **pattributes);
-
-krb5_error_code KRB5_CALLCONV krb5_authdata_export_internal
-(krb5_context kcontext,
- krb5_authdata_context context,
- krb5_boolean restrict_authenticated,
- const char *module,
- void **ptr);
-
-krb5_error_code KRB5_CALLCONV krb5_authdata_context_copy
-(krb5_context kcontext,
- krb5_authdata_context src,
- krb5_authdata_context *dst);
-
-krb5_error_code KRB5_CALLCONV krb5_authdata_free_internal
-(krb5_context kcontext,
- krb5_authdata_context context,
- const char *module,
- void *ptr);
-
-
-struct _kdb5_dal_handle;	/* private, in kdb5.h */
+krb5_authdata_context_copy(krb5_context kcontext, krb5_authdata_context src,
+                           krb5_authdata_context *dst);
+
+krb5_error_code KRB5_CALLCONV
+krb5_authdata_free_internal(krb5_context kcontext,
+                            krb5_authdata_context context, const char *module,
+                            void *ptr);
+
+struct _kdb5_dal_handle;        /* private, in kdb5.h */
 typedef struct _kdb5_dal_handle kdb5_dal_handle;
 struct _kdb_log_context;
 struct _krb5_context {
-	krb5_magic	magic;
-	krb5_enctype	*in_tkt_etypes;
-	krb5_enctype	*tgs_etypes;
-	struct _krb5_os_context	os_context;
-	char		*default_realm;
-	profile_t	profile;
-	kdb5_dal_handle	*dal_handle;
-	int		ser_ctx_count;
-	void		*ser_ctx;
-	/* allowable clock skew */
-	krb5_deltat 	clockskew;
-	krb5_cksumtype	kdc_req_sumtype;
-	krb5_cksumtype	default_ap_req_sumtype;
-	krb5_cksumtype	default_safe_sumtype;
-	krb5_flags 	kdc_default_options;
-	krb5_flags	library_options;
-	krb5_boolean	profile_secure;
-	int		fcc_default_format;
-	krb5_prompt_type *prompt_types;
-	/* Message size above which we'll try TCP first in send-to-kdc
-	   type code.  Aside from the 2**16 size limit, we put no
-	   absolute limit on the UDP packet size.  */
-	int		udp_pref_limit;
-
-	/* Use the config-file ktypes instead of app-specified?  */
-	krb5_boolean	use_conf_ktypes;
+    krb5_magic      magic;
+    krb5_enctype    *in_tkt_etypes;
+    krb5_enctype    *tgs_etypes;
+    struct _krb5_os_context os_context;
+    char            *default_realm;
+    profile_t       profile;
+    kdb5_dal_handle *dal_handle;
+    int             ser_ctx_count;
+    void            *ser_ctx;
+    /* allowable clock skew */
+    krb5_deltat     clockskew;
+    krb5_cksumtype  kdc_req_sumtype;
+    krb5_cksumtype  default_ap_req_sumtype;
+    krb5_cksumtype  default_safe_sumtype;
+    krb5_flags      kdc_default_options;
+    krb5_flags      library_options;
+    krb5_boolean    profile_secure;
+    int             fcc_default_format;
+    krb5_prompt_type *prompt_types;
+    /* Message size above which we'll try TCP first in send-to-kdc
+       type code.  Aside from the 2**16 size limit, we put no
+       absolute limit on the UDP packet size.  */
+    int             udp_pref_limit;
+
+    /* Use the config-file ktypes instead of app-specified?  */
+    krb5_boolean    use_conf_ktypes;
 
 #ifdef KRB5_DNS_LOOKUP
-        krb5_boolean    profile_in_memory;
+    krb5_boolean    profile_in_memory;
 #endif /* KRB5_DNS_LOOKUP */
 
     /* locate_kdc module stuff */
@@ -1562,43 +1507,40 @@ struct _krb5_context {
 /* could be used in a table to find an etype and initialize a block */
 
 
-#define KRB5_LIBOPT_SYNC_KDCTIME	0x0001
+#define KRB5_LIBOPT_SYNC_KDCTIME        0x0001
 
 /* internal message representations */
 
 typedef struct _krb5_safe {
     krb5_magic magic;
-    krb5_data user_data;		/* user data */
-    krb5_timestamp timestamp;		/* client time, optional */
-    krb5_int32 usec;			/* microsecond portion of time,
-					   optional */
-    krb5_ui_4 seq_number;		/* sequence #, optional */
-    krb5_address *s_address;	/* sender address */
-    krb5_address *r_address;	/* recipient address, optional */
-    krb5_checksum *checksum;	/* data integrity checksum */
+    krb5_data user_data;                /* user data */
+    krb5_timestamp timestamp;           /* client time, optional */
+    krb5_int32 usec;                    /* microsecond portion of time,
+                                           optional */
+    krb5_ui_4 seq_number;               /* sequence #, optional */
+    krb5_address *s_address;    /* sender address */
+    krb5_address *r_address;    /* recipient address, optional */
+    krb5_checksum *checksum;    /* data integrity checksum */
 } krb5_safe;
 
 typedef struct _krb5_priv {
     krb5_magic magic;
-    krb5_enc_data enc_part;		/* encrypted part */
+    krb5_enc_data enc_part;             /* encrypted part */
 } krb5_priv;
 
 typedef struct _krb5_priv_enc_part {
     krb5_magic magic;
-    krb5_data user_data;		/* user data */
-    krb5_timestamp timestamp;		/* client time, optional */
-    krb5_int32 usec;			/* microsecond portion of time, opt. */
-    krb5_ui_4 seq_number;		/* sequence #, optional */
-    krb5_address *s_address;	/* sender address */
-    krb5_address *r_address;	/* recipient address, optional */
+    krb5_data user_data;                /* user data */
+    krb5_timestamp timestamp;           /* client time, optional */
+    krb5_int32 usec;                    /* microsecond portion of time, opt. */
+    krb5_ui_4 seq_number;               /* sequence #, optional */
+    krb5_address *s_address;    /* sender address */
+    krb5_address *r_address;    /* recipient address, optional */
 } krb5_priv_enc_part;
 
-void KRB5_CALLCONV krb5_free_safe
-	(krb5_context, krb5_safe * );
-void KRB5_CALLCONV krb5_free_priv
-	(krb5_context, krb5_priv * );
-void KRB5_CALLCONV krb5_free_priv_enc_part
-	(krb5_context, krb5_priv_enc_part * );
+void KRB5_CALLCONV krb5_free_safe(krb5_context, krb5_safe *);
+void KRB5_CALLCONV krb5_free_priv(krb5_context, krb5_priv *);
+void KRB5_CALLCONV krb5_free_priv_enc_part(krb5_context, krb5_priv_enc_part *);
 
 /*
  * Begin "asn1.h"
@@ -1626,11 +1568,11 @@ void KRB5_CALLCONV krb5_free_priv_enc_part
   EncKrbPrivPart is APPLICATION 28.
   EncKrbCredPart is APPLICATION 29.
   KRB_ERROR is APPLICATION 30.
- */
+*/
 /* allow either constructed or primitive encoding, so check for bit 6
    set or reset */
-#define krb5int_is_app_tag(dat,tag)\
-    ((dat) && (dat)->length && \
+#define krb5int_is_app_tag(dat,tag)                     \
+    ((dat) && (dat)->length &&                          \
      ((((dat)->data[0] & ~0x20) == ((tag) | 0x40))))
 #define krb5_is_krb_ticket(dat)               krb5int_is_app_tag(dat, 1)
 #define krb5_is_krb_authenticator(dat)        krb5int_is_app_tag(dat, 2)
@@ -1655,380 +1597,400 @@ void KRB5_CALLCONV krb5_free_priv_enc_part
  *************************************************************************/
 
 /*
-   krb5_error_code encode_krb5_structure(const krb5_structure *rep,
-					 krb5_data **code);
-   modifies  *code
-   effects   Returns the ASN.1 encoding of *rep in **code.
-             Returns ASN1_MISSING_FIELD if a required field is emtpy in *rep.
-             Returns ENOMEM if memory runs out.
+  krb5_error_code encode_krb5_structure(const krb5_structure *rep,
+  krb5_data **code);
+  modifies  *code
+  effects   Returns the ASN.1 encoding of *rep in **code.
+  Returns ASN1_MISSING_FIELD if a required field is emtpy in *rep.
+  Returns ENOMEM if memory runs out.
 */
 
-krb5_error_code encode_krb5_authenticator
-	(const krb5_authenticator *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_authenticator(const krb5_authenticator *rep, krb5_data **code);
 
-krb5_error_code encode_krb5_ticket
-	(const krb5_ticket *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_ticket(const krb5_ticket *rep, krb5_data **code);
 
-krb5_error_code encode_krb5_encryption_key
-	(const krb5_keyblock *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_encryption_key(const krb5_keyblock *rep, krb5_data **code);
 
-krb5_error_code encode_krb5_enc_tkt_part
-	(const krb5_enc_tkt_part *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_enc_tkt_part(const krb5_enc_tkt_part *rep, krb5_data **code);
 
-krb5_error_code encode_krb5_enc_kdc_rep_part
-	(const krb5_enc_kdc_rep_part *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_enc_kdc_rep_part(const krb5_enc_kdc_rep_part *rep,
+                             krb5_data **code);
 
 /* yes, the translation is identical to that used for KDC__REP */
-krb5_error_code encode_krb5_as_rep
-	(const krb5_kdc_rep *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_as_rep(const krb5_kdc_rep *rep, krb5_data **code);
 
 /* yes, the translation is identical to that used for KDC__REP */
-krb5_error_code encode_krb5_tgs_rep
-	(const krb5_kdc_rep *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_tgs_rep(const krb5_kdc_rep *rep, krb5_data **code);
 
-krb5_error_code encode_krb5_ap_req
-	(const krb5_ap_req *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_ap_req(const krb5_ap_req *rep, krb5_data **code);
 
-krb5_error_code encode_krb5_ap_rep
-	(const krb5_ap_rep *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_ap_rep(const krb5_ap_rep *rep, krb5_data **code);
 
-krb5_error_code encode_krb5_ap_rep_enc_part
-	(const krb5_ap_rep_enc_part *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_ap_rep_enc_part(const krb5_ap_rep_enc_part *rep, krb5_data **code);
 
-krb5_error_code encode_krb5_as_req
-	(const krb5_kdc_req *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_as_req(const krb5_kdc_req *rep, krb5_data **code);
 
-krb5_error_code encode_krb5_tgs_req
-	(const krb5_kdc_req *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_tgs_req(const krb5_kdc_req *rep, krb5_data **code);
 
-krb5_error_code encode_krb5_kdc_req_body
-	(const krb5_kdc_req *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_kdc_req_body(const krb5_kdc_req *rep, krb5_data **code);
 
-krb5_error_code encode_krb5_safe
-	(const krb5_safe *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_safe(const krb5_safe *rep, krb5_data **code);
 
 struct krb5_safe_with_body {
     krb5_safe *safe;
     krb5_data *body;
 };
-krb5_error_code encode_krb5_safe_with_body
-	(const struct krb5_safe_with_body *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_safe_with_body(const struct krb5_safe_with_body *rep,
+                           krb5_data **code);
 
-krb5_error_code encode_krb5_priv
-	(const krb5_priv *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_priv(const krb5_priv *rep, krb5_data **code);
 
-krb5_error_code encode_krb5_enc_priv_part
-	(const krb5_priv_enc_part *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_enc_priv_part(const krb5_priv_enc_part *rep, krb5_data **code);
 
-krb5_error_code encode_krb5_cred
-	(const krb5_cred *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_cred(const krb5_cred *rep, krb5_data **code);
 
-krb5_error_code encode_krb5_enc_cred_part
-	(const krb5_cred_enc_part *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_enc_cred_part(const krb5_cred_enc_part *rep, krb5_data **code);
 
-krb5_error_code encode_krb5_error
-	(const krb5_error *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_error(const krb5_error *rep, krb5_data **code);
 
-krb5_error_code encode_krb5_authdata
-	(krb5_authdata *const *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_authdata(krb5_authdata *const *rep, krb5_data **code);
 
-krb5_error_code encode_krb5_authdata_elt
-	(const krb5_authdata *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_authdata_elt(const krb5_authdata *rep, krb5_data **code);
 
-krb5_error_code encode_krb5_pwd_sequence
-	(const passwd_phrase_element *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_pwd_sequence(const passwd_phrase_element *rep, krb5_data **code);
 
-krb5_error_code encode_krb5_pwd_data
-	(const krb5_pwd_data *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_pwd_data(const krb5_pwd_data *rep, krb5_data **code);
+
+krb5_error_code
+encode_krb5_padata_sequence(krb5_pa_data *const *rep, krb5_data **code);
 
-krb5_error_code encode_krb5_padata_sequence
-	(krb5_pa_data *const *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_alt_method(const krb5_alt_method *, krb5_data **code);
 
-krb5_error_code encode_krb5_alt_method
-	(const krb5_alt_method *, krb5_data **code);
+krb5_error_code
+encode_krb5_etype_info(krb5_etype_info_entry *const *, krb5_data **code);
 
-krb5_error_code encode_krb5_etype_info
-	(krb5_etype_info_entry *const *, krb5_data **code);
-krb5_error_code encode_krb5_etype_info2
-	(krb5_etype_info_entry *const *, krb5_data **code);
+krb5_error_code
+encode_krb5_etype_info2(krb5_etype_info_entry *const *, krb5_data **code);
 
-krb5_error_code encode_krb5_enc_data
-    	(const krb5_enc_data *, krb5_data **);
+krb5_error_code
+encode_krb5_enc_data(const krb5_enc_data *, krb5_data **);
 
-krb5_error_code encode_krb5_pa_enc_ts
-    	(const krb5_pa_enc_ts *, krb5_data **);
+krb5_error_code
+encode_krb5_pa_enc_ts(const krb5_pa_enc_ts *, krb5_data **);
 
-krb5_error_code encode_krb5_sam_challenge
-	(const krb5_sam_challenge * , krb5_data **);
+krb5_error_code
+encode_krb5_sam_challenge(const krb5_sam_challenge * , krb5_data **);
 
-krb5_error_code encode_krb5_sam_key
-	(const krb5_sam_key * , krb5_data **);
+krb5_error_code
+encode_krb5_sam_key(const krb5_sam_key * , krb5_data **);
 
-krb5_error_code encode_krb5_enc_sam_response_enc
-	(const krb5_enc_sam_response_enc * , krb5_data **);
+krb5_error_code
+encode_krb5_enc_sam_response_enc(const krb5_enc_sam_response_enc *,
+                                 krb5_data **);
 
-krb5_error_code encode_krb5_sam_response
-	(const krb5_sam_response * , krb5_data **);
+krb5_error_code
+encode_krb5_sam_response(const krb5_sam_response *, krb5_data **);
 
 #if 0 /* currently not compiled because we never use them */
-krb5_error_code encode_krb5_sam_challenge_2
-	(const krb5_sam_challenge_2 * , krb5_data **);
+krb5_error_code
+encode_krb5_sam_challenge_2(const krb5_sam_challenge_2 * , krb5_data **);
 
-krb5_error_code encode_krb5_sam_challenge_2_body
-	(const krb5_sam_challenge_2_body * , krb5_data **);
+krb5_error_code
+encode_krb5_sam_challenge_2_body(const krb5_sam_challenge_2_body *,
+                                 krb5_data **);
 #endif
 
-krb5_error_code encode_krb5_enc_sam_response_enc_2
-	(const krb5_enc_sam_response_enc_2 * , krb5_data **);
+krb5_error_code
+encode_krb5_enc_sam_response_enc_2(const krb5_enc_sam_response_enc_2 *,
+                                   krb5_data **);
 
-krb5_error_code encode_krb5_sam_response_2
-	(const krb5_sam_response_2 * , krb5_data **);
+krb5_error_code
+encode_krb5_sam_response_2(const krb5_sam_response_2 * , krb5_data **);
 
-krb5_error_code encode_krb5_predicted_sam_response
-	(const krb5_predicted_sam_response * , krb5_data **);
+krb5_error_code
+encode_krb5_predicted_sam_response(const krb5_predicted_sam_response *,
+                                   krb5_data **);
 
 struct krb5_setpw_req {
     krb5_principal target;
     krb5_data password;
 };
-krb5_error_code encode_krb5_setpw_req
-	(const struct krb5_setpw_req *rep, krb5_data **code);
+krb5_error_code
+encode_krb5_setpw_req(const struct krb5_setpw_req *rep, krb5_data **code);
+
+krb5_error_code
+encode_krb5_pa_for_user(const krb5_pa_for_user *, krb5_data **);
+
+krb5_error_code
+encode_krb5_s4u_userid(const krb5_s4u_userid *, krb5_data **);
+
+krb5_error_code
+encode_krb5_pa_s4u_x509_user(const krb5_pa_s4u_x509_user *, krb5_data **);
+
+krb5_error_code
+encode_krb5_pa_svr_referral_data(const krb5_pa_svr_referral_data *,
+                                 krb5_data **);
 
-krb5_error_code encode_krb5_pa_for_user
-	(const krb5_pa_for_user * , krb5_data **);
+krb5_error_code
+encode_krb5_pa_server_referral_data(const krb5_pa_server_referral_data *,
+                                    krb5_data **);
 
-krb5_error_code encode_krb5_s4u_userid
-	(const krb5_s4u_userid * , krb5_data **);
+krb5_error_code
+encode_krb5_pa_pac_req(const krb5_pa_pac_req *, krb5_data **);
 
-krb5_error_code encode_krb5_pa_s4u_x509_user
-	(const krb5_pa_s4u_x509_user * , krb5_data **);
+krb5_error_code
+encode_krb5_etype_list(const krb5_etype_list * , krb5_data **);
 
-krb5_error_code encode_krb5_pa_svr_referral_data
-	(const krb5_pa_svr_referral_data * , krb5_data **);
+krb5_error_code
+encode_krb5_pa_fx_fast_request(const krb5_fast_armored_req *, krb5_data **);
 
-krb5_error_code encode_krb5_pa_server_referral_data
-	(const krb5_pa_server_referral_data * , krb5_data **);
+krb5_error_code
+encode_krb5_fast_req(const krb5_fast_req *, krb5_data **);
 
-krb5_error_code encode_krb5_pa_pac_req
-	(const krb5_pa_pac_req * , krb5_data **);
+krb5_error_code
+encode_krb5_pa_fx_fast_reply(const krb5_enc_data *, krb5_data **);
 
-krb5_error_code encode_krb5_etype_list
-	(const krb5_etype_list * , krb5_data **);
+krb5_error_code
+encode_krb5_fast_response(const krb5_fast_response *, krb5_data **);
 
-krb5_error_code encode_krb5_pa_fx_fast_request
-(const krb5_fast_armored_req *, krb5_data **);
-krb5_error_code encode_krb5_fast_req
-(const krb5_fast_req *, krb5_data **);
-krb5_error_code encode_krb5_pa_fx_fast_reply
-(const krb5_enc_data *, krb5_data **);
+krb5_error_code
+encode_krb5_ad_kdcissued(const krb5_ad_kdcissued *, krb5_data **);
 
-krb5_error_code encode_krb5_fast_response
-(const krb5_fast_response *, krb5_data **);
+krb5_error_code
+encode_krb5_ad_signedpath(const krb5_ad_signedpath *, krb5_data **);
 
-krb5_error_code encode_krb5_ad_kdcissued
-(const krb5_ad_kdcissued *, krb5_data **);
-krb5_error_code encode_krb5_ad_signedpath
-(const krb5_ad_signedpath *, krb5_data **);
-krb5_error_code encode_krb5_ad_signedpath_data
-(const krb5_ad_signedpath_data *, krb5_data **);
+krb5_error_code
+encode_krb5_ad_signedpath_data(const krb5_ad_signedpath_data *, krb5_data **);
 
 /*************************************************************************
  * End of prototypes for krb5_encode.c
  *************************************************************************/
 
-krb5_error_code decode_krb5_sam_challenge
-       (const krb5_data *, krb5_sam_challenge **);
+krb5_error_code
+decode_krb5_sam_challenge(const krb5_data *, krb5_sam_challenge **);
 
-krb5_error_code decode_krb5_enc_sam_key
-       (const krb5_data *, krb5_sam_key **);
+krb5_error_code
+decode_krb5_enc_sam_key(const krb5_data *, krb5_sam_key **);
 
-krb5_error_code decode_krb5_enc_sam_response_enc
-       (const krb5_data *, krb5_enc_sam_response_enc **);
+krb5_error_code
+decode_krb5_enc_sam_response_enc(const krb5_data *,
+                                 krb5_enc_sam_response_enc **);
 
-krb5_error_code decode_krb5_sam_response
-       (const krb5_data *, krb5_sam_response **);
+krb5_error_code
+decode_krb5_sam_response(const krb5_data *, krb5_sam_response **);
 
-krb5_error_code decode_krb5_predicted_sam_response
-       (const krb5_data *, krb5_predicted_sam_response **);
+krb5_error_code
+decode_krb5_predicted_sam_response(const krb5_data *,
+                                   krb5_predicted_sam_response **);
 
-krb5_error_code decode_krb5_sam_challenge_2
-	(const krb5_data *, krb5_sam_challenge_2 **);
+krb5_error_code
+decode_krb5_sam_challenge_2(const krb5_data *, krb5_sam_challenge_2 **);
 
-krb5_error_code decode_krb5_sam_challenge_2_body
-	(const krb5_data *, krb5_sam_challenge_2_body **);
+krb5_error_code
+decode_krb5_sam_challenge_2_body(const krb5_data *,
+                                 krb5_sam_challenge_2_body **);
 
-krb5_error_code decode_krb5_enc_sam_response_enc_2
-	(const krb5_data *, krb5_enc_sam_response_enc_2 **);
+krb5_error_code
+decode_krb5_enc_sam_response_enc_2(const krb5_data *,
+                                   krb5_enc_sam_response_enc_2 **);
 
-krb5_error_code decode_krb5_sam_response_2
-	(const krb5_data *, krb5_sam_response_2 **);
+krb5_error_code
+decode_krb5_sam_response_2(const krb5_data *, krb5_sam_response_2 **);
 
 
 /*************************************************************************
  * Prototypes for krb5_decode.c
  *************************************************************************/
 
-krb5_error_code krb5_validate_times
-       (krb5_context,
-		       krb5_ticket_times *);
+krb5_error_code
+krb5_validate_times(krb5_context, krb5_ticket_times *);
 
 /*
-   krb5_error_code decode_krb5_structure(const krb5_data *code,
-                                         krb5_structure **rep);
-
-   requires  Expects **rep to not have been allocated;
-              a new *rep is allocated regardless of the old value.
-   effects   Decodes *code into **rep.
-	     Returns ENOMEM if memory is exhausted.
-             Returns asn1 and krb5 errors.
+  krb5_error_code decode_krb5_structure(const krb5_data *code,
+  krb5_structure **rep);
+
+  requires  Expects **rep to not have been allocated;
+  a new *rep is allocated regardless of the old value.
+  effects   Decodes *code into **rep.
+  Returns ENOMEM if memory is exhausted.
+  Returns asn1 and krb5 errors.
 */
 
-krb5_error_code decode_krb5_authenticator
-	(const krb5_data *code, krb5_authenticator **rep);
-
-krb5_error_code decode_krb5_ticket
-	(const krb5_data *code, krb5_ticket **rep);
+krb5_error_code
+decode_krb5_authenticator(const krb5_data *code, krb5_authenticator **rep);
 
-krb5_error_code decode_krb5_encryption_key
-	(const krb5_data *output, krb5_keyblock **rep);
+krb5_error_code
+decode_krb5_ticket(const krb5_data *code, krb5_ticket **rep);
 
-krb5_error_code decode_krb5_enc_tkt_part
-	(const krb5_data *output, krb5_enc_tkt_part **rep);
+krb5_error_code
+decode_krb5_encryption_key(const krb5_data *output, krb5_keyblock **rep);
 
-krb5_error_code decode_krb5_enc_kdc_rep_part
-	(const krb5_data *output, krb5_enc_kdc_rep_part **rep);
+krb5_error_code
+decode_krb5_enc_tkt_part(const krb5_data *output, krb5_enc_tkt_part **rep);
 
-krb5_error_code decode_krb5_as_rep
-	(const krb5_data *output, krb5_kdc_rep **rep);
+krb5_error_code
+decode_krb5_enc_kdc_rep_part(const krb5_data *output,
+                             krb5_enc_kdc_rep_part **rep);
 
-krb5_error_code decode_krb5_tgs_rep
-	(const krb5_data *output, krb5_kdc_rep **rep);
+krb5_error_code
+decode_krb5_as_rep(const krb5_data *output, krb5_kdc_rep **rep);
 
-krb5_error_code decode_krb5_ap_req
-	(const krb5_data *output, krb5_ap_req **rep);
+krb5_error_code
+decode_krb5_tgs_rep(const krb5_data *output, krb5_kdc_rep **rep);
 
-krb5_error_code decode_krb5_ap_rep
-	(const krb5_data *output, krb5_ap_rep **rep);
+krb5_error_code
+decode_krb5_ap_req(const krb5_data *output, krb5_ap_req **rep);
 
-krb5_error_code decode_krb5_ap_rep_enc_part
-	(const krb5_data *output, krb5_ap_rep_enc_part **rep);
+krb5_error_code
+decode_krb5_ap_rep(const krb5_data *output, krb5_ap_rep **rep);
 
-krb5_error_code decode_krb5_as_req
-	(const krb5_data *output, krb5_kdc_req **rep);
+krb5_error_code
+decode_krb5_ap_rep_enc_part(const krb5_data *output,
+                            krb5_ap_rep_enc_part **rep);
 
-krb5_error_code decode_krb5_tgs_req
-	(const krb5_data *output, krb5_kdc_req **rep);
+krb5_error_code
+decode_krb5_as_req(const krb5_data *output, krb5_kdc_req **rep);
 
-krb5_error_code decode_krb5_kdc_req_body
-	(const krb5_data *output, krb5_kdc_req **rep);
+krb5_error_code
+decode_krb5_tgs_req(const krb5_data *output, krb5_kdc_req **rep);
 
-krb5_error_code decode_krb5_safe
-	(const krb5_data *output, krb5_safe **rep);
+krb5_error_code
+decode_krb5_kdc_req_body(const krb5_data *output, krb5_kdc_req **rep);
 
-krb5_error_code decode_krb5_safe_with_body
-	(const krb5_data *output, krb5_safe **rep, krb5_data *body);
+krb5_error_code
+decode_krb5_safe(const krb5_data *output, krb5_safe **rep);
 
-krb5_error_code decode_krb5_priv
-	(const krb5_data *output, krb5_priv **rep);
+krb5_error_code
+decode_krb5_safe_with_body(const krb5_data *output, krb5_safe **rep,
+                           krb5_data *body);
 
-krb5_error_code decode_krb5_enc_priv_part
-	(const krb5_data *output, krb5_priv_enc_part **rep);
+krb5_error_code
+decode_krb5_priv(const krb5_data *output, krb5_priv **rep);
 
-krb5_error_code decode_krb5_cred
-	(const krb5_data *output, krb5_cred **rep);
+krb5_error_code
+decode_krb5_enc_priv_part(const krb5_data *output, krb5_priv_enc_part **rep);
 
-krb5_error_code decode_krb5_enc_cred_part
-	(const krb5_data *output, krb5_cred_enc_part **rep);
+krb5_error_code
+decode_krb5_cred(const krb5_data *output, krb5_cred **rep);
 
-krb5_error_code decode_krb5_error
-	(const krb5_data *output, krb5_error **rep);
+krb5_error_code
+decode_krb5_enc_cred_part(const krb5_data *output, krb5_cred_enc_part **rep);
 
-krb5_error_code decode_krb5_authdata
-	(const krb5_data *output, krb5_authdata ***rep);
+krb5_error_code
+decode_krb5_error(const krb5_data *output, krb5_error **rep);
 
-krb5_error_code decode_krb5_pwd_sequence
-	(const krb5_data *output, passwd_phrase_element **rep);
+krb5_error_code
+decode_krb5_authdata(const krb5_data *output, krb5_authdata ***rep);
 
-krb5_error_code decode_krb5_pwd_data
-	(const krb5_data *output, krb5_pwd_data **rep);
+krb5_error_code
+decode_krb5_pwd_sequence(const krb5_data *output, passwd_phrase_element **rep);
 
-krb5_error_code decode_krb5_padata_sequence
-	(const krb5_data *output, krb5_pa_data ***rep);
+krb5_error_code
+decode_krb5_pwd_data(const krb5_data *output, krb5_pwd_data **rep);
 
-krb5_error_code decode_krb5_alt_method
-	(const krb5_data *output, krb5_alt_method **rep);
+krb5_error_code
+decode_krb5_padata_sequence(const krb5_data *output, krb5_pa_data ***rep);
 
-krb5_error_code decode_krb5_etype_info
-	(const krb5_data *output, krb5_etype_info_entry ***rep);
+krb5_error_code
+decode_krb5_alt_method(const krb5_data *output, krb5_alt_method **rep);
 
-krb5_error_code decode_krb5_etype_info2
-	(const krb5_data *output, krb5_etype_info_entry ***rep);
+krb5_error_code
+decode_krb5_etype_info(const krb5_data *output, krb5_etype_info_entry ***rep);
 
-krb5_error_code decode_krb5_enc_data
-	(const krb5_data *output, krb5_enc_data **rep);
+krb5_error_code
+decode_krb5_etype_info2(const krb5_data *output, krb5_etype_info_entry ***rep);
 
-krb5_error_code decode_krb5_pa_enc_ts
-	(const krb5_data *output, krb5_pa_enc_ts **rep);
+krb5_error_code
+decode_krb5_enc_data(const krb5_data *output, krb5_enc_data **rep);
 
-krb5_error_code decode_krb5_sam_key
-	(const krb5_data *, krb5_sam_key **);
+krb5_error_code
+decode_krb5_pa_enc_ts(const krb5_data *output, krb5_pa_enc_ts **rep);
 
-krb5_error_code decode_krb5_setpw_req
-	(const krb5_data *, krb5_data **, krb5_principal *);
+krb5_error_code
+decode_krb5_sam_key(const krb5_data *, krb5_sam_key **);
 
-krb5_error_code decode_krb5_pa_for_user
-	(const krb5_data *, krb5_pa_for_user **);
+krb5_error_code
+decode_krb5_setpw_req(const krb5_data *, krb5_data **, krb5_principal *);
 
-krb5_error_code decode_krb5_pa_s4u_x509_user
-	(const krb5_data *, krb5_pa_s4u_x509_user **);
+krb5_error_code
+decode_krb5_pa_for_user(const krb5_data *, krb5_pa_for_user **);
 
-krb5_error_code decode_krb5_pa_svr_referral_data
-	(const krb5_data *, krb5_pa_svr_referral_data **);
+krb5_error_code
+decode_krb5_pa_s4u_x509_user(const krb5_data *, krb5_pa_s4u_x509_user **);
 
-krb5_error_code decode_krb5_pa_server_referral_data
-	(const krb5_data *, krb5_pa_server_referral_data **);
+krb5_error_code
+decode_krb5_pa_svr_referral_data(const krb5_data *,
+                                 krb5_pa_svr_referral_data **);
 
-krb5_error_code decode_krb5_pa_pac_req
-	(const krb5_data *, krb5_pa_pac_req **);
+krb5_error_code
+decode_krb5_pa_server_referral_data(const krb5_data *,
+                                    krb5_pa_server_referral_data **);
 
-krb5_error_code decode_krb5_etype_list
-	(const krb5_data *, krb5_etype_list **);
+krb5_error_code
+decode_krb5_pa_pac_req(const krb5_data *, krb5_pa_pac_req **);
 
-krb5_error_code decode_krb5_pa_fx_fast_request
-(const krb5_data *, krb5_fast_armored_req **);
+krb5_error_code
+decode_krb5_etype_list(const krb5_data *, krb5_etype_list **);
 
-krb5_error_code decode_krb5_fast_req
-(const krb5_data *, krb5_fast_req **);
+krb5_error_code
+decode_krb5_pa_fx_fast_request(const krb5_data *, krb5_fast_armored_req **);
 
+krb5_error_code
+decode_krb5_fast_req(const krb5_data *, krb5_fast_req **);
 
-krb5_error_code decode_krb5_pa_fx_fast_reply
-(const krb5_data *, krb5_enc_data **);
+krb5_error_code
+decode_krb5_pa_fx_fast_reply(const krb5_data *, krb5_enc_data **);
 
-krb5_error_code decode_krb5_fast_response
-(const krb5_data *, krb5_fast_response **);
+krb5_error_code
+decode_krb5_fast_response(const krb5_data *, krb5_fast_response **);
 
-krb5_error_code decode_krb5_ad_kdcissued
-(const krb5_data *, krb5_ad_kdcissued **);
+krb5_error_code
+decode_krb5_ad_kdcissued(const krb5_data *, krb5_ad_kdcissued **);
 
-krb5_error_code decode_krb5_ad_signedpath
-(const krb5_data *, krb5_ad_signedpath **);
+krb5_error_code
+decode_krb5_ad_signedpath(const krb5_data *, krb5_ad_signedpath **);
 
-struct _krb5_key_data;		/* kdb.h */
+struct _krb5_key_data;          /* kdb.h */
 
 struct ldap_seqof_key_data {
-    krb5_int32 mkvno;		/* Master key version number */
+    krb5_int32 mkvno;           /* Master key version number */
     struct _krb5_key_data *key_data;
     krb5_int16 n_key_data;
 };
 typedef struct ldap_seqof_key_data ldap_seqof_key_data;
 
 krb5_error_code
-krb5int_ldap_encode_sequence_of_keys (const ldap_seqof_key_data *val,
-				      krb5_data **code);
+krb5int_ldap_encode_sequence_of_keys(const ldap_seqof_key_data *val,
+                                     krb5_data **code);
 
 krb5_error_code
-krb5int_ldap_decode_sequence_of_keys (krb5_data *in,
-				      ldap_seqof_key_data **rep);
+krb5int_ldap_decode_sequence_of_keys(krb5_data *in,
+                                     ldap_seqof_key_data **rep);
 
 /*************************************************************************
  * End of prototypes for krb5_decode.c
@@ -2043,171 +2005,144 @@ krb5int_ldap_decode_sequence_of_keys (krb5_data *in,
 /*
  * Internal krb5 library routines
  */
-krb5_error_code krb5_encrypt_tkt_part
-	(krb5_context,
-		const krb5_keyblock *,
-		krb5_ticket * );
-
-
-krb5_error_code krb5_encode_kdc_rep
-	(krb5_context,
-		krb5_msgtype,
-		const krb5_enc_kdc_rep_part *,
-		int using_subkey,
-		const krb5_keyblock *,
-		krb5_kdc_rep *,
-		krb5_data ** );
-
-krb5_boolean krb5int_auth_con_chkseqnum
-	(krb5_context ctx, krb5_auth_context ac, krb5_ui_4 in_seq);
+krb5_error_code
+krb5_encrypt_tkt_part(krb5_context, const krb5_keyblock *, krb5_ticket *);
+
+krb5_error_code
+krb5_encode_kdc_rep(krb5_context, krb5_msgtype, const krb5_enc_kdc_rep_part *,
+                    int using_subkey, const krb5_keyblock *, krb5_kdc_rep *,
+                    krb5_data ** );
+
+krb5_boolean
+krb5int_auth_con_chkseqnum(krb5_context ctx, krb5_auth_context ac,
+                           krb5_ui_4 in_seq);
 /*
  * [De]Serialization Handle and operations.
  */
 struct __krb5_serializer {
-    krb5_magic		odtype;
-    krb5_error_code	(*sizer) (krb5_context,
-						  krb5_pointer,
-						  size_t *);
-    krb5_error_code	(*externalizer) (krb5_context,
-							 krb5_pointer,
-							 krb5_octet **,
-							 size_t *);
-    krb5_error_code	(*internalizer) (krb5_context,
-							 krb5_pointer *,
-							 krb5_octet **,
-							 size_t *);
+    krb5_magic          odtype;
+    krb5_error_code     (*sizer) (krb5_context,
+                                  krb5_pointer,
+                                  size_t *);
+    krb5_error_code     (*externalizer) (krb5_context,
+                                         krb5_pointer,
+                                         krb5_octet **,
+                                         size_t *);
+    krb5_error_code     (*internalizer) (krb5_context,
+                                         krb5_pointer *,
+                                         krb5_octet **,
+                                         size_t *);
 };
 typedef const struct __krb5_serializer * krb5_ser_handle;
 typedef struct __krb5_serializer krb5_ser_entry;
 
-krb5_ser_handle krb5_find_serializer
-	(krb5_context,
-		krb5_magic);
-krb5_error_code krb5_register_serializer
-	(krb5_context,
-			const krb5_ser_entry *);
+krb5_ser_handle krb5_find_serializer(krb5_context, krb5_magic);
+krb5_error_code krb5_register_serializer(krb5_context, const krb5_ser_entry *);
 
 /* Determine the external size of a particular opaque structure */
-krb5_error_code KRB5_CALLCONV krb5_size_opaque
-	(krb5_context,
-		krb5_magic,
-		krb5_pointer,
-		size_t *);
+krb5_error_code KRB5_CALLCONV
+krb5_size_opaque(krb5_context, krb5_magic, krb5_pointer, size_t *);
 
 /* Serialize the structure into a buffer */
-krb5_error_code KRB5_CALLCONV krb5_externalize_opaque
-	(krb5_context,
-		krb5_magic,
-		krb5_pointer,
-		krb5_octet **,
-		size_t *);
+krb5_error_code KRB5_CALLCONV
+krb5_externalize_opaque(krb5_context, krb5_magic, krb5_pointer, krb5_octet **,
+                        size_t *);
 
 /* Deserialize the structure from a buffer */
-krb5_error_code KRB5_CALLCONV krb5_internalize_opaque
-	(krb5_context,
-		krb5_magic,
-		krb5_pointer *,
-		krb5_octet **,
-		size_t *);
+krb5_error_code KRB5_CALLCONV
+krb5_internalize_opaque(krb5_context, krb5_magic, krb5_pointer *,
+                        krb5_octet **, size_t *);
 
 /* Serialize data into a buffer */
-krb5_error_code krb5_externalize_data
-	(krb5_context,
-		krb5_pointer,
-		krb5_octet **,
-		size_t *);
+krb5_error_code
+krb5_externalize_data(krb5_context, krb5_pointer, krb5_octet **, size_t *);
 /*
  * Initialization routines.
  */
 
 /* Initialize serialization for krb5_[os_]context */
-krb5_error_code KRB5_CALLCONV krb5_ser_context_init
-	(krb5_context);
+krb5_error_code KRB5_CALLCONV krb5_ser_context_init(krb5_context);
 
 /* Initialize serialization for krb5_auth_context */
-krb5_error_code KRB5_CALLCONV krb5_ser_auth_context_init
-	(krb5_context);
+krb5_error_code KRB5_CALLCONV krb5_ser_auth_context_init(krb5_context);
 
 /* Initialize serialization for krb5_keytab */
-krb5_error_code KRB5_CALLCONV krb5_ser_keytab_init
-	(krb5_context);
+krb5_error_code KRB5_CALLCONV krb5_ser_keytab_init(krb5_context);
 
 /* Initialize serialization for krb5_ccache */
-krb5_error_code KRB5_CALLCONV krb5_ser_ccache_init
-	(krb5_context);
+krb5_error_code KRB5_CALLCONV krb5_ser_ccache_init(krb5_context);
 
 /* Initialize serialization for krb5_rcache */
-krb5_error_code KRB5_CALLCONV krb5_ser_rcache_init
-	(krb5_context);
+krb5_error_code KRB5_CALLCONV krb5_ser_rcache_init(krb5_context);
 
 /* [De]serialize 4-byte integer */
-krb5_error_code KRB5_CALLCONV krb5_ser_pack_int32
-	(krb5_int32,
-		krb5_octet **,
-		size_t *);
-krb5_error_code KRB5_CALLCONV krb5_ser_unpack_int32
-	(krb5_int32 *,
-		krb5_octet **,
-		size_t *);
+krb5_error_code KRB5_CALLCONV
+krb5_ser_pack_int32(krb5_int32, krb5_octet **, size_t *);
+
+krb5_error_code KRB5_CALLCONV
+krb5_ser_unpack_int32(krb5_int32 *, krb5_octet **, size_t *);
+
 /* [De]serialize 8-byte integer */
-krb5_error_code KRB5_CALLCONV krb5_ser_pack_int64
-	(krb5_int64, krb5_octet **, size_t *);
-krb5_error_code KRB5_CALLCONV krb5_ser_unpack_int64
-	(krb5_int64 *, krb5_octet **, size_t *);
+krb5_error_code KRB5_CALLCONV
+krb5_ser_pack_int64(krb5_int64, krb5_octet **, size_t *);
+
+krb5_error_code KRB5_CALLCONV
+krb5_ser_unpack_int64(krb5_int64 *, krb5_octet **, size_t *);
+
 /* [De]serialize byte string */
-krb5_error_code KRB5_CALLCONV krb5_ser_pack_bytes
-	(krb5_octet *,
-		size_t,
-		krb5_octet **,
-		size_t *);
-krb5_error_code KRB5_CALLCONV krb5_ser_unpack_bytes
-	(krb5_octet *,
-		size_t,
-		krb5_octet **,
-		size_t *);
-
-krb5_error_code KRB5_CALLCONV krb5int_cc_default
-	(krb5_context, krb5_ccache *);
-
-krb5_error_code KRB5_CALLCONV krb5_cc_retrieve_cred_default
-	(krb5_context, krb5_ccache, krb5_flags,
-			krb5_creds *, krb5_creds *);
+krb5_error_code KRB5_CALLCONV
+krb5_ser_pack_bytes(krb5_octet *, size_t, krb5_octet **, size_t *);
+
+krb5_error_code KRB5_CALLCONV
+krb5_ser_unpack_bytes(krb5_octet *, size_t, krb5_octet **, size_t *);
+
+krb5_error_code KRB5_CALLCONV
+krb5int_cc_default(krb5_context, krb5_ccache *);
+
+krb5_error_code KRB5_CALLCONV
+krb5_cc_retrieve_cred_default(krb5_context, krb5_ccache, krb5_flags,
+                              krb5_creds *, krb5_creds *);
 
 krb5_boolean KRB5_CALLCONV
-krb5_creds_compare (krb5_context in_context,
-                    krb5_creds *in_creds,
-                    krb5_creds *in_compare_creds);
+krb5_creds_compare(krb5_context in_context, krb5_creds *in_creds,
+                   krb5_creds *in_compare_creds);
 
-void krb5int_set_prompt_types
-	(krb5_context, krb5_prompt_type *);
+void
+krb5int_set_prompt_types(krb5_context, krb5_prompt_type *);
 
 krb5_error_code
-krb5int_generate_and_save_subkey (krb5_context, krb5_auth_context,
-				  krb5_keyblock * /* Old keyblock, not new!  */,
-				  krb5_enctype);
+krb5int_generate_and_save_subkey(krb5_context, krb5_auth_context,
+                                 krb5_keyblock * /* Old keyblock, not new!  */,
+                                 krb5_enctype);
 
 /* set and change password helpers */
 
-krb5_error_code krb5int_mk_chpw_req
-	(krb5_context context, krb5_auth_context auth_context,
- 			krb5_data *ap_req, char *passwd, krb5_data *packet);
-krb5_error_code krb5int_rd_chpw_rep
-	(krb5_context context, krb5_auth_context auth_context,
-		       krb5_data *packet, int *result_code,
-		       krb5_data *result_data);
-krb5_error_code KRB5_CALLCONV krb5_chpw_result_code_string
-	(krb5_context context, int result_code,
-			char **result_codestr);
-krb5_error_code  krb5int_mk_setpw_req
-	(krb5_context context, krb5_auth_context auth_context,
- 			krb5_data *ap_req, krb5_principal targetprinc, char *passwd, krb5_data *packet);
-krb5_error_code krb5int_rd_setpw_rep
-	(krb5_context context, krb5_auth_context auth_context,
-		       krb5_data *packet, int *result_code,
-		       krb5_data *result_data);
-krb5_error_code krb5int_setpw_result_code_string
-	(krb5_context context, int result_code,
-			const char **result_codestr);
+krb5_error_code
+krb5int_mk_chpw_req(krb5_context context, krb5_auth_context auth_context,
+                    krb5_data *ap_req, char *passwd, krb5_data *packet);
+
+krb5_error_code
+krb5int_rd_chpw_rep(krb5_context context, krb5_auth_context auth_context,
+                    krb5_data *packet, int *result_code,
+                    krb5_data *result_data);
+
+krb5_error_code KRB5_CALLCONV
+krb5_chpw_result_code_string(krb5_context context, int result_code,
+                             char **result_codestr);
+
+krb5_error_code
+krb5int_mk_setpw_req(krb5_context context, krb5_auth_context auth_context,
+                     krb5_data *ap_req, krb5_principal targetprinc,
+                     char *passwd, krb5_data *packet);
+
+krb5_error_code
+krb5int_rd_setpw_rep(krb5_context context, krb5_auth_context auth_context,
+                     krb5_data *packet, int *result_code,
+                     krb5_data *result_data);
+
+krb5_error_code
+krb5int_setpw_result_code_string(krb5_context context, int result_code,
+                                 const char **result_codestr);
 
 struct srv_dns_entry {
     struct srv_dns_entry *next;
@@ -2219,9 +2154,9 @@ struct srv_dns_entry {
 #ifdef KRB5_DNS_LOOKUP
 krb5_error_code
 krb5int_make_srv_query_realm(const krb5_data *realm,
-			     const char *service,
-			     const char *protocol,
-			     struct srv_dns_entry **answers);
+                             const char *service,
+                             const char *protocol,
+                             struct srv_dns_entry **answers);
 void krb5int_free_srv_dns_data(struct srv_dns_entry *);
 #endif
 
@@ -2233,7 +2168,7 @@ void krb5int_free_srv_dns_data(struct srv_dns_entry *);
 /*
  * Convenience function for structure magic number
  */
-#define KRB5_VERIFY_MAGIC(structure,magic_number) \
+#define KRB5_VERIFY_MAGIC(structure,magic_number)                       \
     if ((structure)->magic != (magic_number)) return (magic_number);
 
 /* to keep lint happy */
@@ -2245,146 +2180,198 @@ void krb5int_free_srv_dns_data(struct srv_dns_entry *);
 #define KRB5INT_ACCESS_STRUCT_VERSION 15
 
 #ifndef ANAME_SZ
-struct ktext;			/* from krb.h, for krb524 support */
+struct ktext;                   /* from krb.h, for krb524 support */
 #endif
 typedef struct _krb5int_access {
     /* crypto stuff */
     const struct krb5_hash_provider *md5_hash_provider;
     const struct krb5_enc_provider *arcfour_enc_provider;
     krb5_error_code (*hmac)(const struct krb5_hash_provider *hash,
-			    const krb5_keyblock *key,
-			    unsigned int icount, const krb5_data *input,
-			    krb5_data *output);
+                            const krb5_keyblock *key,
+                            unsigned int icount, const krb5_data *input,
+                            krb5_data *output);
     krb5_error_code (*auth_con_get_subkey_enctype)(krb5_context,
-						   krb5_auth_context,
-						   krb5_enctype *);
+                                                   krb5_auth_context,
+                                                   krb5_enctype *);
     /* service location and communication */
-    krb5_error_code (*sendto_udp) (krb5_context, const krb5_data *msg,
-				   const struct addrlist *, struct sendto_callback_info*, krb5_data *reply,
-				   struct sockaddr *, socklen_t *,struct sockaddr *,
-				   socklen_t *, int *,
-				   int (*msg_handler)(krb5_context, const krb5_data *, void *),
-				   void *msg_handler_data);
+    krb5_error_code (*sendto_udp)(krb5_context, const krb5_data *msg,
+                                  const struct addrlist *,
+                                  struct sendto_callback_info *,
+                                  krb5_data *reply, struct sockaddr *,
+                                  socklen_t *, struct sockaddr *,
+                                  socklen_t *, int *,
+                                  int (*msg_handler)(krb5_context,
+                                                     const krb5_data *,
+                                                     void *),
+                                  void *msg_handler_data);
     krb5_error_code (*add_host_to_list)(struct addrlist *lp,
-					const char *hostname,
-					int port, int secport,
-					int socktype, int family);
-    void (*free_addrlist) (struct addrlist *);
+                                        const char *hostname,
+                                        int port, int secport,
+                                        int socktype, int family);
+    void (*free_addrlist)(struct addrlist *);
 
     krb5_error_code (*make_srv_query_realm)(const krb5_data *realm,
-					    const char *service,
-					    const char *protocol,
-					    struct srv_dns_entry **answers);
+                                            const char *service,
+                                            const char *protocol,
+                                            struct srv_dns_entry **answers);
     void (*free_srv_dns_data)(struct srv_dns_entry *);
     int (*use_dns_kdc)(krb5_context);
-    krb5_error_code (*clean_hostname)(krb5_context, const char *, char *, size_t);
+    krb5_error_code (*clean_hostname)(krb5_context, const char *, char *,
+                                      size_t);
 
     krb5_error_code (*mandatory_cksumtype)(krb5_context, krb5_enctype,
-					   krb5_cksumtype *);
+                                           krb5_cksumtype *);
     krb5_error_code (KRB5_CALLCONV *ser_pack_int64)(krb5_int64, krb5_octet **,
-						    size_t *);
+                                                    size_t *);
     krb5_error_code (KRB5_CALLCONV *ser_unpack_int64)(krb5_int64 *,
-						      krb5_octet **, size_t *);
+                                                      krb5_octet **, size_t *);
 
     /* Used for KDB LDAP back end.  */
     krb5_error_code
-    (*asn1_ldap_encode_sequence_of_keys) (const ldap_seqof_key_data *val,
-					  krb5_data **code);
+    (*asn1_ldap_encode_sequence_of_keys)(const ldap_seqof_key_data *val,
+                                         krb5_data **code);
 
     krb5_error_code
-    (*asn1_ldap_decode_sequence_of_keys) (krb5_data *in,
-					  ldap_seqof_key_data **);
-  /* Used for encrypted challenge fast factor*/
+    (*asn1_ldap_decode_sequence_of_keys)(krb5_data *in,
+                                         ldap_seqof_key_data **);
+
+    /* Used for encrypted challenge fast factor*/
     krb5_error_code (*encode_enc_data)(const krb5_enc_data *, krb5_data **);
     krb5_error_code (*decode_enc_data)(const krb5_data *, krb5_enc_data **);
     void (*free_enc_data)(krb5_context, krb5_enc_data *);
     krb5_error_code (*encode_enc_ts)(const krb5_pa_enc_ts *, krb5_data **);
     krb5_error_code (*decode_enc_ts)(const krb5_data *, krb5_pa_enc_ts **);
     void (*free_enc_ts)(krb5_context, krb5_pa_enc_ts *);
-    krb5_error_code (*encrypt_helper)
-	(krb5_context, const krb5_keyblock *, krb5_keyusage, const krb5_data *,
-	 krb5_enc_data *);
+    krb5_error_code
+    (*encrypt_helper)(krb5_context, const krb5_keyblock *, krb5_keyusage,
+                      const krb5_data *, krb5_enc_data *);
 
     /*
      * pkinit asn.1 encode/decode functions
      */
-    krb5_error_code (*encode_krb5_auth_pack)
-        (const krb5_auth_pack *rep, krb5_data **code);
-    krb5_error_code (*encode_krb5_auth_pack_draft9)
-        (const krb5_auth_pack_draft9 *rep, krb5_data **code);
-    krb5_error_code (*encode_krb5_kdc_dh_key_info)
-        (const krb5_kdc_dh_key_info *rep, krb5_data **code);
-    krb5_error_code (*encode_krb5_pa_pk_as_rep)
-        (const krb5_pa_pk_as_rep *rep, krb5_data **code);
-    krb5_error_code (*encode_krb5_pa_pk_as_rep_draft9)
-        (const krb5_pa_pk_as_rep_draft9 *rep, krb5_data **code);
-    krb5_error_code (*encode_krb5_pa_pk_as_req)
-	(const krb5_pa_pk_as_req *rep, krb5_data **code);
-    krb5_error_code (*encode_krb5_pa_pk_as_req_draft9)
-	(const krb5_pa_pk_as_req_draft9 *rep, krb5_data **code);
-    krb5_error_code (*encode_krb5_reply_key_pack)
-        (const krb5_reply_key_pack *, krb5_data **code);
-    krb5_error_code (*encode_krb5_reply_key_pack_draft9)
-        (const krb5_reply_key_pack_draft9 *, krb5_data **code);
-    krb5_error_code (*encode_krb5_td_dh_parameters)
-        (const krb5_algorithm_identifier **, krb5_data **code);
-    krb5_error_code (*encode_krb5_td_trusted_certifiers)
-        (const krb5_external_principal_identifier **, krb5_data **code);
-    krb5_error_code (*encode_krb5_typed_data)
-        (const krb5_typed_data **, krb5_data **code);
-
-    krb5_error_code (*decode_krb5_auth_pack)
-        (const krb5_data *, krb5_auth_pack **);
-    krb5_error_code (*decode_krb5_auth_pack_draft9)
-        (const krb5_data *, krb5_auth_pack_draft9 **);
-    krb5_error_code (*decode_krb5_pa_pk_as_req)
-        (const krb5_data *, krb5_pa_pk_as_req **);
-    krb5_error_code (*decode_krb5_pa_pk_as_req_draft9)
-        (const krb5_data *, krb5_pa_pk_as_req_draft9 **);
-    krb5_error_code (*decode_krb5_pa_pk_as_rep)
-        (const krb5_data *, krb5_pa_pk_as_rep **);
-    krb5_error_code (*decode_krb5_pa_pk_as_rep_draft9)
-        (const krb5_data *, krb5_pa_pk_as_rep_draft9 **);
-    krb5_error_code (*decode_krb5_kdc_dh_key_info)
-        (const krb5_data *, krb5_kdc_dh_key_info **);
-    krb5_error_code (*decode_krb5_principal_name)
-        (const krb5_data *, krb5_principal_data **);
-    krb5_error_code (*decode_krb5_reply_key_pack)
-        (const krb5_data *, krb5_reply_key_pack **);
-    krb5_error_code (*decode_krb5_reply_key_pack_draft9)
-        (const krb5_data *, krb5_reply_key_pack_draft9 **);
-    krb5_error_code (*decode_krb5_td_dh_parameters)
-        (const krb5_data *, krb5_algorithm_identifier ***);
-    krb5_error_code (*decode_krb5_td_trusted_certifiers)
-        (const krb5_data *, krb5_external_principal_identifier ***);
-    krb5_error_code (*decode_krb5_typed_data)
-        (const krb5_data *, krb5_typed_data ***);
-
-    krb5_error_code (*decode_krb5_as_req)
-	(const krb5_data *output, krb5_kdc_req **rep);
-    krb5_error_code (*encode_krb5_kdc_req_body)
-	(const krb5_kdc_req *rep, krb5_data **code);
-    void (KRB5_CALLCONV *free_kdc_req)
-	(krb5_context, krb5_kdc_req * );
-    void (*set_prompt_types)
-	(krb5_context, krb5_prompt_type *);
-    krb5_error_code (*encode_krb5_authdata_elt)
-	(const krb5_authdata *rep, krb5_data **code);
+    krb5_error_code
+    (*encode_krb5_auth_pack)(const krb5_auth_pack *rep, krb5_data **code);
 
-    /* Exported for testing only!  */
-    krb5_error_code (*encode_krb5_sam_response_2)
-        (const krb5_sam_response_2 *rep, krb5_data **code);
-    krb5_error_code (*encode_krb5_enc_sam_response_enc_2)
-        (const krb5_enc_sam_response_enc_2 *rep, krb5_data **code);
+    krb5_error_code
+    (*encode_krb5_auth_pack_draft9)(const krb5_auth_pack_draft9 *rep,
+                                    krb5_data **code);
+
+    krb5_error_code
+    (*encode_krb5_kdc_dh_key_info)(const krb5_kdc_dh_key_info *rep,
+                                   krb5_data **code);
+
+    krb5_error_code
+    (*encode_krb5_pa_pk_as_rep)(const krb5_pa_pk_as_rep *rep,
+                                krb5_data **code);
+
+    krb5_error_code
+    (*encode_krb5_pa_pk_as_rep_draft9)(const krb5_pa_pk_as_rep_draft9 *rep,
+                                       krb5_data **code);
+
+    krb5_error_code
+    (*encode_krb5_pa_pk_as_req)(const krb5_pa_pk_as_req *rep,
+                                krb5_data **code);
+
+    krb5_error_code
+    (*encode_krb5_pa_pk_as_req_draft9)(const krb5_pa_pk_as_req_draft9 *rep,
+                                       krb5_data **code);
+
+    krb5_error_code
+    (*encode_krb5_reply_key_pack)(const krb5_reply_key_
+                                  krb5_data **code);
+
+    krb5_error_code
+    (*encode_krb5_reply_key_pack_draft9)(const krb5_reply_key_pack_draft9 *,
+                                         krb5_data **code);
+
+    krb5_error_code
+    (*encode_krb5_td_dh_parameters)(const krb5_algorithm_identifier **,
+                                    krb5_data **code);
+
+    krb5_error_code
+    (*encode_krb5_td_trusted_certifiers)(const
+                                         krb5_external_principal_identifier **,
+                                         krb5_data **code);
 
+    krb5_error_code
+    (*encode_krb5_typed_data)(const krb5_typed_data **, krb5_data **code);
+
+    krb5_error_code
+    (*decode_krb5_auth_pack)(const krb5_data *, krb5_auth_pack **);
+
+    krb5_error_code
+    (*decode_krb5_auth_pack_draft9)(const krb5_data *,
+                                    krb5_auth_pack_draft9 **);
+
+    krb5_error_code
+    (*decode_krb5_pa_pk_as_req)(const krb5_data *, krb5_pa_pk_as_req **);
+
+    krb5_error_code
+    (*decode_krb5_pa_pk_as_req_draft9)(const krb5_data *,
+                                       krb5_pa_pk_as_req_draft9 **);
+
+    krb5_error_code
+    (*decode_krb5_pa_pk_as_rep)(const krb5_data *, krb5_pa_pk_as_rep **);
+
+    krb5_error_code
+    (*decode_krb5_pa_pk_as_rep_draft9)(const krb5_data *,
+                                       krb5_pa_pk_as_rep_draft9 **);
+
+    krb5_error_code
+    (*decode_krb5_kdc_dh_key_info)(const krb5_data *, krb5_kdc_dh_key_info **);
+
+    krb5_error_code
+    (*decode_krb5_principal_name)(const krb5_data *, krb5_principal_data **);
+
+    krb5_error_code
+    (*decode_krb5_reply_key_pack)(const krb5_data *, krb5_reply_key_pack **);
+
+    krb5_error_code
+    (*decode_krb5_reply_key_pack_draft9)(const krb5_data *,
+                                         krb5_reply_key_pack_draft9 **);
+
+    krb5_error_code
+    (*decode_krb5_td_dh_parameters)(const krb5_data *,
+                                    krb5_algorithm_identifier ***);
+
+    krb5_error_code
+    (*decode_krb5_td_trusted_certifiers)(const krb5_data *,
+                                         krb5_external_principal_identifier
+                                         ***);
+
+    krb5_error_code
+    (*decode_krb5_typed_data)(const krb5_data *, krb5_typed_data ***);
+
+    krb5_error_code
+    (*decode_krb5_as_req)(const krb5_data *output, krb5_kdc_req **rep);
+
+    krb5_error_code
+    (*encode_krb5_kdc_req_body)(const krb5_kdc_req *rep, krb5_data **code);
+
+    void
+    (KRB5_CALLCONV *free_kdc_req)(krb5_context, krb5_kdc_req * );
+    void
+    (*set_prompt_types)(krb5_context, krb5_prompt_type *);
+
+    krb5_error_code
+    (*encode_krb5_authdata_elt)(const krb5_authdata *rep, krb5_data **code);
+
+    /* Exported for testing only!  */
+    krb5_error_code
+    (*encode_krb5_sam_response_2)(const krb5_sam_response_2 *rep,
+                                  krb5_data **code);
+    krb5_error_code
+    (*encode_krb5_enc_sam_response_enc_2)(const
+                                          krb5_enc_sam_response_enc_2 *rep,
+                                          krb5_data **code);
 } krb5int_access;
 
-#define KRB5INT_ACCESS_VERSION \
-    (((krb5_int32)((sizeof(krb5int_access) & 0xFFFF) | \
-		   (KRB5INT_ACCESS_STRUCT_VERSION << 16))) & 0xFFFFFFFF)
+#define KRB5INT_ACCESS_VERSION                                          \
+    (((krb5_int32)((sizeof(krb5int_access) & 0xFFFF) |                  \
+                   (KRB5INT_ACCESS_STRUCT_VERSION << 16))) & 0xFFFFFFFF)
 
-krb5_error_code KRB5_CALLCONV krb5int_accessor
-	(krb5int_access*, krb5_int32);
+krb5_error_code KRB5_CALLCONV
+krb5int_accessor(krb5int_access*, krb5_int32);
 
 /* Ick -- some krb524 and krb4 support placed in the krb5 library,
    because AFS (and potentially other applications?) use the krb4
@@ -2415,46 +2402,46 @@ typedef struct krb5_cc_ptcursor_s *krb5_cc_ptcursor;
 struct _krb5_cc_ops {
     krb5_magic magic;
     char *prefix;
-    const char * (KRB5_CALLCONV *get_name) (krb5_context, krb5_ccache);
-    krb5_error_code (KRB5_CALLCONV *resolve) (krb5_context, krb5_ccache *,
-					    const char *);
-    krb5_error_code (KRB5_CALLCONV *gen_new) (krb5_context, krb5_ccache *);
-    krb5_error_code (KRB5_CALLCONV *init) (krb5_context, krb5_ccache,
-					    krb5_principal);
-    krb5_error_code (KRB5_CALLCONV *destroy) (krb5_context, krb5_ccache);
-    krb5_error_code (KRB5_CALLCONV *close) (krb5_context, krb5_ccache);
-    krb5_error_code (KRB5_CALLCONV *store) (krb5_context, krb5_ccache,
-					    krb5_creds *);
-    krb5_error_code (KRB5_CALLCONV *retrieve) (krb5_context, krb5_ccache,
-					    krb5_flags, krb5_creds *,
-					    krb5_creds *);
-    krb5_error_code (KRB5_CALLCONV *get_princ) (krb5_context, krb5_ccache,
-					    krb5_principal *);
-    krb5_error_code (KRB5_CALLCONV *get_first) (krb5_context, krb5_ccache,
-					    krb5_cc_cursor *);
-    krb5_error_code (KRB5_CALLCONV *get_next) (krb5_context, krb5_ccache,
-					    krb5_cc_cursor *, krb5_creds *);
-    krb5_error_code (KRB5_CALLCONV *end_get) (krb5_context, krb5_ccache,
-					    krb5_cc_cursor *);
-    krb5_error_code (KRB5_CALLCONV *remove_cred) (krb5_context, krb5_ccache,
-					    krb5_flags, krb5_creds *);
-    krb5_error_code (KRB5_CALLCONV *set_flags) (krb5_context, krb5_ccache,
-					    krb5_flags);
-    krb5_error_code (KRB5_CALLCONV *get_flags) (krb5_context, krb5_ccache,
-						krb5_flags *);
+    const char * (KRB5_CALLCONV *get_name)(krb5_context, krb5_ccache);
+    krb5_error_code (KRB5_CALLCONV *resolve)(krb5_context, krb5_ccache *,
+                                             const char *);
+    krb5_error_code (KRB5_CALLCONV *gen_new)(krb5_context, krb5_ccache *);
+    krb5_error_code (KRB5_CALLCONV *init)(krb5_context, krb5_ccache,
+                                          krb5_principal);
+    krb5_error_code (KRB5_CALLCONV *destroy)(krb5_context, krb5_ccache);
+    krb5_error_code (KRB5_CALLCONV *close)(krb5_context, krb5_ccache);
+    krb5_error_code (KRB5_CALLCONV *store)(krb5_context, krb5_ccache,
+                                           krb5_creds *);
+    krb5_error_code (KRB5_CALLCONV *retrieve)(krb5_context, krb5_ccache,
+                                              krb5_flags, krb5_creds *,
+                                              krb5_creds *);
+    krb5_error_code (KRB5_CALLCONV *get_princ)(krb5_context, krb5_ccache,
+                                               krb5_principal *);
+    krb5_error_code (KRB5_CALLCONV *get_first)(krb5_context, krb5_ccache,
+                                               krb5_cc_cursor *);
+    krb5_error_code (KRB5_CALLCONV *get_next)(krb5_context, krb5_ccache,
+                                              krb5_cc_cursor *, krb5_creds *);
+    krb5_error_code (KRB5_CALLCONV *end_get)(krb5_context, krb5_ccache,
+                                             krb5_cc_cursor *);
+    krb5_error_code (KRB5_CALLCONV *remove_cred)(krb5_context, krb5_ccache,
+                                                 krb5_flags, krb5_creds *);
+    krb5_error_code (KRB5_CALLCONV *set_flags)(krb5_context, krb5_ccache,
+                                               krb5_flags);
+    krb5_error_code (KRB5_CALLCONV *get_flags)(krb5_context, krb5_ccache,
+                                               krb5_flags *);
     krb5_error_code (KRB5_CALLCONV *ptcursor_new)(krb5_context,
-						  krb5_cc_ptcursor *);
+                                                  krb5_cc_ptcursor *);
     krb5_error_code (KRB5_CALLCONV *ptcursor_next)(krb5_context,
-						   krb5_cc_ptcursor,
-						   krb5_ccache *);
+                                                   krb5_cc_ptcursor,
+                                                   krb5_ccache *);
     krb5_error_code (KRB5_CALLCONV *ptcursor_free)(krb5_context,
-						   krb5_cc_ptcursor *);
+                                                   krb5_cc_ptcursor *);
     krb5_error_code (KRB5_CALLCONV *move)(krb5_context, krb5_ccache,
-						krb5_ccache);
+                                          krb5_ccache);
     krb5_error_code (KRB5_CALLCONV *lastchange)(krb5_context,
-						krb5_ccache, krb5_timestamp *);
+                                                krb5_ccache, krb5_timestamp *);
     krb5_error_code (KRB5_CALLCONV *wasdefault)(krb5_context, krb5_ccache,
-						krb5_timestamp *);
+                                                krb5_timestamp *);
     krb5_error_code (KRB5_CALLCONV *lock)(krb5_context, krb5_ccache);
     krb5_error_code (KRB5_CALLCONV *unlock)(krb5_context, krb5_ccache);
 };
@@ -2467,104 +2454,83 @@ krb5int_cc_os_default_name(krb5_context context, char **name);
 typedef struct _krb5_donot_replay {
     krb5_magic magic;
     krb5_ui_4 hash;
-    char *server;			/* null-terminated */
-    char *client;			/* null-terminated */
-    char *msghash;			/* null-terminated */
+    char *server;                       /* null-terminated */
+    char *client;                       /* null-terminated */
+    char *msghash;                      /* null-terminated */
     krb5_int32 cusec;
     krb5_timestamp ctime;
 } krb5_donot_replay;
 
-krb5_error_code krb5_rc_default
-	(krb5_context,
-		krb5_rcache *);
-krb5_error_code krb5_rc_resolve_type
-	(krb5_context,
-		krb5_rcache *,char *);
-krb5_error_code krb5_rc_resolve_full
-	(krb5_context,
-		krb5_rcache *,char *);
-char * krb5_rc_get_type
-	(krb5_context,
-		krb5_rcache);
-char * krb5_rc_default_type
-	(krb5_context);
-char * krb5_rc_default_name
-	(krb5_context);
-krb5_error_code krb5_auth_to_rep
-	(krb5_context,
-		krb5_tkt_authent *,
-		krb5_donot_replay *);
-krb5_error_code krb5_rc_hash_message
-	(krb5_context context,
-		const krb5_data *message, char **out);
-
-
-krb5_error_code KRB5_CALLCONV krb5_rc_initialize
-	(krb5_context, krb5_rcache,krb5_deltat);
-krb5_error_code KRB5_CALLCONV krb5_rc_recover_or_initialize
-	(krb5_context, krb5_rcache,krb5_deltat);
-krb5_error_code KRB5_CALLCONV krb5_rc_recover
-	(krb5_context, krb5_rcache);
-krb5_error_code KRB5_CALLCONV krb5_rc_destroy
-	(krb5_context, krb5_rcache);
-krb5_error_code KRB5_CALLCONV krb5_rc_close
-	(krb5_context, krb5_rcache);
-krb5_error_code KRB5_CALLCONV krb5_rc_store
-	(krb5_context, krb5_rcache,krb5_donot_replay *);
-krb5_error_code KRB5_CALLCONV krb5_rc_expunge
-	(krb5_context, krb5_rcache);
-krb5_error_code KRB5_CALLCONV krb5_rc_get_lifespan
-	(krb5_context, krb5_rcache,krb5_deltat *);
-char *KRB5_CALLCONV krb5_rc_get_name
-	(krb5_context, krb5_rcache);
-krb5_error_code KRB5_CALLCONV krb5_rc_resolve
-	(krb5_context, krb5_rcache, char *);
+krb5_error_code krb5_rc_default(krb5_context, krb5_rcache *);
+krb5_error_code krb5_rc_resolve_type(krb5_context, krb5_rcache *,char *);
+krb5_error_code krb5_rc_resolve_full(krb5_context, krb5_rcache *,char *);
+char *krb5_rc_get_type(krb5_context, krb5_rcache);
+char *krb5_rc_default_type(krb5_context);
+char *krb5_rc_default_name(krb5_context);
+krb5_error_code krb5_auth_to_rep(krb5_context, krb5_tkt_authent *,
+                                 krb5_donot_replay *);
+krb5_error_code krb5_rc_hash_message(krb5_context context,
+                                     const krb5_data *message, char **out);
+
+krb5_error_code KRB5_CALLCONV
+krb5_rc_initialize(krb5_context, krb5_rcache, krb5_deltat);
+
+krb5_error_code KRB5_CALLCONV
+krb5_rc_recover_or_initialize(krb5_context, krb5_rcache,krb5_deltat);
+
+krb5_error_code KRB5_CALLCONV
+krb5_rc_recover(krb5_context, krb5_rcache);
+
+krb5_error_code KRB5_CALLCONV
+krb5_rc_destroy(krb5_context, krb5_rcache);
+
+krb5_error_code KRB5_CALLCONV
+krb5_rc_close(krb5_context, krb5_rcache);
+
+krb5_error_code KRB5_CALLCONV
+krb5_rc_store(krb5_context, krb5_rcache, krb5_donot_replay *);
+
+krb5_error_code KRB5_CALLCONV
+krb5_rc_expunge(krb5_context, krb5_rcache);
+
+krb5_error_code KRB5_CALLCONV
+krb5_rc_get_lifespan(krb5_context, krb5_rcache,krb5_deltat *);
 
+char *KRB5_CALLCONV
+krb5_rc_get_name(krb5_context, krb5_rcache);
+
+krb5_error_code KRB5_CALLCONV
+krb5_rc_resolve(krb5_context, krb5_rcache, char *);
+
+/*
+ * This structure was exposed and used in macros in krb5 1.2, so do not
+ * change its ABI.
+ */
 typedef struct _krb5_kt_ops {
     krb5_magic magic;
     char *prefix;
+
     /* routines always present */
-    krb5_error_code (KRB5_CALLCONV *resolve)
-	(krb5_context,
-		 const char *,
-		 krb5_keytab *);
-    krb5_error_code (KRB5_CALLCONV *get_name)
-	(krb5_context,
-		 krb5_keytab,
-		 char *,
-		 unsigned int);
-    krb5_error_code (KRB5_CALLCONV *close)
-	(krb5_context,
-		 krb5_keytab);
-    krb5_error_code (KRB5_CALLCONV *get)
-	(krb5_context,
-		 krb5_keytab,
-		 krb5_const_principal,
-		 krb5_kvno,
-		 krb5_enctype,
-		 krb5_keytab_entry *);
-    krb5_error_code (KRB5_CALLCONV *start_seq_get)
-	(krb5_context,
-		 krb5_keytab,
-		 krb5_kt_cursor *);
-    krb5_error_code (KRB5_CALLCONV *get_next)
-	(krb5_context,
-		 krb5_keytab,
-		 krb5_keytab_entry *,
-		 krb5_kt_cursor *);
-    krb5_error_code (KRB5_CALLCONV *end_get)
-	(krb5_context,
-		 krb5_keytab,
-		 krb5_kt_cursor *);
+    krb5_error_code (KRB5_CALLCONV *resolve)(krb5_context, const char *,
+                                             krb5_keytab *);
+    krb5_error_code (KRB5_CALLCONV *get_name)(krb5_context, krb5_keytab,
+                                              char *, unsigned int);
+    krb5_error_code (KRB5_CALLCONV *close)(krb5_context, krb5_keytab);
+    krb5_error_code (KRB5_CALLCONV *get)(krb5_context, krb5_keytab,
+                                         krb5_const_principal, krb5_kvno,
+                                         krb5_enctype, krb5_keytab_entry *);
+    krb5_error_code (KRB5_CALLCONV *start_seq_get)(krb5_context, krb5_keytab,
+                                                   krb5_kt_cursor *);
+    krb5_error_code (KRB5_CALLCONV *get_next)(krb5_context, krb5_keytab,
+                                              krb5_keytab_entry *,
+                                              krb5_kt_cursor *);
+    krb5_error_code (KRB5_CALLCONV *end_get)(krb5_context, krb5_keytab,
+                                             krb5_kt_cursor *);
     /* routines to be included on extended version (write routines) */
-    krb5_error_code (KRB5_CALLCONV *add)
-	(krb5_context,
-		 krb5_keytab,
-		 krb5_keytab_entry *);
-    krb5_error_code (KRB5_CALLCONV *remove)
-	(krb5_context,
-		 krb5_keytab,
-		  krb5_keytab_entry *);
+    krb5_error_code (KRB5_CALLCONV *add)(krb5_context, krb5_keytab,
+                                         krb5_keytab_entry *);
+    krb5_error_code (KRB5_CALLCONV *remove)(krb5_context, krb5_keytab,
+                                            krb5_keytab_entry *);
 
     /* Handle for serializer */
     const krb5_ser_entry *serializer;
@@ -2572,11 +2538,11 @@ typedef struct _krb5_kt_ops {
 
 extern const krb5_kt_ops krb5_kt_dfl_ops;
 
-extern krb5_error_code krb5int_translate_gai_error (int);
+extern krb5_error_code krb5int_translate_gai_error(int);
 
 /* Not sure it's ready for exposure just yet.  */
 extern krb5_error_code
-krb5int_c_mandatory_cksumtype (krb5_context, krb5_enctype, krb5_cksumtype *);
+krb5int_c_mandatory_cksumtype(krb5_context, krb5_enctype, krb5_cksumtype *);
 
 extern int krb5int_crypto_init (void);
 extern int krb5int_prng_init(void);
@@ -2584,7 +2550,7 @@ extern int krb5int_prng_init(void);
 /*
  * Referral definitions, debugging hooks, and subfunctions.
  */
-#define        KRB5_REFERRAL_MAXHOPS	10
+#define        KRB5_REFERRAL_MAXHOPS    10
 /* #define DEBUG_REFERRALS */
 
 #ifdef DEBUG_REFERRALS
@@ -2592,356 +2558,254 @@ void krb5int_dbgref_dump_principal(char *, krb5_principal);
 #endif
 
 /* Common hostname-parsing code. */
-krb5_error_code KRB5_CALLCONV krb5int_clean_hostname
-	(krb5_context,
-		const char *,
-		char *,
-		size_t);
+krb5_error_code KRB5_CALLCONV
+krb5int_clean_hostname(krb5_context, const char *, char *, size_t);
 
 krb5_error_code
 krb5int_aes_encrypt(krb5_key key, const krb5_data *ivec,
-		    const krb5_data *input, krb5_data *output);
+                    const krb5_data *input, krb5_data *output);
 krb5_error_code
 krb5int_aes_decrypt(krb5_key key, const krb5_data *ivec,
-		    const krb5_data *input, krb5_data *output);
+                    const krb5_data *input, krb5_data *output);
 
-struct _krb5_kt {	/* should move into k5-int.h */
+struct _krb5_kt {       /* should move into k5-int.h */
     krb5_magic magic;
     const struct _krb5_kt_ops *ops;
     krb5_pointer data;
 };
 
-krb5_error_code krb5_set_default_in_tkt_ktypes
-	(krb5_context,
-		const krb5_enctype *);
-krb5_error_code krb5_get_default_in_tkt_ktypes
-	(krb5_context,
-		krb5_enctype **);
+krb5_error_code krb5_set_default_in_tkt_ktypes(krb5_context,
+                                               const krb5_enctype *);
+
+krb5_error_code krb5_get_default_in_tkt_ktypes(krb5_context, krb5_enctype **);
 
-krb5_error_code krb5_set_default_tgs_ktypes
-	(krb5_context,
-		const krb5_enctype *);
+krb5_error_code krb5_set_default_tgs_ktypes(krb5_context,
+                                            const krb5_enctype *);
 
-krb5_error_code KRB5_CALLCONV krb5_get_tgs_ktypes
-	(krb5_context,
-		krb5_const_principal,
-		krb5_enctype **);
+krb5_error_code KRB5_CALLCONV
+krb5_get_tgs_ktypes(krb5_context, krb5_const_principal, krb5_enctype **);
 
-void KRB5_CALLCONV krb5_free_ktypes
-	(krb5_context, krb5_enctype *);
+void KRB5_CALLCONV krb5_free_ktypes(krb5_context, krb5_enctype *);
 
-krb5_boolean krb5_is_permitted_enctype
-	(krb5_context, krb5_enctype);
+krb5_boolean krb5_is_permitted_enctype(krb5_context, krb5_enctype);
 
 typedef struct
 {
-        krb5_enctype *etype;
-        krb5_boolean *etype_ok;
-        krb5_int32 etype_count;
+    krb5_enctype *etype;
+    krb5_boolean *etype_ok;
+    krb5_int32 etype_count;
 } krb5_etypes_permitted;
 
-krb5_boolean krb5_is_permitted_enctype_ext
-         ( krb5_context, krb5_etypes_permitted *);
+krb5_boolean krb5_is_permitted_enctype_ext(krb5_context,
+                                           krb5_etypes_permitted *);
 
 krb5_boolean KRB5_CALLCONV krb5int_c_weak_enctype(krb5_enctype);
 
-krb5_error_code krb5_kdc_rep_decrypt_proc
-	(krb5_context,
-		const krb5_keyblock *,
-		krb5_const_pointer,
-		krb5_kdc_rep * );
-krb5_error_code KRB5_CALLCONV krb5_decrypt_tkt_part
-	(krb5_context,
-		const krb5_keyblock *,
-		krb5_ticket * );
-krb5_error_code krb5_get_cred_from_kdc
-	(krb5_context,
-		krb5_ccache,		/* not const, as reading may save
-					   state */
-		krb5_creds *,
-		krb5_creds **,
-		krb5_creds *** );
-krb5_error_code krb5_get_cred_from_kdc_validate
-	(krb5_context,
-		krb5_ccache,		/* not const, as reading may save
-					   state */
-		krb5_creds *,
-		krb5_creds **,
-		krb5_creds *** );
-krb5_error_code krb5_get_cred_from_kdc_renew
-	(krb5_context,
-		krb5_ccache,		/* not const, as reading may save
-					   state */
-		krb5_creds *,
-		krb5_creds **,
-		krb5_creds *** );
-
-krb5_error_code krb5_get_cred_via_tkt
-	(krb5_context,
-		   krb5_creds *,
-		   krb5_flags,
-		   krb5_address * const *,
-		   krb5_creds *,
-		   krb5_creds **);
-
-krb5_error_code KRB5_CALLCONV krb5_copy_addr
-	(krb5_context,
-		const krb5_address *,
-		krb5_address **);
-
-void krb5_init_ets
-	(krb5_context);
-void krb5_free_ets
-	(krb5_context);
-krb5_error_code krb5_generate_subkey
-	(krb5_context,
-		const krb5_keyblock *, krb5_keyblock **);
-krb5_error_code krb5_generate_subkey_extended
-	(krb5_context,
-		const krb5_keyblock *,
-		krb5_enctype,
-		krb5_keyblock **);
-krb5_error_code krb5_generate_seq_number
-	(krb5_context,
-		const krb5_keyblock *, krb5_ui_4 *);
-
-krb5_error_code KRB5_CALLCONV krb5_kt_register
-	(krb5_context,
-		const struct _krb5_kt_ops * );
+krb5_error_code krb5_kdc_rep_decrypt_proc(krb5_context, const krb5_keyblock *,
+                                          krb5_const_pointer, krb5_kdc_rep *);
+krb5_error_code KRB5_CALLCONV krb5_decrypt_tkt_part(krb5_context,
+                                                    const krb5_keyblock *,
+                                                    krb5_ticket * );
+krb5_error_code krb5_get_cred_from_kdc(krb5_context, krb5_ccache,
+                                       krb5_creds *, krb5_creds **,
+                                       krb5_creds *** );
+krb5_error_code krb5_get_cred_from_kdc_validate(krb5_context, krb5_ccache,
+                                                krb5_creds *, krb5_creds **,
+                                                krb5_creds *** );
+krb5_error_code krb5_get_cred_from_kdc_renew(krb5_context, krb5_ccache,
+                                             krb5_creds *, krb5_creds **,
+                                             krb5_creds *** );
+
+krb5_error_code krb5_get_cred_via_tkt(krb5_context, krb5_creds *, krb5_flags,
+                                      krb5_address *const *, krb5_creds *,
+                                      krb5_creds **);
+
+krb5_error_code KRB5_CALLCONV krb5_copy_addr(krb5_context,
+                                             const krb5_address *,
+                                             krb5_address **);
+
+void krb5_init_ets(krb5_context);
+void krb5_free_ets(krb5_context);
+krb5_error_code krb5_generate_subkey(krb5_context, const krb5_keyblock *,
+                                     krb5_keyblock **);
+krb5_error_code krb5_generate_subkey_extended(krb5_context,
+                                              const krb5_keyblock *,
+                                              krb5_enctype, krb5_keyblock **);
+krb5_error_code krb5_generate_seq_number(krb5_context, const krb5_keyblock *,
+                                         krb5_ui_4 *);
+
+krb5_error_code KRB5_CALLCONV krb5_kt_register(krb5_context,
+                                               const struct _krb5_kt_ops *);
 
 /* use krb5_free_keytab_entry_contents instead */
-krb5_error_code KRB5_CALLCONV krb5_kt_free_entry
-	(krb5_context,
-		krb5_keytab_entry * );
+krb5_error_code KRB5_CALLCONV krb5_kt_free_entry(krb5_context,
+                                                 krb5_keytab_entry * );
 
-krb5_error_code krb5_principal2salt_norealm
-	(krb5_context,
-		krb5_const_principal, krb5_data *);
+krb5_error_code krb5_principal2salt_norealm(krb5_context, krb5_const_principal,
+                                            krb5_data *);
 
-unsigned int KRB5_CALLCONV krb5_get_notification_message
-	(void);
+unsigned int KRB5_CALLCONV krb5_get_notification_message(void);
 
 /* chk_trans.c */
-krb5_error_code krb5_check_transited_list
-	(krb5_context, const krb5_data *trans,
-	 const krb5_data *realm1, const krb5_data *realm2);
+krb5_error_code krb5_check_transited_list(krb5_context, const krb5_data *trans,
+                                          const krb5_data *realm1,
+                                          const krb5_data *realm2);
 
 /* free_rtree.c */
-void krb5_free_realm_tree
-	(krb5_context,
-		krb5_principal *);
-
-void KRB5_CALLCONV krb5_free_authenticator_contents
-	(krb5_context, krb5_authenticator * );
-
-void KRB5_CALLCONV krb5_free_address
-	(krb5_context, krb5_address * );
-
-void KRB5_CALLCONV krb5_free_enc_tkt_part
-	(krb5_context, krb5_enc_tkt_part * );
-
-void KRB5_CALLCONV krb5_free_tickets
-	(krb5_context, krb5_ticket ** );
-void KRB5_CALLCONV krb5_free_kdc_req
-	(krb5_context, krb5_kdc_req * );
-void KRB5_CALLCONV krb5_free_kdc_rep
-	(krb5_context, krb5_kdc_rep * );
-void KRB5_CALLCONV krb5_free_last_req
-	(krb5_context, krb5_last_req_entry ** );
-void KRB5_CALLCONV krb5_free_enc_kdc_rep_part
-	(krb5_context, krb5_enc_kdc_rep_part * );
-void KRB5_CALLCONV krb5_free_ap_req
-	(krb5_context, krb5_ap_req * );
-void KRB5_CALLCONV krb5_free_ap_rep
-	(krb5_context, krb5_ap_rep * );
-void KRB5_CALLCONV krb5_free_cred
-	(krb5_context, krb5_cred *);
-void KRB5_CALLCONV krb5_free_cred_enc_part
-	(krb5_context, krb5_cred_enc_part *);
-void KRB5_CALLCONV krb5_free_pa_data
-	(krb5_context, krb5_pa_data **);
-void KRB5_CALLCONV krb5_free_tkt_authent
-	(krb5_context, krb5_tkt_authent *);
-void KRB5_CALLCONV krb5_free_pwd_data
-	(krb5_context, krb5_pwd_data *);
-void KRB5_CALLCONV krb5_free_pwd_sequences
-	(krb5_context, passwd_phrase_element **);
-void KRB5_CALLCONV krb5_free_passwd_phrase_element
-	(krb5_context, passwd_phrase_element *);
-void KRB5_CALLCONV krb5_free_alt_method
-	(krb5_context, krb5_alt_method *);
-void KRB5_CALLCONV krb5_free_enc_data
-	(krb5_context, krb5_enc_data *);
-krb5_error_code krb5_set_config_files
-	(krb5_context, const char **);
-
-krb5_error_code KRB5_CALLCONV krb5_get_default_config_files
-	(char ***filenames);
-
-void KRB5_CALLCONV krb5_free_config_files
-	(char **filenames);
-krb5_error_code krb5int_send_tgs
-	(krb5_context,
-		krb5_flags,
-		const krb5_ticket_times *,
-		const krb5_enctype *,
-		krb5_const_principal,
-		krb5_address * const *,
-		krb5_authdata * const *,
-		krb5_pa_data * const *,
-		const krb5_data *,
-		krb5_creds *,
-		krb5_error_code (*gcvt_fct)(krb5_context,
-					    krb5_keyblock *,
-					    krb5_kdc_req *,
-					    void *),
-		void *gcvt_data,
-		krb5_response * , krb5_keyblock **subkey);
-                /* The subkey field is an output parameter; if a
-		 * tgs-rep is received then the subkey will be filled
-		 * in with the subkey needed to decrypt the TGS
-		 * response. Otherwise it will be set to null.
-		 */
-krb5_error_code krb5int_decode_tgs_rep
-	(krb5_context,
-		krb5_data *,
-	 const krb5_keyblock *, krb5_keyusage,
-		krb5_kdc_rep ** );
-krb5_error_code krb5int_find_authdata
-(krb5_context context, krb5_authdata *const * ticket_authdata,
- krb5_authdata * const *ap_req_authdata,
- krb5_authdatatype ad_type,
- krb5_authdata ***results);
-
-krb5_error_code krb5_rd_req_decoded
-	(krb5_context,
-		krb5_auth_context *,
-		const krb5_ap_req *,
-		krb5_const_principal,
-		krb5_keytab,
-		krb5_flags *,
-		krb5_ticket **);
-
-krb5_error_code krb5_rd_req_decoded_anyflag
-	(krb5_context,
-		krb5_auth_context *,
-		const krb5_ap_req *,
-		krb5_const_principal,
-		krb5_keytab,
-		krb5_flags *,
-		krb5_ticket **);
-
-krb5_error_code KRB5_CALLCONV krb5_cc_register
-	(krb5_context,
-		const krb5_cc_ops *,
-		krb5_boolean );
-krb5_error_code krb5_walk_realm_tree
-	(krb5_context,
-		const krb5_data *,
-		const krb5_data *,
-		krb5_principal **,
-		int);
-krb5_error_code KRB5_CALLCONV krb5_auth_con_set_req_cksumtype
-	(krb5_context,
-		krb5_auth_context,
-		krb5_cksumtype);
-
-krb5_error_code krb5_auth_con_set_safe_cksumtype
-	(krb5_context,
-		krb5_auth_context,
-		krb5_cksumtype);
-krb5_error_code krb5_auth_con_setivector
-	(krb5_context,
-		krb5_auth_context,
-		krb5_pointer);
-
-krb5_error_code krb5_auth_con_getivector
-	(krb5_context,
-		krb5_auth_context,
-		krb5_pointer *);
-
-krb5_error_code krb5_auth_con_setpermetypes
-	(krb5_context,
-	    krb5_auth_context,
-	    const krb5_enctype *);
-
-krb5_error_code krb5_auth_con_getpermetypes
-	(krb5_context,
-	    krb5_auth_context,
-	    krb5_enctype **);
-
-krb5_error_code krb5_auth_con_get_subkey_enctype
-	(krb5_context context,
-	    krb5_auth_context,
-	    krb5_enctype *);
-
-krb5_error_code
-krb5_auth_con_get_authdata_context
-	(krb5_context context,
-	    krb5_auth_context auth_context,
-	    krb5_authdata_context *ad_context);
-
-krb5_error_code
-krb5_auth_con_set_authdata_context
-	(krb5_context context,
-	    krb5_auth_context auth_context,
-	    krb5_authdata_context ad_context);
+void krb5_free_realm_tree(krb5_context, krb5_principal *);
+
+void KRB5_CALLCONV krb5_free_authenticator_contents(krb5_context,
+                                                    krb5_authenticator *);
+
+void KRB5_CALLCONV krb5_free_address(krb5_context, krb5_address *);
+
+void KRB5_CALLCONV krb5_free_enc_tkt_part(krb5_context, krb5_enc_tkt_part *);
+
+void KRB5_CALLCONV krb5_free_tickets(krb5_context, krb5_ticket **);
+void KRB5_CALLCONV krb5_free_kdc_req(krb5_context, krb5_kdc_req *);
+void KRB5_CALLCONV krb5_free_kdc_rep(krb5_context, krb5_kdc_rep *);
+void KRB5_CALLCONV krb5_free_last_req(krb5_context, krb5_last_req_entry **);
+void KRB5_CALLCONV krb5_free_enc_kdc_rep_part(krb5_context,
+                                              krb5_enc_kdc_rep_part *);
+void KRB5_CALLCONV krb5_free_ap_req(krb5_context, krb5_ap_req *);
+void KRB5_CALLCONV krb5_free_ap_rep(krb5_context, krb5_ap_rep *);
+void KRB5_CALLCONV krb5_free_cred(krb5_context, krb5_cred *);
+void KRB5_CALLCONV krb5_free_cred_enc_part(krb5_context, krb5_cred_enc_part *);
+void KRB5_CALLCONV krb5_free_pa_data(krb5_context, krb5_pa_data **);
+void KRB5_CALLCONV krb5_free_tkt_authent(krb5_context, krb5_tkt_authent *);
+void KRB5_CALLCONV krb5_free_pwd_data(krb5_context, krb5_pwd_data *);
+void KRB5_CALLCONV krb5_free_pwd_sequences(krb5_context,
+                                           passwd_phrase_element **);
+void KRB5_CALLCONV krb5_free_passwd_phrase_element(krb5_context,
+                                                   passwd_phrase_element *);
+void KRB5_CALLCONV krb5_free_alt_method(krb5_context, krb5_alt_method *);
+void KRB5_CALLCONV krb5_free_enc_data(krb5_context, krb5_enc_data *);
+krb5_error_code krb5_set_config_files(krb5_context, const char **);
+
+krb5_error_code KRB5_CALLCONV krb5_get_default_config_files(char ***filenames);
+
+void KRB5_CALLCONV krb5_free_config_files(char **filenames);
+krb5_error_code krb5int_send_tgs(krb5_context, krb5_flags,
+                                 const krb5_ticket_times *,
+                                 const krb5_enctype *,
+                                 krb5_const_principal, krb5_address *const *,
+                                 krb5_authdata *const *,
+                                 krb5_pa_data *const *, const krb5_data *,
+                                 krb5_creds *,
+                                 krb5_error_code (*gcvt_fct)(krb5_context,
+                                                             krb5_keyblock *,
+                                                             krb5_kdc_req *,
+                                                             void *),
+                                 void *gcvt_data, krb5_response *
+                                 krb5_keyblock **subkey);
+/* The subkey field is an output parameter; if a
+ * tgs-rep is received then the subkey will be filled
+ * in with the subkey needed to decrypt the TGS
+ * response. Otherwise it will be set to null.
+ */
+krb5_error_code krb5int_decode_tgs_rep(krb5_context, krb5_data *,
+                                       const krb5_keyblock *, krb5_keyusage,
+                                       krb5_kdc_rep ** );
+
+krb5_error_code krb5int_find_authdata(krb5_context context,
+                                      krb5_authdata *const *ticket_authdata,
+                                      krb5_authdata *const *ap_req_authdata,
+                                      krb5_authdatatype ad_type,
+                                      krb5_authdata ***results);
+
+krb5_error_code krb5_rd_req_decoded(krb5_context, krb5_auth_context *,
+                                    const krb5_ap_req *, krb5_const_principal,
+                                    krb5_keytab, krb5_flags *, krb5_ticket **);
+
+krb5_error_code krb5_rd_req_decoded_anyflag(krb5_context, krb5_auth_context *,
+                                            const krb5_ap_req *,
+                                            krb5_const_principal, krb5_keytab,
+                                            krb5_flags *, krb5_ticket **);
+
+krb5_error_code KRB5_CALLCONV
+krb5_cc_register(krb5_context, const krb5_cc_ops *, krb5_boolean );
+
+krb5_error_code krb5_walk_realm_tree(krb5_context, const krb5_data *,
+                                     const krb5_data *, krb5_principal **,
+                                     int);
+
+krb5_error_code KRB5_CALLCONV
+krb5_auth_con_set_req_cksumtype(krb5_context, krb5_auth_context,
+                                krb5_cksumtype);
+
+krb5_error_code
+krb5_auth_con_set_safe_cksumtype(krb5_context, krb5_auth_context,
+                                 krb5_cksumtype);
+
+krb5_error_code krb5_auth_con_setivector(krb5_context, krb5_auth_context,
+                                         krb5_pointer);
+
+krb5_error_code krb5_auth_con_getivector(krb5_context, krb5_auth_context,
+                                         krb5_pointer *);
+
+krb5_error_code krb5_auth_con_setpermetypes(krb5_context, krb5_auth_context,
+                                            const krb5_enctype *);
+
+krb5_error_code krb5_auth_con_getpermetypes(krb5_context, krb5_auth_context,
+                                            krb5_enctype **);
+
+krb5_error_code krb5_auth_con_get_subkey_enctype(krb5_context context,
+                                                 krb5_auth_context,
+                                                 krb5_enctype *);
+
+krb5_error_code
+krb5_auth_con_get_authdata_context(krb5_context context,
+                                   krb5_auth_context auth_context,
+                                   krb5_authdata_context *ad_context);
+
+krb5_error_code
+krb5_auth_con_set_authdata_context(krb5_context context,
+                                   krb5_auth_context auth_context,
+                                   krb5_authdata_context ad_context);
 
 krb5_error_code KRB5_CALLCONV
-krb5int_server_decrypt_ticket_keyblock
-  	(krb5_context context,
-                const krb5_keyblock *key,
-                krb5_ticket  *ticket);
-
-krb5_error_code krb5_read_message (krb5_context, krb5_pointer, krb5_data *);
-krb5_error_code krb5_write_message (krb5_context, krb5_pointer, krb5_data *);
-krb5_error_code krb5int_write_messages (krb5_context, krb5_pointer, krb5_data *, int);
-int krb5_net_read (krb5_context, int , char *, int);
-int krb5_net_write (krb5_context, int , const char *, int);
-
-krb5_error_code KRB5_CALLCONV krb5_get_realm_domain
-	(krb5_context,
-		const char *,
-		char ** );
-
-krb5_error_code krb5_gen_portaddr
-	(krb5_context,
-		const krb5_address *,
-		krb5_const_pointer,
-		krb5_address **);
-krb5_error_code krb5_gen_replay_name
-	(krb5_context,
-		const krb5_address *,
-		const char *,
-		char **);
-krb5_error_code krb5_make_fulladdr
-	(krb5_context,
-		krb5_address *,
-		krb5_address *,
-		krb5_address *);
-
-krb5_error_code krb5_set_debugging_time
-	(krb5_context, krb5_timestamp, krb5_int32);
-krb5_error_code krb5_use_natural_time
-	(krb5_context);
-krb5_error_code krb5_set_time_offsets
-	(krb5_context, krb5_timestamp, krb5_int32);
+krb5int_server_decrypt_ticket_keyblock(krb5_context context,
+                                       const krb5_keyblock *key,
+                                       krb5_ticket  *ticket);
+
+krb5_error_code krb5_read_message(krb5_context, krb5_pointer, krb5_data *);
+krb5_error_code krb5_write_message(krb5_context, krb5_pointer, krb5_data *);
+krb5_error_code krb5int_write_messages(krb5_context, krb5_pointer, krb5_data *,
+                                       int);
+int krb5_net_read(krb5_context, int , char *, int);
+int krb5_net_write(krb5_context, int , const char *, int);
+
+krb5_error_code KRB5_CALLCONV krb5_get_realm_domain(krb5_context,
+                                                    const char *, char ** );
+
+krb5_error_code krb5_gen_portaddr(krb5_context, const krb5_address *,
+                                  krb5_const_pointer, krb5_address **);
+
+krb5_error_code krb5_gen_replay_name(krb5_context, const krb5_address *,
+                                     const char *, char **);
+krb5_error_code krb5_make_fulladdr(krb5_context, krb5_address *,
+                                   krb5_address *, krb5_address *);
+
+krb5_error_code krb5_set_debugging_time(krb5_context, krb5_timestamp,
+                                        krb5_int32);
+krb5_error_code krb5_use_natural_time(krb5_context);
+krb5_error_code krb5_set_time_offsets(krb5_context, krb5_timestamp,
+                                      krb5_int32);
 krb5_error_code krb5int_check_clockskew(krb5_context, krb5_timestamp);
 /*
  * The realm iterator functions
  */
 
-krb5_error_code KRB5_CALLCONV krb5_realm_iterator_create
-	(krb5_context context, void **iter_p);
+krb5_error_code KRB5_CALLCONV
+krb5_realm_iterator_create(krb5_context context, void **iter_p);
 
-krb5_error_code KRB5_CALLCONV krb5_realm_iterator
-	(krb5_context context, void **iter_p, char **ret_realm);
+krb5_error_code KRB5_CALLCONV
+krb5_realm_iterator(krb5_context context, void **iter_p, char **ret_realm);
 
-void KRB5_CALLCONV krb5_realm_iterator_free
-	(krb5_context context, void **iter_p);
+void KRB5_CALLCONV
+krb5_realm_iterator_free(krb5_context context, void **iter_p);
 
-void KRB5_CALLCONV krb5_free_realm_string
-	(krb5_context context, char *str);
+void KRB5_CALLCONV krb5_free_realm_string(krb5_context context, char *str);
 
 /* Internal principal function used by KIM to avoid code duplication */
 krb5_error_code KRB5_CALLCONV
@@ -2957,7 +2821,7 @@ static inline int
 data_eq(krb5_data d1, krb5_data d2)
 {
     return (d1.length == d2.length
-	    && !memcmp(d1.data, d2.data, d1.length));
+            && !memcmp(d1.data, d2.data, d1.length));
 }
 
 static inline krb5_data
@@ -2993,8 +2857,8 @@ static inline int
 authdata_eq(krb5_authdata a1, krb5_authdata a2)
 {
     return (a1.ad_type == a2.ad_type
-	    && a1.length == a2.length
-	    && !memcmp(a1.contents, a2.contents, a1.length));
+            && a1.length == a2.length
+            && !memcmp(a1.contents, a2.contents, a1.length));
 }
 
 /* Allocate zeroed memory; set *code to 0 on success or ENOMEM on failure. */
@@ -3010,40 +2874,40 @@ k5alloc(size_t size, krb5_error_code *code)
 
 krb5_error_code KRB5_CALLCONV
 krb5int_pac_sign(krb5_context context,
-		 krb5_pac pac,
-		 krb5_timestamp authtime,
-		 krb5_const_principal principal,
-		 const krb5_keyblock *server_key,
-		 const krb5_keyblock *privsvr_key,
-		 krb5_data *data);
+                 krb5_pac pac,
+                 krb5_timestamp authtime,
+                 krb5_const_principal principal,
+                 const krb5_keyblock *server_key,
+                 const krb5_keyblock *privsvr_key,
+                 krb5_data *data);
 
 krb5_error_code KRB5_CALLCONV
 krb5_get_credentials_for_user(krb5_context context, krb5_flags options,
-			      krb5_ccache ccache,
-			      krb5_creds *in_creds,
-			      krb5_data *cert,
-			      krb5_creds **out_creds);
+                              krb5_ccache ccache,
+                              krb5_creds *in_creds,
+                              krb5_data *cert,
+                              krb5_creds **out_creds);
 
 krb5_error_code KRB5_CALLCONV
 krb5_get_credentials_for_proxy(krb5_context context,
-			       krb5_flags options,
-			       krb5_ccache ccache,
-			       krb5_creds *in_creds,
-			       krb5_ticket *evidence_tkt,
-			       krb5_creds **out_creds);
+                               krb5_flags options,
+                               krb5_ccache ccache,
+                               krb5_creds *in_creds,
+                               krb5_ticket *evidence_tkt,
+                               krb5_creds **out_creds);
 
 krb5_error_code KRB5_CALLCONV
 krb5int_get_authdata_containee_types(krb5_context context,
-				     const krb5_authdata *container,
-				     unsigned int *nad_types,
-				     krb5_authdatatype **ad_types);
+                                     const krb5_authdata *container,
+                                     unsigned int *nad_types,
+                                     krb5_authdatatype **ad_types);
 
 krb5_error_code krb5int_parse_enctype_list(krb5_context context, char *profstr,
-					   krb5_enctype *default_list,
-					   krb5_enctype **result);
+                                           krb5_enctype *default_list,
+                                           krb5_enctype **result);
 
 #ifdef DEBUG_ERROR_LOCATIONS
-#define krb5_set_error_message(ctx, code, ...) \
+#define krb5_set_error_message(ctx, code, ...)                          \
     krb5_set_error_message_fl(ctx, code, __FILE__, __LINE__, __VA_ARGS__)
 #endif