From: Greg Hudson <ghudson@mit.edu>
Date: Sat, 31 Oct 2009 03:52:01 +0000 (+0000)
Subject: In lib/krb5/asn.1, ensure that function definition headers have
X-Git-Tag: krb5-1.8-alpha1~231
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5802e4ff348ee881f7957bb775b373db38dbebff;p=krb5.git

In lib/krb5/asn.1, ensure that function definition headers have
function names at the beginnings of lines.

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

diff --git a/src/lib/krb5/asn.1/asn1_decode.c b/src/lib/krb5/asn.1/asn1_decode.c
index 032e82734..027f387db 100644
--- a/src/lib/krb5/asn.1/asn1_decode.c
+++ b/src/lib/krb5/asn.1/asn1_decode.c
@@ -57,7 +57,8 @@ if (asn1class != UNIVERSAL || construction != PRIMITIVE || tagnum != type)\
 #define cleanup()\
 return 0
 
-asn1_error_code asn1_decode_integer(asn1buf *buf, long int *val)
+asn1_error_code
+asn1_decode_integer(asn1buf *buf, long int *val)
 {
     setup();
     asn1_octet o;
@@ -82,7 +83,8 @@ asn1_error_code asn1_decode_integer(asn1buf *buf, long int *val)
     cleanup();
 }
 
-asn1_error_code asn1_decode_unsigned_integer(asn1buf *buf, long unsigned int *val)
+asn1_error_code
+asn1_decode_unsigned_integer(asn1buf *buf, long unsigned int *val)
 {
     setup();
     asn1_octet o;
@@ -116,7 +118,8 @@ asn1_error_code asn1_decode_unsigned_integer(asn1buf *buf, long unsigned int *va
  * normal integer conversions do, i.e., would preserve bits on a
  * two's-complement architecture.
  */
-asn1_error_code asn1_decode_maybe_unsigned(asn1buf *buf, unsigned long *val)
+asn1_error_code
+asn1_decode_maybe_unsigned(asn1buf *buf, unsigned long *val)
 {
     setup();
     asn1_octet o;
@@ -150,7 +153,8 @@ asn1_error_code asn1_decode_maybe_unsigned(asn1buf *buf, unsigned long *val)
     cleanup();
 }
 
-asn1_error_code asn1_decode_oid(asn1buf *buf, unsigned int *retlen, asn1_octet **val)
+asn1_error_code
+asn1_decode_oid(asn1buf *buf, unsigned int *retlen, asn1_octet **val)
 {
     setup();
     tag(ASN1_OBJECTIDENTIFIER);
@@ -160,7 +164,8 @@ asn1_error_code asn1_decode_oid(asn1buf *buf, unsigned int *retlen, asn1_octet *
     cleanup();
 }
 
-asn1_error_code asn1_decode_octetstring(asn1buf *buf, unsigned int *retlen, asn1_octet **val)
+asn1_error_code
+asn1_decode_octetstring(asn1buf *buf, unsigned int *retlen, asn1_octet **val)
 {
     setup();
     tag(ASN1_OCTETSTRING);
@@ -170,7 +175,8 @@ asn1_error_code asn1_decode_octetstring(asn1buf *buf, unsigned int *retlen, asn1
     cleanup();
 }
 
-asn1_error_code asn1_decode_charstring(asn1buf *buf, unsigned int *retlen, char **val)
+asn1_error_code
+asn1_decode_charstring(asn1buf *buf, unsigned int *retlen, char **val)
 {
     setup();
     tag(ASN1_OCTETSTRING);
@@ -181,7 +187,8 @@ asn1_error_code asn1_decode_charstring(asn1buf *buf, unsigned int *retlen, char
 }
 
 
-asn1_error_code asn1_decode_generalstring(asn1buf *buf, unsigned int *retlen, char **val)
+asn1_error_code
+asn1_decode_generalstring(asn1buf *buf, unsigned int *retlen, char **val)
 {
     setup();
     tag(ASN1_GENERALSTRING);
@@ -192,7 +199,8 @@ asn1_error_code asn1_decode_generalstring(asn1buf *buf, unsigned int *retlen, ch
 }
 
 
-asn1_error_code asn1_decode_null(asn1buf *buf)
+asn1_error_code
+asn1_decode_null(asn1buf *buf)
 {
     setup();
     tag(ASN1_NULL);
@@ -200,7 +208,8 @@ asn1_error_code asn1_decode_null(asn1buf *buf)
     cleanup();
 }
 
-asn1_error_code asn1_decode_printablestring(asn1buf *buf, int *retlen, char **val)
+asn1_error_code
+asn1_decode_printablestring(asn1buf *buf, int *retlen, char **val)
 {
     setup();
     tag(ASN1_PRINTABLESTRING);
@@ -210,7 +219,8 @@ asn1_error_code asn1_decode_printablestring(asn1buf *buf, int *retlen, char **va
     cleanup();
 }
 
-asn1_error_code asn1_decode_ia5string(asn1buf *buf, int *retlen, char **val)
+asn1_error_code
+asn1_decode_ia5string(asn1buf *buf, int *retlen, char **val)
 {
     setup();
     tag(ASN1_IA5STRING);
@@ -220,7 +230,8 @@ asn1_error_code asn1_decode_ia5string(asn1buf *buf, int *retlen, char **val)
     cleanup();
 }
 
-asn1_error_code asn1_decode_generaltime(asn1buf *buf, time_t *val)
+asn1_error_code
+asn1_decode_generaltime(asn1buf *buf, time_t *val)
 {
     setup();
     char *s;
@@ -261,7 +272,8 @@ done:
     cleanup();
 }
 
-asn1_error_code asn1_decode_boolean(asn1buf *buf, unsigned *val)
+asn1_error_code
+asn1_decode_boolean(asn1buf *buf, unsigned *val)
 {
     setup();
     asn1_octet bval;
diff --git a/src/lib/krb5/asn.1/asn1_encode.c b/src/lib/krb5/asn.1/asn1_encode.c
index f67c8cfee..e71c530d1 100644
--- a/src/lib/krb5/asn.1/asn1_encode.c
+++ b/src/lib/krb5/asn.1/asn1_encode.c
@@ -30,8 +30,8 @@
 #include "asn1_encode.h"
 #include "asn1_make.h"
 
-asn1_error_code asn1_encode_boolean(asn1buf *buf, asn1_intmax val,
-                                    unsigned int *retlen)
+asn1_error_code
+asn1_encode_boolean(asn1buf *buf, asn1_intmax val, unsigned int *retlen)
 {
     asn1_error_code retval;
     unsigned int length = 0;
@@ -52,9 +52,9 @@ asn1_error_code asn1_encode_boolean(asn1buf *buf, asn1_intmax val,
     return 0;
 }
 
-static asn1_error_code asn1_encode_integer_internal(asn1buf *buf,
-                                                    asn1_intmax val,
-                                                    unsigned int *retlen)
+static asn1_error_code
+asn1_encode_integer_internal(asn1buf *buf, asn1_intmax val,
+                             unsigned int *retlen)
 {
     asn1_error_code retval;
     unsigned int length = 0;
@@ -85,8 +85,8 @@ static asn1_error_code asn1_encode_integer_internal(asn1buf *buf,
     return 0;
 }
 
-asn1_error_code asn1_encode_integer(asn1buf * buf, asn1_intmax val,
-                                    unsigned int *retlen)
+asn1_error_code
+asn1_encode_integer(asn1buf * buf, asn1_intmax val, unsigned int *retlen)
 {
     asn1_error_code retval;
     unsigned int length = 0;
@@ -124,8 +124,9 @@ asn1_encode_enumerated(asn1buf * buf, long val,
 }
 #endif
 
-asn1_error_code asn1_encode_unsigned_integer(asn1buf *buf, asn1_uintmax val,
-                                             unsigned int *retlen)
+asn1_error_code
+asn1_encode_unsigned_integer(asn1buf *buf, asn1_uintmax val,
+                             unsigned int *retlen)
 {
     asn1_error_code retval;
     unsigned int length = 0;
@@ -175,17 +176,17 @@ encode_bytestring_with_tag(asn1buf *buf, unsigned int len,
     return 0;
 }
 
-asn1_error_code asn1_encode_oid(asn1buf *buf, unsigned int len,
-                                const asn1_octet *val,
-                                unsigned int *retlen)
+asn1_error_code
+asn1_encode_oid(asn1buf *buf, unsigned int len, const asn1_octet *val,
+                unsigned int *retlen)
 {
     return encode_bytestring_with_tag(buf, len, val, ASN1_OBJECTIDENTIFIER,
                                       retlen);
 }
 
-asn1_error_code asn1_encode_octetstring(asn1buf *buf, unsigned int len,
-                                        const void *val,
-                                        unsigned int *retlen)
+asn1_error_code
+asn1_encode_octetstring(asn1buf *buf, unsigned int len, const void *val,
+                        unsigned int *retlen)
 {
     return encode_bytestring_with_tag(buf, len, val, ASN1_OCTETSTRING,
                                       retlen);
@@ -220,8 +221,8 @@ asn1_error_code asn1_encode_ia5string(asn1buf *buf, unsigned int len,
 }
 #endif
 
-asn1_error_code asn1_encode_generaltime(asn1buf *buf, time_t val,
-                                        unsigned int *retlen)
+asn1_error_code
+asn1_encode_generaltime(asn1buf *buf, time_t val, unsigned int *retlen)
 {
     struct tm *gtime, gtimebuf;
     char s[16], *sp;
@@ -273,17 +274,17 @@ asn1_error_code asn1_encode_generaltime(asn1buf *buf, time_t val,
                                       retlen);
 }
 
-asn1_error_code asn1_encode_generalstring(asn1buf *buf, unsigned int len,
-                                          const void *val,
-                                          unsigned int *retlen)
+asn1_error_code
+asn1_encode_generalstring(asn1buf *buf, unsigned int len, const void *val,
+                          unsigned int *retlen)
 {
     return encode_bytestring_with_tag(buf, len, val, ASN1_GENERALSTRING,
                                       retlen);
 }
 
-asn1_error_code asn1_encode_bitstring(asn1buf *buf, unsigned int len,
-                                      const void *val,
-                                      unsigned int *retlen)
+asn1_error_code
+asn1_encode_bitstring(asn1buf *buf, unsigned int len, const void *val,
+                      unsigned int *retlen)
 {
     asn1_error_code retval;
     unsigned int length;
@@ -299,8 +300,9 @@ asn1_error_code asn1_encode_bitstring(asn1buf *buf, unsigned int len,
     return 0;
 }
 
-asn1_error_code asn1_encode_opaque(asn1buf *buf, unsigned int len,
-                                   const void *val, unsigned int *retlen)
+asn1_error_code
+asn1_encode_opaque(asn1buf *buf, unsigned int len, const void *val,
+                   unsigned int *retlen)
 {
     asn1_error_code retval;
 
diff --git a/src/lib/krb5/asn.1/asn1_get.c b/src/lib/krb5/asn.1/asn1_get.c
index d3706fbd6..f17cec25e 100644
--- a/src/lib/krb5/asn.1/asn1_get.c
+++ b/src/lib/krb5/asn.1/asn1_get.c
@@ -100,7 +100,8 @@ asn1_get_tag_2(asn1buf *buf, taginfo *t)
     return 0;
 }
 
-asn1_error_code asn1_get_sequence(asn1buf *buf, unsigned int *retlen, int *indef)
+asn1_error_code
+asn1_get_sequence(asn1buf *buf, unsigned int *retlen, int *indef)
 {
     taginfo t;
     asn1_error_code retval;
diff --git a/src/lib/krb5/asn.1/asn1_k_decode.c b/src/lib/krb5/asn.1/asn1_k_decode.c
index e6682b541..34306f442 100644
--- a/src/lib/krb5/asn.1/asn1_k_decode.c
+++ b/src/lib/krb5/asn.1/asn1_k_decode.c
@@ -391,7 +391,8 @@ end_sequence_of_no_tagvars_helper(asn1buf *buf, asn1buf *seqbufp,
     return 0;
 
 /* scalars */
-asn1_error_code asn1_decode_kerberos_time(asn1buf *buf, krb5_timestamp *val)
+asn1_error_code
+asn1_decode_kerberos_time(asn1buf *buf, krb5_timestamp *val)
 {
     time_t      t;
     asn1_error_code retval;
@@ -435,7 +436,8 @@ integer_convert(asn1_decode_authdatatype,krb5_authdatatype)
 unsigned_integer_convert(asn1_decode_ui_2,krb5_ui_2)
 unsigned_integer_convert(asn1_decode_ui_4,krb5_ui_4)
 
-asn1_error_code asn1_decode_seqnum(asn1buf *buf, krb5_ui_4 *val)
+asn1_error_code
+asn1_decode_seqnum(asn1buf *buf, krb5_ui_4 *val)
 {
     asn1_error_code retval;
     unsigned long n;
@@ -446,7 +448,8 @@ asn1_error_code asn1_decode_seqnum(asn1buf *buf, krb5_ui_4 *val)
     return 0;
 }
 
-asn1_error_code asn1_decode_msgtype(asn1buf *buf, krb5_msgtype *val)
+asn1_error_code
+asn1_decode_msgtype(asn1buf *buf, krb5_msgtype *val)
 {
     asn1_error_code retval;
     unsigned long n;
@@ -460,14 +463,16 @@ asn1_error_code asn1_decode_msgtype(asn1buf *buf, krb5_msgtype *val)
 
 
 /* structures */
-asn1_error_code asn1_decode_realm(asn1buf *buf, krb5_principal *val)
+asn1_error_code
+asn1_decode_realm(asn1buf *buf, krb5_principal *val)
 {
     return asn1_decode_generalstring(buf,
                                      &((*val)->realm.length),
                                      &((*val)->realm.data));
 }
 
-asn1_error_code asn1_decode_principal_name(asn1buf *buf, krb5_principal *val)
+asn1_error_code
+asn1_decode_principal_name(asn1buf *buf, krb5_principal *val)
 {
     int size = 0, i;
     krb5_data *array = NULL, *new_array;
@@ -509,7 +514,8 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_checksum(asn1buf *buf, krb5_checksum *val)
+asn1_error_code
+asn1_decode_checksum(asn1buf *buf, krb5_checksum *val)
 {
     setup();
     val->contents = NULL;
@@ -525,12 +531,14 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_checksum_ptr(asn1buf *buf, krb5_checksum **valptr)
+asn1_error_code
+asn1_decode_checksum_ptr(asn1buf *buf, krb5_checksum **valptr)
 {
     decode_ptr(krb5_checksum *, asn1_decode_checksum);
 }
 
-asn1_error_code asn1_decode_encryption_key(asn1buf *buf, krb5_keyblock *val)
+asn1_error_code
+asn1_decode_encryption_key(asn1buf *buf, krb5_keyblock *val)
 {
     setup();
     val->contents = NULL;
@@ -552,7 +560,8 @@ asn1_decode_encryption_key_ptr(asn1buf *buf, krb5_keyblock **valptr)
     decode_ptr(krb5_keyblock *, asn1_decode_encryption_key);
 }
 
-asn1_error_code asn1_decode_encrypted_data(asn1buf *buf, krb5_enc_data *val)
+asn1_error_code
+asn1_decode_encrypted_data(asn1buf *buf, krb5_enc_data *val)
 {
     setup();
     val->ciphertext.data = NULL;
@@ -570,7 +579,8 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_krb5_flags(asn1buf *buf, krb5_flags *val)
+asn1_error_code
+asn1_decode_krb5_flags(asn1buf *buf, krb5_flags *val)
 {
     asn1_error_code retval;
     asn1_octet unused, o;
@@ -611,16 +621,20 @@ asn1_error_code asn1_decode_krb5_flags(asn1buf *buf, krb5_flags *val)
     return 0;
 }
 
-asn1_error_code asn1_decode_ticket_flags(asn1buf *buf, krb5_flags *val)
+asn1_error_code
+asn1_decode_ticket_flags(asn1buf *buf, krb5_flags *val)
 { return asn1_decode_krb5_flags(buf,val); }
 
-asn1_error_code asn1_decode_ap_options(asn1buf *buf, krb5_flags *val)
+asn1_error_code
+asn1_decode_ap_options(asn1buf *buf, krb5_flags *val)
 { return asn1_decode_krb5_flags(buf,val); }
 
-asn1_error_code asn1_decode_kdc_options(asn1buf *buf, krb5_flags *val)
+asn1_error_code
+asn1_decode_kdc_options(asn1buf *buf, krb5_flags *val)
 { return asn1_decode_krb5_flags(buf,val); }
 
-asn1_error_code asn1_decode_transited_encoding(asn1buf *buf, krb5_transited *val)
+asn1_error_code
+asn1_decode_transited_encoding(asn1buf *buf, krb5_transited *val)
 {
     setup();
     val->tr_contents.data = NULL;
@@ -636,7 +650,8 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_enc_kdc_rep_part(asn1buf *buf, krb5_enc_kdc_rep_part *val)
+asn1_error_code
+asn1_decode_enc_kdc_rep_part(asn1buf *buf, krb5_enc_kdc_rep_part *val)
 {
     setup();
     val->session = NULL;
@@ -676,7 +691,8 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_ticket(asn1buf *buf, krb5_ticket *val)
+asn1_error_code
+asn1_decode_ticket(asn1buf *buf, krb5_ticket *val)
 {
     setup();
     unsigned int applen;
@@ -714,7 +730,8 @@ asn1_decode_ticket_ptr(asn1buf *buf, krb5_ticket **valptr)
     decode_ptr(krb5_ticket *, asn1_decode_ticket);
 }
 
-asn1_error_code asn1_decode_kdc_req(asn1buf *buf, krb5_kdc_req *val)
+asn1_error_code
+asn1_decode_kdc_req(asn1buf *buf, krb5_kdc_req *val)
 {
     setup();
     val->padata = NULL;
@@ -735,7 +752,8 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_kdc_req_body(asn1buf *buf, krb5_kdc_req *val)
+asn1_error_code
+asn1_decode_kdc_req_body(asn1buf *buf, krb5_kdc_req *val)
 {
     setup();
     val->client = NULL;
@@ -805,7 +823,8 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_krb_safe_body(asn1buf *buf, krb5_safe *val)
+asn1_error_code
+asn1_decode_krb_safe_body(asn1buf *buf, krb5_safe *val)
 {
     setup();
     val->user_data.data = NULL;
@@ -834,7 +853,8 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_host_address(asn1buf *buf, krb5_address *val)
+asn1_error_code
+asn1_decode_host_address(asn1buf *buf, krb5_address *val)
 {
     setup();
     val->contents = NULL;
@@ -857,7 +877,8 @@ asn1_decode_host_address_ptr(asn1buf *buf, krb5_address **valptr)
     decode_ptr(krb5_address *, asn1_decode_host_address);
 }
 
-asn1_error_code asn1_decode_kdc_rep(asn1buf *buf, krb5_kdc_rep *val)
+asn1_error_code
+asn1_decode_kdc_rep(asn1buf *buf, krb5_kdc_rep *val)
 {
     setup();
     val->padata = NULL;
@@ -954,19 +975,22 @@ error_out:\
   free(array);\
   return retval
 
-static void free_authdata_elt(void *dummy, krb5_authdata *val)
+static void
+free_authdata_elt(void *dummy, krb5_authdata *val)
 {
     free(val->contents);
     free(val);
 }
 
-asn1_error_code asn1_decode_authorization_data(asn1buf *buf, krb5_authdata ***val)
+asn1_error_code
+asn1_decode_authorization_data(asn1buf *buf, krb5_authdata ***val)
 {
     decode_array_body(krb5_authdata,asn1_decode_authdata_elt_ptr,
                       free_authdata_elt);
 }
 
-asn1_error_code asn1_decode_authdata_elt(asn1buf *buf, krb5_authdata *val)
+asn1_error_code
+asn1_decode_authdata_elt(asn1buf *buf, krb5_authdata *val)
 {
     setup();
     val->contents = NULL;
@@ -989,18 +1013,21 @@ asn1_decode_authdata_elt_ptr(asn1buf *buf, krb5_authdata **valptr)
     decode_ptr(krb5_authdata *, asn1_decode_authdata_elt);
 }
 
-asn1_error_code asn1_decode_host_addresses(asn1buf *buf, krb5_address ***val)
+asn1_error_code
+asn1_decode_host_addresses(asn1buf *buf, krb5_address ***val)
 {
     decode_array_body(krb5_address,asn1_decode_host_address_ptr,
                       krb5_free_address);
 }
 
-asn1_error_code asn1_decode_sequence_of_ticket(asn1buf *buf, krb5_ticket ***val)
+asn1_error_code
+asn1_decode_sequence_of_ticket(asn1buf *buf, krb5_ticket ***val)
 {
     decode_array_body(krb5_ticket,asn1_decode_ticket_ptr,krb5_free_ticket);
 }
 
-static void free_cred_info(void *dummy, krb5_cred_info *val)
+static void
+free_cred_info(void *dummy, krb5_cred_info *val)
 {
     krb5_free_keyblock(NULL, val->session);
     krb5_free_principal(NULL, val->client);
@@ -1009,13 +1036,15 @@ static void free_cred_info(void *dummy, krb5_cred_info *val)
     free(val);
 }
 
-asn1_error_code asn1_decode_sequence_of_krb_cred_info(asn1buf *buf, krb5_cred_info ***val)
+asn1_error_code
+asn1_decode_sequence_of_krb_cred_info(asn1buf *buf, krb5_cred_info ***val)
 {
     decode_array_body(krb5_cred_info,asn1_decode_krb_cred_info_ptr,
                       free_cred_info);
 }
 
-asn1_error_code asn1_decode_krb_cred_info(asn1buf *buf, krb5_cred_info *val)
+asn1_error_code
+asn1_decode_krb_cred_info(asn1buf *buf, krb5_cred_info *val)
 {
     setup();
     val->session = NULL;
@@ -1060,18 +1089,21 @@ asn1_decode_krb_cred_info_ptr(asn1buf *buf, krb5_cred_info **valptr)
     decode_ptr(krb5_cred_info *, asn1_decode_krb_cred_info);
 }
 
-static void free_pa_data(void *dummy, krb5_pa_data *val)
+static void
+free_pa_data(void *dummy, krb5_pa_data *val)
 {
     free(val->contents);
     free(val);
 }
 
-asn1_error_code asn1_decode_sequence_of_pa_data(asn1buf *buf, krb5_pa_data ***val)
+asn1_error_code
+asn1_decode_sequence_of_pa_data(asn1buf *buf, krb5_pa_data ***val)
 {
     decode_array_body(krb5_pa_data,asn1_decode_pa_data_ptr,free_pa_data);
 }
 
-asn1_error_code asn1_decode_pa_data(asn1buf *buf, krb5_pa_data *val)
+asn1_error_code
+asn1_decode_pa_data(asn1buf *buf, krb5_pa_data *val)
 {
     setup();
     val->contents = NULL;
@@ -1088,23 +1120,27 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_pa_data_ptr(asn1buf *buf, krb5_pa_data **valptr)
+asn1_error_code
+asn1_decode_pa_data_ptr(asn1buf *buf, krb5_pa_data **valptr)
 {
     decode_ptr(krb5_pa_data *, asn1_decode_pa_data);
 }
 
-static void free_last_req_entry(void *dummy, krb5_last_req_entry *val)
+static void
+free_last_req_entry(void *dummy, krb5_last_req_entry *val)
 {
     free(val);
 }
 
-asn1_error_code asn1_decode_last_req(asn1buf *buf, krb5_last_req_entry ***val)
+asn1_error_code
+asn1_decode_last_req(asn1buf *buf, krb5_last_req_entry ***val)
 {
     decode_array_body(krb5_last_req_entry,asn1_decode_last_req_entry_ptr,
                       free_last_req_entry);
 }
 
-asn1_error_code asn1_decode_last_req_entry(asn1buf *buf, krb5_last_req_entry *val)
+asn1_error_code
+asn1_decode_last_req_entry(asn1buf *buf, krb5_last_req_entry *val)
 {
     setup();
     { begin_structure();
@@ -1129,7 +1165,8 @@ asn1_decode_last_req_entry_ptr(asn1buf *buf, krb5_last_req_entry **valptr)
     decode_ptr(krb5_last_req_entry *, asn1_decode_last_req_entry);
 }
 
-asn1_error_code asn1_decode_sequence_of_enctype(asn1buf *buf, int *num, krb5_enctype **val)
+asn1_error_code
+asn1_decode_sequence_of_enctype(asn1buf *buf, int *num, krb5_enctype **val)
 {
     int size = 0;
     krb5_enctype *array = NULL, *new_array;
@@ -1154,20 +1191,23 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_sequence_of_checksum(asn1buf *buf, krb5_checksum ***val)
+asn1_error_code
+asn1_decode_sequence_of_checksum(asn1buf *buf, krb5_checksum ***val)
 {
     decode_array_body(krb5_checksum, asn1_decode_checksum_ptr,
                       krb5_free_checksum);
 }
 
-static void free_etype_info_entry(void *dummy, krb5_etype_info_entry *val)
+static void
+free_etype_info_entry(void *dummy, krb5_etype_info_entry *val)
 {
     krb5_free_data_contents(NULL, &val->s2kparams);
     free(val->salt);
     free(val);
 }
 
-static asn1_error_code asn1_decode_etype_info2_entry(asn1buf *buf, krb5_etype_info_entry *val )
+static asn1_error_code
+asn1_decode_etype_info2_entry(asn1buf *buf, krb5_etype_info_entry *val)
 {
     char *salt = NULL;
     krb5_octet *params = NULL;
@@ -1208,7 +1248,8 @@ asn1_decode_etype_info2_entry_ptr(asn1buf *buf, krb5_etype_info_entry **valptr)
     decode_ptr(krb5_etype_info_entry *, asn1_decode_etype_info2_entry);
 }
 
-static asn1_error_code asn1_decode_etype_info2_entry_1_3(asn1buf *buf, krb5_etype_info_entry *val )
+static asn1_error_code
+asn1_decode_etype_info2_entry_1_3(asn1buf *buf, krb5_etype_info_entry *val)
 {
     krb5_octet *params = NULL;
 
@@ -1247,7 +1288,8 @@ asn1_decode_etype_info2_entry_1_3_ptr(asn1buf *buf,
     decode_ptr(krb5_etype_info_entry *, asn1_decode_etype_info2_entry_1_3);
 }
 
-static asn1_error_code asn1_decode_etype_info_entry(asn1buf *buf, krb5_etype_info_entry *val )
+static asn1_error_code
+asn1_decode_etype_info_entry(asn1buf *buf, krb5_etype_info_entry *val)
 {
     setup();
     val->salt = NULL;
@@ -1276,21 +1318,24 @@ asn1_decode_etype_info_entry_ptr(asn1buf *buf, krb5_etype_info_entry **valptr)
     decode_ptr(krb5_etype_info_entry *, asn1_decode_etype_info_entry);
 }
 
-asn1_error_code asn1_decode_etype_info(asn1buf *buf, krb5_etype_info_entry ***val )
+asn1_error_code
+asn1_decode_etype_info(asn1buf *buf, krb5_etype_info_entry ***val )
 {
     decode_array_body(krb5_etype_info_entry,asn1_decode_etype_info_entry_ptr,
                       free_etype_info_entry);
 }
 
-static asn1_error_code decode_etype_info2_13(asn1buf *buf, krb5_etype_info_entry ***val)
+static asn1_error_code
+decode_etype_info2_13(asn1buf *buf, krb5_etype_info_entry ***val)
 {
     decode_array_body(krb5_etype_info_entry,
                       asn1_decode_etype_info2_entry_1_3_ptr,
                       free_etype_info_entry);
 }
 
-asn1_error_code asn1_decode_etype_info2(asn1buf *buf, krb5_etype_info_entry ***val ,
-                                        krb5_boolean v1_3_behavior)
+asn1_error_code
+asn1_decode_etype_info2(asn1buf *buf, krb5_etype_info_entry ***val ,
+                        krb5_boolean v1_3_behavior)
 {
     if (v1_3_behavior)
         return decode_etype_info2_13(buf, val);
@@ -1301,7 +1346,8 @@ asn1_error_code asn1_decode_etype_info2(asn1buf *buf, krb5_etype_info_entry ***v
     }
 }
 
-asn1_error_code asn1_decode_passwdsequence(asn1buf *buf, passwd_phrase_element *val)
+asn1_error_code
+asn1_decode_passwdsequence(asn1buf *buf, passwd_phrase_element *val)
 {
     setup();
     val->passwd = NULL;
@@ -1333,14 +1379,19 @@ asn1_decode_passwdsequence_ptr(asn1buf *buf, passwd_phrase_element **valptr)
     decode_ptr(passwd_phrase_element *, asn1_decode_passwdsequence);
 }
 
-asn1_error_code asn1_decode_sequence_of_passwdsequence(asn1buf *buf, passwd_phrase_element ***val)
+asn1_error_code
+asn1_decode_sequence_of_passwdsequence(asn1buf *buf,
+                                       passwd_phrase_element ***val)
 {
     decode_array_body(passwd_phrase_element,asn1_decode_passwdsequence_ptr,
                       krb5_free_passwd_phrase_element);
 }
 
-asn1_error_code asn1_decode_sam_flags(asn1buf *buf, krb5_flags *val)
-{ return asn1_decode_krb5_flags(buf,val); }
+asn1_error_code
+asn1_decode_sam_flags(asn1buf *buf, krb5_flags *val)
+{
+    return asn1_decode_krb5_flags(buf,val);
+}
 
 #define opt_string(val,n,fn) opt_lenfield((val).length,(val).data,n,fn)
 #define opt_cksum(var,tagexpect,decoder)\
@@ -1348,7 +1399,8 @@ if (tagnum == (tagexpect)) {\
   get_field_body(var,decoder); }\
 else var.length = 0
 
-asn1_error_code asn1_decode_sam_challenge(asn1buf *buf, krb5_sam_challenge *val)
+asn1_error_code
+asn1_decode_sam_challenge(asn1buf *buf, krb5_sam_challenge *val)
 {
     setup();
     val->sam_type_name.data = NULL;
@@ -1376,7 +1428,8 @@ error_out:
     krb5_free_sam_challenge_contents(NULL, val);
     return retval;
 }
-asn1_error_code asn1_decode_sam_challenge_2(asn1buf *buf, krb5_sam_challenge_2 *val)
+asn1_error_code
+asn1_decode_sam_challenge_2(asn1buf *buf, krb5_sam_challenge_2 *val)
 {
     krb5_checksum **cksump;
     setup();
@@ -1414,7 +1467,8 @@ error_out:
     }
     return retval;
 }
-asn1_error_code asn1_decode_sam_challenge_2_body(asn1buf *buf, krb5_sam_challenge_2_body *val)
+asn1_error_code
+asn1_decode_sam_challenge_2_body(asn1buf *buf, krb5_sam_challenge_2_body *val)
 {
     setup();
     val->sam_type_name.data = NULL;
@@ -1442,7 +1496,8 @@ error_out:
     krb5_free_sam_challenge_2_body_contents(NULL, val);
     return retval;
 }
-asn1_error_code asn1_decode_enc_sam_key(asn1buf *buf, krb5_sam_key *val)
+asn1_error_code
+asn1_decode_enc_sam_key(asn1buf *buf, krb5_sam_key *val)
 {
     setup();
     val->sam_key.contents = NULL;
@@ -1457,7 +1512,8 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_enc_sam_response_enc(asn1buf *buf, krb5_enc_sam_response_enc *val)
+asn1_error_code
+asn1_decode_enc_sam_response_enc(asn1buf *buf, krb5_enc_sam_response_enc *val)
 {
     setup();
     val->sam_sad.data = NULL;
@@ -1475,7 +1531,8 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_enc_sam_response_enc_2(asn1buf *buf, krb5_enc_sam_response_enc_2 *val)
+asn1_error_code
+asn1_decode_enc_sam_response_enc_2(asn1buf *buf, krb5_enc_sam_response_enc_2 *val)
 {
     setup();
     val->sam_sad.data = NULL;
@@ -1502,7 +1559,8 @@ error_out:
       fld.ciphertext.length = 0;\
     }
 
-asn1_error_code asn1_decode_sam_response(asn1buf *buf, krb5_sam_response *val)
+asn1_error_code
+asn1_decode_sam_response(asn1buf *buf, krb5_sam_response *val)
 {
     setup();
     val->sam_track_id.data = NULL;
@@ -1525,7 +1583,8 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_sam_response_2(asn1buf *buf, krb5_sam_response_2 *val)
+asn1_error_code
+asn1_decode_sam_response_2(asn1buf *buf, krb5_sam_response_2 *val)
 {
     setup();
     val->sam_track_id.data = NULL;
@@ -1546,7 +1605,9 @@ error_out:
 }
 
 
-asn1_error_code asn1_decode_predicted_sam_response(asn1buf *buf, krb5_predicted_sam_response *val)
+asn1_error_code
+asn1_decode_predicted_sam_response(asn1buf *buf,
+                                   krb5_predicted_sam_response *val)
 {
     setup();
     val->sam_key.contents = NULL;
@@ -1570,7 +1631,9 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_setpw_req(asn1buf *buf, krb5_data *newpasswd, krb5_principal *principal)
+asn1_error_code
+asn1_decode_setpw_req(asn1buf *buf, krb5_data *newpasswd,
+                      krb5_principal *principal)
 {
     krb5_principal princ = NULL;
     setup();
@@ -1594,7 +1657,8 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_pa_for_user(asn1buf *buf, krb5_pa_for_user *val)
+asn1_error_code
+asn1_decode_pa_for_user(asn1buf *buf, krb5_pa_for_user *val)
 {
     setup();
     val->user = NULL;
@@ -1617,7 +1681,8 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_s4u_userid(asn1buf *buf, krb5_s4u_userid *val)
+asn1_error_code
+asn1_decode_s4u_userid(asn1buf *buf, krb5_s4u_userid *val)
 {
     setup();
     val->nonce = 0;
@@ -1642,7 +1707,8 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_pa_s4u_x509_user(asn1buf *buf, krb5_pa_s4u_x509_user *val)
+asn1_error_code
+asn1_decode_pa_s4u_x509_user(asn1buf *buf, krb5_pa_s4u_x509_user *val)
 {
     setup();
     val->cksum.contents = NULL;
@@ -1658,7 +1724,8 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_pa_pac_req(asn1buf *buf, krb5_pa_pac_req *val)
+asn1_error_code
+asn1_decode_pa_pac_req(asn1buf *buf, krb5_pa_pac_req *val)
 {
     setup();
     { begin_structure();
@@ -1670,8 +1737,8 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_fast_armor
-(asn1buf *buf, krb5_fast_armor *val)
+asn1_error_code
+asn1_decode_fast_armor(asn1buf *buf, krb5_fast_armor *val)
 {
     setup();
     val->armor_value.data = NULL;
@@ -1687,14 +1754,14 @@ asn1_error_code asn1_decode_fast_armor
     return retval;
 }
 
-asn1_error_code asn1_decode_fast_armor_ptr
-(asn1buf *buf, krb5_fast_armor **valptr)
+asn1_error_code
+asn1_decode_fast_armor_ptr(asn1buf *buf, krb5_fast_armor **valptr)
 {
     decode_ptr(krb5_fast_armor *, asn1_decode_fast_armor);
 }
 
-asn1_error_code asn1_decode_fast_finished
-(asn1buf *buf, krb5_fast_finished *val)
+asn1_error_code
+asn1_decode_fast_finished(asn1buf *buf, krb5_fast_finished *val)
 {
     setup();
     val->client = NULL;
@@ -1714,14 +1781,14 @@ asn1_error_code asn1_decode_fast_finished
     krb5_free_checksum_contents( NULL, &val->ticket_checksum);
     return retval;
 }
-asn1_error_code asn1_decode_fast_finished_ptr
-(asn1buf *buf, krb5_fast_finished **valptr)
+asn1_error_code
+asn1_decode_fast_finished_ptr(asn1buf *buf, krb5_fast_finished **valptr)
 {
     decode_ptr( krb5_fast_finished *, asn1_decode_fast_finished);
 }
 
-asn1_error_code asn1_decode_ad_kdcissued
-(asn1buf *buf, krb5_ad_kdcissued *val)
+asn1_error_code
+asn1_decode_ad_kdcissued(asn1buf *buf, krb5_ad_kdcissued *val)
 {
     setup();
     val->ad_checksum.contents = NULL;
@@ -1748,7 +1815,10 @@ error_out:
 #ifndef DISABLE_PKINIT
 /* PKINIT */
 
-asn1_error_code asn1_decode_external_principal_identifier(asn1buf *buf, krb5_external_principal_identifier *val)
+asn1_error_code
+asn1_decode_external_principal_identifier(
+    asn1buf *buf,
+    krb5_external_principal_identifier *val)
 {
     setup();
     val->subjectName.data = NULL;
@@ -1772,10 +1842,9 @@ error_out:
     return retval;
 }
 
-asn1_error_code
-asn1_decode_external_principal_identifier_ptr
-        (asn1buf *buf,
-         krb5_external_principal_identifier **valptr)
+asn1_error_code asn1_decode_external_principal_identifier_ptr(
+    asn1buf *buf,
+    krb5_external_principal_identifier **valptr)
 {
     decode_ptr(krb5_external_principal_identifier *,
                asn1_decode_external_principal_identifier);
@@ -1791,14 +1860,18 @@ free_external_principal_identifier(void *dummy,
     free(val);
 }
 
-asn1_error_code asn1_decode_sequence_of_external_principal_identifier(asn1buf *buf, krb5_external_principal_identifier ***val)
+asn1_error_code
+asn1_decode_sequence_of_external_principal_identifier(
+    asn1buf *buf,
+    krb5_external_principal_identifier ***val)
 {
     decode_array_body(krb5_external_principal_identifier,
                       asn1_decode_external_principal_identifier_ptr,
                       free_external_principal_identifier);
 }
 
-asn1_error_code asn1_decode_pa_pk_as_req(asn1buf *buf, krb5_pa_pk_as_req *val)
+asn1_error_code
+asn1_decode_pa_pk_as_req(asn1buf *buf, krb5_pa_pk_as_req *val)
 {
     setup();
     val->signedAuthPack.data = NULL;
@@ -1823,7 +1896,8 @@ error_out:
 }
 
 #if 0   /* XXX   This needs to be tested!!! XXX */
-asn1_error_code asn1_decode_trusted_ca(asn1buf *buf, krb5_trusted_ca *val)
+asn1_error_code
+asn1_decode_trusted_ca(asn1buf *buf, krb5_trusted_ca *val)
 {
     setup();
     val->choice = choice_trusted_cas_UNKNOWN;
@@ -1881,7 +1955,8 @@ error_out:
     return retval;
 }
 #else
-asn1_error_code asn1_decode_trusted_ca(asn1buf *buf, krb5_trusted_ca *val)
+asn1_error_code
+asn1_decode_trusted_ca(asn1buf *buf, krb5_trusted_ca *val)
 {
     setup();
     val->choice = choice_trusted_cas_UNKNOWN;
@@ -1919,7 +1994,8 @@ asn1_decode_trusted_ca_ptr(asn1buf *buf, krb5_trusted_ca **valptr)
     decode_ptr(krb5_trusted_ca *, asn1_decode_trusted_ca);
 }
 
-static void free_trusted_ca(void *dummy, krb5_trusted_ca *val)
+static void
+free_trusted_ca(void *dummy, krb5_trusted_ca *val)
 {
     if (val->choice == choice_trusted_cas_caName)
         free(val->u.caName.data);
@@ -1928,13 +2004,15 @@ static void free_trusted_ca(void *dummy, krb5_trusted_ca *val)
     free(val);
 }
 
-asn1_error_code asn1_decode_sequence_of_trusted_ca(asn1buf *buf, krb5_trusted_ca ***val)
+asn1_error_code
+asn1_decode_sequence_of_trusted_ca(asn1buf *buf, krb5_trusted_ca ***val)
 {
     decode_array_body(krb5_trusted_ca, asn1_decode_trusted_ca_ptr,
                       free_trusted_ca);
 }
 
-asn1_error_code asn1_decode_pa_pk_as_req_draft9(asn1buf *buf, krb5_pa_pk_as_req_draft9 *val)
+asn1_error_code
+asn1_decode_pa_pk_as_req_draft9(asn1buf *buf, krb5_pa_pk_as_req_draft9 *val)
 {
     int i;
     setup();
@@ -1966,7 +2044,8 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_dh_rep_info(asn1buf *buf, krb5_dh_rep_info *val)
+asn1_error_code
+asn1_decode_dh_rep_info(asn1buf *buf, krb5_dh_rep_info *val)
 {
     setup();
     val->dhSignedData.data = NULL;
@@ -1986,7 +2065,8 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_pk_authenticator(asn1buf *buf, krb5_pk_authenticator *val)
+asn1_error_code
+asn1_decode_pk_authenticator(asn1buf *buf, krb5_pk_authenticator *val)
 {
     setup();
     val->paChecksum.contents = NULL;
@@ -2003,7 +2083,9 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_pk_authenticator_draft9(asn1buf *buf, krb5_pk_authenticator_draft9 *val)
+asn1_error_code
+asn1_decode_pk_authenticator_draft9(asn1buf *buf,
+                                    krb5_pk_authenticator_draft9 *val)
 {
     setup();
     val->kdcName = NULL;
@@ -2023,8 +2105,9 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_algorithm_identifier(asn1buf *buf,  krb5_algorithm_identifier *val) {
-
+asn1_error_code
+asn1_decode_algorithm_identifier(asn1buf *buf, krb5_algorithm_identifier *val)
+{
     setup();
     val->algorithm.data = NULL;
     val->parameters.data = NULL;
@@ -2078,7 +2161,8 @@ asn1_decode_algorithm_identifier_ptr(asn1buf *buf,
     decode_ptr(krb5_algorithm_identifier *, asn1_decode_algorithm_identifier);
 }
 
-asn1_error_code asn1_decode_subject_pk_info(asn1buf *buf, krb5_subject_pk_info *val)
+asn1_error_code
+asn1_decode_subject_pk_info(asn1buf *buf, krb5_subject_pk_info *val)
 {
     asn1_octet unused;
     setup();
@@ -2136,14 +2220,17 @@ free_algorithm_identifier(void *dummy, krb5_algorithm_identifier *val)
     free(val);
 }
 
-asn1_error_code asn1_decode_sequence_of_algorithm_identifier(asn1buf *buf, krb5_algorithm_identifier ***val)
+asn1_error_code
+asn1_decode_sequence_of_algorithm_identifier(asn1buf *buf,
+                                             krb5_algorithm_identifier ***val)
 {
     decode_array_body(krb5_algorithm_identifier,
                       asn1_decode_algorithm_identifier_ptr,
                       free_algorithm_identifier);
 }
 
-asn1_error_code asn1_decode_kdc_dh_key_info (asn1buf *buf, krb5_kdc_dh_key_info *val)
+asn1_error_code
+asn1_decode_kdc_dh_key_info(asn1buf *buf, krb5_kdc_dh_key_info *val)
 {
     setup();
     val->subjectPublicKey.data = NULL;
@@ -2163,7 +2250,8 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_reply_key_pack (asn1buf *buf, krb5_reply_key_pack *val)
+asn1_error_code
+asn1_decode_reply_key_pack (asn1buf *buf, krb5_reply_key_pack *val)
 {
     setup();
     val->replyKey.contents = NULL;
@@ -2182,7 +2270,9 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_reply_key_pack_draft9 (asn1buf *buf, krb5_reply_key_pack_draft9 *val)
+asn1_error_code
+asn1_decode_reply_key_pack_draft9 (asn1buf *buf,
+                                   krb5_reply_key_pack_draft9 *val)
 {
     setup();
     val->replyKey.contents = NULL;
@@ -2198,8 +2288,8 @@ error_out:
     return retval;
 }
 
-
-asn1_error_code asn1_decode_krb5_principal_name (asn1buf *buf, krb5_principal *val)
+asn1_error_code
+asn1_decode_krb5_principal_name (asn1buf *buf, krb5_principal *val)
 {
     int i;
     setup();
@@ -2223,7 +2313,8 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_auth_pack(asn1buf *buf, krb5_auth_pack *val)
+asn1_error_code
+asn1_decode_auth_pack(asn1buf *buf, krb5_auth_pack *val)
 {
     int i;
     setup();
@@ -2286,7 +2377,8 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_auth_pack_draft9(asn1buf *buf, krb5_auth_pack_draft9 *val)
+asn1_error_code
+asn1_decode_auth_pack_draft9(asn1buf *buf, krb5_auth_pack_draft9 *val)
 {
     setup();
     val->pkAuthenticator.kdcName = NULL;
@@ -2328,7 +2420,8 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_pa_pk_as_rep(asn1buf *buf, krb5_pa_pk_as_rep *val)
+asn1_error_code
+asn1_decode_pa_pk_as_rep(asn1buf *buf, krb5_pa_pk_as_rep *val)
 {
     setup();
     val->choice = choice_pa_pk_as_rep_UNKNOWN;
@@ -2360,7 +2453,8 @@ error_out:
     return retval;
 }
 
-asn1_error_code asn1_decode_pa_pk_as_rep_draft9(asn1buf *buf, krb5_pa_pk_as_rep_draft9 *val)
+asn1_error_code
+asn1_decode_pa_pk_as_rep_draft9(asn1buf *buf, krb5_pa_pk_as_rep_draft9 *val)
 {
     setup();
     val->choice = choice_pa_pk_as_rep_draft9_UNKNOWN;
@@ -2398,13 +2492,15 @@ static void free_typed_data(void *dummy, krb5_typed_data *val)
     free(val);
 }
 
-asn1_error_code asn1_decode_sequence_of_typed_data(asn1buf *buf, krb5_typed_data ***val)
+asn1_error_code
+asn1_decode_sequence_of_typed_data(asn1buf *buf, krb5_typed_data ***val)
 {
     decode_array_body(krb5_typed_data,asn1_decode_typed_data_ptr,
                       free_typed_data);
 }
 
-asn1_error_code asn1_decode_typed_data(asn1buf *buf, krb5_typed_data *val)
+asn1_error_code
+asn1_decode_typed_data(asn1buf *buf, krb5_typed_data *val)
 {
     setup();
     val->data = NULL;
diff --git a/src/lib/krb5/asn.1/asn1_k_encode.c b/src/lib/krb5/asn.1/asn1_k_encode.c
index 1e9f11fe8..d0371f53f 100644
--- a/src/lib/krb5/asn.1/asn1_k_encode.c
+++ b/src/lib/krb5/asn.1/asn1_k_encode.c
@@ -250,7 +250,8 @@ static const struct field_info enc_kdc_rep_part_fields[] = {
     /* encrypted-pa-data[12]    SEQUENCE OF PA-DATA OPTIONAL */
     FIELDOF_OPT(krb5_enc_kdc_rep_part, ptr_seqof_pa_data, enc_padata, 12, 12),
 };
-static unsigned int optional_enc_kdc_rep_part(const void *p)
+static unsigned int
+optional_enc_kdc_rep_part(const void *p)
 {
     const krb5_enc_kdc_rep_part *val = p;
     unsigned int optional = 0;
@@ -293,7 +294,8 @@ static const struct field_info kdc_req_hack_fields[] = {
     FIELDOF_OPT(struct kdc_req_hack, encrypted_data, v.authorization_data, 10, 10),
     FIELDOF_OPT(struct kdc_req_hack, ptr_seqof_ticket, v.second_ticket, 11, 11),
 };
-static unsigned int optional_kdc_req_hack(const void *p)
+static unsigned int
+optional_kdc_req_hack(const void *p)
 {
     const struct kdc_req_hack *val2 = p;
     const krb5_kdc_req *val = &val2->v;
@@ -356,7 +358,8 @@ static const struct field_info krb_safe_body_fields[] = {
     FIELDOF_NORM(krb5_safe, address_ptr, s_address, 4),
     FIELDOF_OPT(krb5_safe, address_ptr, r_address, 5, 5),
 };
-static unsigned int optional_krb_safe_body(const void *p)
+static unsigned int
+optional_krb_safe_body(const void *p)
 {
     const krb5_safe *val = p;
     unsigned int optional = 0;
@@ -388,7 +391,8 @@ static const struct field_info krb_cred_info_fields[] = {
     FIELDOF_OPT(krb5_cred_info, principal, server, 9, 9),
     FIELDOF_OPT(krb5_cred_info, ptr_seqof_host_addresses, caddrs, 10, 10),
 };
-static unsigned int optional_krb_cred_info(const void *p)
+static unsigned int
+optional_krb_cred_info(const void *p)
 {
     const krb5_cred_info *val = p;
     unsigned int optional = 0;
@@ -495,7 +499,8 @@ static const struct field_info sam_challenge_fields[] = {
     FIELDOF_OPT(krb5_sam_challenge, int32, sam_nonce, 8, 8),
     FIELDOF_OPT(krb5_sam_challenge, checksum, sam_cksum, 9, 9),
 };
-static unsigned int optional_sam_challenge(const void *p)
+static unsigned int
+optional_sam_challenge(const void *p)
 {
     const krb5_sam_challenge *val = p;
     unsigned int optional = 0;
@@ -564,7 +569,8 @@ static const struct field_info sam_challenge_2_body_fields[] = {
     FIELDOF_NORM(krb5_sam_challenge_2_body, int32, sam_nonce, 8),
     FIELDOF_NORM(krb5_sam_challenge_2_body, int32, sam_etype, 9),
 };
-static unsigned int optional_sam_challenge_2_body(const void *p)
+static unsigned int
+optional_sam_challenge_2_body(const void *p)
 {
     const krb5_sam_challenge_2_body *val = p;
     unsigned int optional = 0;
@@ -593,7 +599,8 @@ static const struct field_info enc_sam_response_enc_fields[] = {
     FIELDOF_NORM(krb5_enc_sam_response_enc, int32, sam_usec, 2),
     FIELDOF_OPT(krb5_enc_sam_response_enc, ostring_data, sam_sad, 3, 3),
 };
-static unsigned int optional_enc_sam_response_enc(const void *p)
+static unsigned int
+optional_enc_sam_response_enc(const void *p)
 {
     const krb5_enc_sam_response_enc *val = p;
     unsigned int optional = 0;
@@ -609,7 +616,8 @@ static const struct field_info enc_sam_response_enc_2_fields[] = {
     FIELDOF_NORM(krb5_enc_sam_response_enc_2, int32, sam_nonce, 0),
     FIELDOF_OPT(krb5_enc_sam_response_enc_2, ostring_data, sam_sad, 1, 1),
 };
-static unsigned int optional_enc_sam_response_enc_2(const void *p)
+static unsigned int
+optional_enc_sam_response_enc_2(const void *p)
 {
     const krb5_enc_sam_response_enc_2 *val = p;
     unsigned int optional = 0;
@@ -630,7 +638,8 @@ static const struct field_info sam_response_fields[] = {
     FIELDOF_OPT(krb5_sam_response, int32, sam_nonce, 5, 5),
     FIELDOF_OPT(krb5_sam_response, kerberos_time, sam_patimestamp, 6, 6),
 };
-static unsigned int optional_sam_response(const void *p)
+static unsigned int
+optional_sam_response(const void *p)
 {
     const krb5_sam_response *val = p;
     unsigned int optional = 0;
@@ -655,7 +664,8 @@ static const struct field_info sam_response_2_fields[] = {
     FIELDOF_NORM(krb5_sam_response_2, encrypted_data, sam_enc_nonce_or_sad, 3),
     FIELDOF_NORM(krb5_sam_response_2, int32, sam_nonce, 4),
 };
-static unsigned int optional_sam_response_2(const void *p)
+static unsigned int
+optional_sam_response_2(const void *p)
 {
     const krb5_sam_response_2 *val = p;
     unsigned int optional = 0;
@@ -676,7 +686,8 @@ static const struct field_info predicted_sam_response_fields[] = {
     FIELDOF_NORM(krb5_predicted_sam_response, principal, client, 5),
     FIELDOF_OPT(krb5_predicted_sam_response, ostring_data, msd, 6, 6),
 };
-static unsigned int optional_predicted_sam_response(const void *p)
+static unsigned int
+optional_predicted_sam_response(const void *p)
 {
     const krb5_predicted_sam_response *val = p;
     unsigned int optional = 0;
@@ -710,7 +721,8 @@ static const struct field_info krb5_authenticator_fields[] = {
     /* authorization-data[8]    AuthorizationData OPTIONAL */
     FIELDOF_OPT(krb5_authenticator, auth_data_ptr, authorization_data, 8, 8),
 };
-static unsigned int optional_krb5_authenticator(const void *p)
+static unsigned int
+optional_krb5_authenticator(const void *p)
 {
     const krb5_authenticator *val = p;
     unsigned int optional = 0;
@@ -758,7 +770,8 @@ static const struct field_info enc_tkt_part_fields[] = {
     /* authorization-data[10]   AuthorizationData OPTIONAL */
     FIELDOF_OPT(krb5_enc_tkt_part, auth_data_ptr, authorization_data, 10, 10),
 };
-static unsigned int optional_enc_tkt_part(const void *p)
+static unsigned int
+optional_enc_tkt_part(const void *p)
 {
     const krb5_enc_tkt_part *val = p;
     unsigned int optional = 0;
@@ -792,7 +805,8 @@ static const struct field_info as_rep_fields[] = {
     FIELDOF_NORM(krb5_kdc_rep, ticket_ptr, ticket, 5),
     FIELDOF_NORM(krb5_kdc_rep, encrypted_data, enc_part, 6),
 };
-static unsigned int optional_as_rep(const void *p)
+static unsigned int
+optional_as_rep(const void *p)
 {
     const krb5_kdc_rep *val = p;
     unsigned int optional = 0;
@@ -817,7 +831,8 @@ static const struct field_info tgs_rep_fields[] = {
     FIELDOF_NORM(krb5_kdc_rep, ticket_ptr, ticket, 5),
     FIELDOF_NORM(krb5_kdc_rep, encrypted_data, enc_part, 6),
 };
-static unsigned int optional_tgs_rep(const void *p)
+static unsigned int
+optional_tgs_rep(const void *p)
 {
     const krb5_kdc_rep *val = p;
     unsigned int optional = 0;
@@ -869,7 +884,8 @@ static const struct field_info ap_rep_enc_part_fields[] = {
     /* seq-number[3]    INTEGER OPTIONAL */
     FIELDOF_OPT(krb5_ap_rep_enc_part, uint, seq_number, 3, 3),
 };
-static unsigned int optional_ap_rep_enc_part(const void *p)
+static unsigned int
+optional_ap_rep_enc_part(const void *p)
 {
     const krb5_ap_rep_enc_part *val = p;
     unsigned int optional = 0;
@@ -892,7 +908,8 @@ static const struct field_info as_req_fields[] = {
     FIELDOF_OPT(krb5_kdc_req, ptr_seqof_pa_data, padata, 3, 3),
     FIELDOF_ENCODEAS(krb5_kdc_req, kdc_req_body, 4),
 };
-static unsigned int optional_as_req(const void *p)
+static unsigned int
+optional_as_req(const void *p)
 {
     const krb5_kdc_req *val = p;
     unsigned int optional = 0;
@@ -912,7 +929,8 @@ static const struct field_info tgs_req_fields[] = {
     FIELDOF_OPT(krb5_kdc_req, ptr_seqof_pa_data, padata, 3, 3),
     FIELDOF_ENCODEAS(krb5_kdc_req, kdc_req_body, 4),
 };
-static unsigned int optional_tgs_req(const void *p)
+static unsigned int
+optional_tgs_req(const void *p)
 {
     const krb5_kdc_req *val = p;
     unsigned int optional = 0;
@@ -965,7 +983,8 @@ static const struct field_info priv_enc_part_fields[] = {
     FIELDOF_NORM(krb5_priv_enc_part, address_ptr, s_address, 4),
     FIELDOF_OPT(krb5_priv_enc_part, address_ptr, r_address, 5, 5),
 };
-static unsigned int optional_priv_enc_part(const void *p)
+static unsigned int
+optional_priv_enc_part(const void *p)
 {
     const krb5_priv_enc_part *val = p;
     unsigned int optional = 0;
@@ -1014,7 +1033,8 @@ static const struct field_info enc_cred_part_fields[] = {
     /* r-address[5]     HostAddress OPTIONAL */
     FIELDOF_OPT(krb5_cred_enc_part, address_ptr, r_address, 5, 5),
 };
-static unsigned int optional_enc_cred_part(const void *p)
+static unsigned int
+optional_enc_cred_part(const void *p)
 {
     const krb5_cred_enc_part *val = p;
     unsigned int optional = 0;
@@ -1068,7 +1088,8 @@ static const struct field_info error_fields[] = {
     /* e-data[12]       OCTET STRING OPTIONAL */
     FIELDOF_OPT(krb5_error, ostring_data, e_data, 12, 12),
 };
-static unsigned int optional_error(const void *p)
+static unsigned int
+optional_error(const void *p)
 {
     const krb5_error *val = p;
     unsigned int optional = 0;
@@ -1270,7 +1291,8 @@ static const struct field_info fast_response_fields[] = {
     FIELDOF_NORM(krb5_fast_response, int32, nonce, 3),
 };
 
-static unsigned int fast_response_optional (const void *p)
+static unsigned int
+fast_response_optional (const void *p)
 {
     unsigned int optional = 0;
     const krb5_fast_response *val = p;
@@ -1297,7 +1319,8 @@ static const struct field_info ad_kdcissued_fields[] = {
     FIELDOF_NORM(krb5_ad_kdcissued, auth_data_ptr, elements, 3),
 };
 
-static unsigned int ad_kdcissued_optional(const void *p)
+static unsigned int
+ad_kdcissued_optional(const void *p)
 {
     unsigned int optional = 0;
     const krb5_ad_kdcissued *val = p;
@@ -1506,7 +1529,9 @@ asn1_encode_kerberos_time(asn1buf *buf, const krb5_timestamp val,
 }
 
 /* Now the real PKINIT encoder functions.  */
-asn1_error_code asn1_encode_pk_authenticator(asn1buf *buf, const krb5_pk_authenticator *val, unsigned int *retlen)
+asn1_error_code
+asn1_encode_pk_authenticator(asn1buf *buf, const krb5_pk_authenticator *val,
+                             unsigned int *retlen)
 {
     asn1_setup();
     asn1_addlenfield(val->paChecksum.length, val->paChecksum.contents, 3, asn1_encode_octetstring);
@@ -1518,7 +1543,10 @@ asn1_error_code asn1_encode_pk_authenticator(asn1buf *buf, const krb5_pk_authent
     asn1_cleanup();
 }
 
-asn1_error_code asn1_encode_pk_authenticator_draft9(asn1buf *buf, const krb5_pk_authenticator_draft9 *val, unsigned int *retlen)
+asn1_error_code
+asn1_encode_pk_authenticator_draft9(asn1buf *buf,
+                                    const krb5_pk_authenticator_draft9 *val,
+                                    unsigned int *retlen)
 {
     asn1_setup();
 
@@ -1533,7 +1561,10 @@ asn1_error_code asn1_encode_pk_authenticator_draft9(asn1buf *buf, const krb5_pk_
 }
 
 
-asn1_error_code asn1_encode_algorithm_identifier(asn1buf *buf, const krb5_algorithm_identifier *val, unsigned int *retlen)
+asn1_error_code
+asn1_encode_algorithm_identifier(asn1buf *buf,
+                                 const krb5_algorithm_identifier *val,
+                                 unsigned int *retlen)
 {
     asn1_setup();
 
@@ -1560,7 +1591,9 @@ asn1_error_code asn1_encode_algorithm_identifier(asn1buf *buf, const krb5_algori
     asn1_cleanup();
 }
 
-asn1_error_code asn1_encode_subject_pk_info(asn1buf *buf, const krb5_subject_pk_info *val, unsigned int *retlen)
+asn1_error_code
+asn1_encode_subject_pk_info(asn1buf *buf, const krb5_subject_pk_info *val,
+                            unsigned int *retlen)
 {
     asn1_setup();
 
@@ -1600,7 +1633,10 @@ asn1_error_code asn1_encode_subject_pk_info(asn1buf *buf, const krb5_subject_pk_
     asn1_cleanup();
 }
 
-asn1_error_code asn1_encode_sequence_of_algorithm_identifier(asn1buf *buf, const krb5_algorithm_identifier **val, unsigned int *retlen)
+asn1_error_code
+asn1_encode_sequence_of_algorithm_identifier(
+    asn1buf *buf, const krb5_algorithm_identifier **val,
+    unsigned int *retlen)
 {
     asn1_setup();
     int i;
@@ -1619,7 +1655,9 @@ asn1_error_code asn1_encode_sequence_of_algorithm_identifier(asn1buf *buf, const
     asn1_cleanup();
 }
 
-asn1_error_code asn1_encode_auth_pack(asn1buf *buf, const krb5_auth_pack *val, unsigned int *retlen)
+asn1_error_code
+asn1_encode_auth_pack(asn1buf *buf, const krb5_auth_pack *val,
+                      unsigned int *retlen)
 {
     asn1_setup();
 
@@ -1635,7 +1673,9 @@ asn1_error_code asn1_encode_auth_pack(asn1buf *buf, const krb5_auth_pack *val, u
     asn1_cleanup();
 }
 
-asn1_error_code asn1_encode_auth_pack_draft9(asn1buf *buf, const krb5_auth_pack_draft9 *val, unsigned int *retlen)
+asn1_error_code
+asn1_encode_auth_pack_draft9(asn1buf *buf, const krb5_auth_pack_draft9 *val,
+                             unsigned int *retlen)
 {
     asn1_setup();
 
@@ -1647,7 +1687,10 @@ asn1_error_code asn1_encode_auth_pack_draft9(asn1buf *buf, const krb5_auth_pack_
     asn1_cleanup();
 }
 
-asn1_error_code asn1_encode_external_principal_identifier(asn1buf *buf, const krb5_external_principal_identifier *val, unsigned int *retlen)
+asn1_error_code
+asn1_encode_external_principal_identifier(
+    asn1buf *buf, const krb5_external_principal_identifier *val,
+    unsigned int *retlen)
 {
     asn1_setup();
 
@@ -1668,7 +1711,11 @@ asn1_error_code asn1_encode_external_principal_identifier(asn1buf *buf, const kr
     asn1_cleanup();
 }
 
-asn1_error_code asn1_encode_sequence_of_external_principal_identifier(asn1buf *buf, const krb5_external_principal_identifier **val, unsigned int *retlen)
+asn1_error_code
+asn1_encode_sequence_of_external_principal_identifier(
+    asn1buf *buf,
+    const krb5_external_principal_identifier **val,
+    unsigned int *retlen)
 {
     asn1_setup();
     int i;
@@ -1687,7 +1734,9 @@ asn1_error_code asn1_encode_sequence_of_external_principal_identifier(asn1buf *b
     asn1_cleanup();
 }
 
-asn1_error_code asn1_encode_pa_pk_as_req(asn1buf *buf, const krb5_pa_pk_as_req *val, unsigned int *retlen)
+asn1_error_code
+asn1_encode_pa_pk_as_req(asn1buf *buf, const krb5_pa_pk_as_req *val,
+                         unsigned int *retlen)
 {
     asn1_setup();
 
@@ -1703,7 +1752,9 @@ asn1_error_code asn1_encode_pa_pk_as_req(asn1buf *buf, const krb5_pa_pk_as_req *
     asn1_cleanup();
 }
 
-asn1_error_code asn1_encode_trusted_ca(asn1buf *buf, const krb5_trusted_ca *val, unsigned int *retlen)
+asn1_error_code
+asn1_encode_trusted_ca(asn1buf *buf, const krb5_trusted_ca *val,
+                       unsigned int *retlen)
 {
     asn1_setup();
 
@@ -1724,7 +1775,9 @@ asn1_error_code asn1_encode_trusted_ca(asn1buf *buf, const krb5_trusted_ca *val,
     asn1_cleanup();
 }
 
-asn1_error_code asn1_encode_sequence_of_trusted_ca(asn1buf *buf, const krb5_trusted_ca **val, unsigned int *retlen)
+asn1_error_code
+asn1_encode_sequence_of_trusted_ca(asn1buf *buf, const krb5_trusted_ca **val,
+                                   unsigned int *retlen)
 {
     asn1_setup();
     int i;
@@ -1742,7 +1795,10 @@ asn1_error_code asn1_encode_sequence_of_trusted_ca(asn1buf *buf, const krb5_trus
     asn1_cleanup();
 }
 
-asn1_error_code asn1_encode_pa_pk_as_req_draft9(asn1buf *buf, const krb5_pa_pk_as_req_draft9 *val, unsigned int *retlen)
+asn1_error_code
+asn1_encode_pa_pk_as_req_draft9(asn1buf *buf,
+                                const krb5_pa_pk_as_req_draft9 *val,
+                                unsigned int *retlen)
 {
     asn1_setup();
 
@@ -1761,7 +1817,9 @@ asn1_error_code asn1_encode_pa_pk_as_req_draft9(asn1buf *buf, const krb5_pa_pk_a
     asn1_cleanup();
 }
 
-asn1_error_code asn1_encode_dh_rep_info(asn1buf *buf, const krb5_dh_rep_info *val, unsigned int *retlen)
+asn1_error_code
+asn1_encode_dh_rep_info(asn1buf *buf, const krb5_dh_rep_info *val,
+                        unsigned int *retlen)
 {
     asn1_setup();
 
@@ -1774,7 +1832,9 @@ asn1_error_code asn1_encode_dh_rep_info(asn1buf *buf, const krb5_dh_rep_info *va
     asn1_cleanup();
 }
 
-asn1_error_code asn1_encode_kdc_dh_key_info(asn1buf *buf, const krb5_kdc_dh_key_info *val, unsigned int *retlen)
+asn1_error_code
+asn1_encode_kdc_dh_key_info(asn1buf *buf, const krb5_kdc_dh_key_info *val,
+                            unsigned int *retlen)
 {
     asn1_setup();
 
@@ -1798,7 +1858,9 @@ asn1_error_code asn1_encode_kdc_dh_key_info(asn1buf *buf, const krb5_kdc_dh_key_
     asn1_cleanup();
 }
 
-asn1_error_code asn1_encode_reply_key_pack(asn1buf *buf, const krb5_reply_key_pack *val, unsigned int *retlen)
+asn1_error_code
+asn1_encode_reply_key_pack(asn1buf *buf, const krb5_reply_key_pack *val,
+                           unsigned int *retlen)
 {
     asn1_setup();
 
@@ -1809,7 +1871,10 @@ asn1_error_code asn1_encode_reply_key_pack(asn1buf *buf, const krb5_reply_key_pa
     asn1_cleanup();
 }
 
-asn1_error_code asn1_encode_reply_key_pack_draft9(asn1buf *buf, const krb5_reply_key_pack_draft9 *val, unsigned int *retlen)
+asn1_error_code
+asn1_encode_reply_key_pack_draft9(asn1buf *buf,
+                                  const krb5_reply_key_pack_draft9 *val,
+                                  unsigned int *retlen)
 {
     asn1_setup();
 
@@ -1820,7 +1885,9 @@ asn1_error_code asn1_encode_reply_key_pack_draft9(asn1buf *buf, const krb5_reply
     asn1_cleanup();
 }
 
-asn1_error_code asn1_encode_pa_pk_as_rep(asn1buf *buf, const krb5_pa_pk_as_rep *val, unsigned int *retlen)
+asn1_error_code
+asn1_encode_pa_pk_as_rep(asn1buf *buf, const krb5_pa_pk_as_rep *val,
+                         unsigned int *retlen)
 {
     asn1_setup();
 
@@ -1839,7 +1906,10 @@ asn1_error_code asn1_encode_pa_pk_as_rep(asn1buf *buf, const krb5_pa_pk_as_rep *
     asn1_cleanup();
 }
 
-asn1_error_code asn1_encode_pa_pk_as_rep_draft9(asn1buf *buf, const krb5_pa_pk_as_rep_draft9 *val, unsigned int *retlen)
+asn1_error_code
+asn1_encode_pa_pk_as_rep_draft9(asn1buf *buf,
+                                const krb5_pa_pk_as_rep_draft9 *val,
+                                unsigned int *retlen)
 {
     asn1_setup();
 
@@ -1858,7 +1928,10 @@ asn1_error_code asn1_encode_pa_pk_as_rep_draft9(asn1buf *buf, const krb5_pa_pk_a
     asn1_cleanup();
 }
 
-asn1_error_code asn1_encode_td_trusted_certifiers(asn1buf *buf, const krb5_external_principal_identifier **val, unsigned int *retlen)
+asn1_error_code
+asn1_encode_td_trusted_certifiers(
+    asn1buf *buf, const krb5_external_principal_identifier **val,
+    unsigned int *retlen)
 {
     asn1_setup();
     {
@@ -1873,7 +1946,9 @@ asn1_error_code asn1_encode_td_trusted_certifiers(asn1buf *buf, const krb5_exter
 
 #endif /* DISABLE_PKINIT */
 
-asn1_error_code asn1_encode_sequence_of_typed_data(asn1buf *buf, const krb5_typed_data **val, unsigned int *retlen)
+asn1_error_code
+asn1_encode_sequence_of_typed_data(asn1buf *buf, const krb5_typed_data **val,
+                                   unsigned int *retlen)
 {
     asn1_setup();
     int i;
@@ -1893,7 +1968,9 @@ asn1_error_code asn1_encode_sequence_of_typed_data(asn1buf *buf, const krb5_type
     asn1_cleanup();
 }
 
-asn1_error_code asn1_encode_typed_data(asn1buf *buf, const krb5_typed_data *val, unsigned int *retlen)
+asn1_error_code
+asn1_encode_typed_data(asn1buf *buf, const krb5_typed_data *val,
+                       unsigned int *retlen)
 {
     asn1_setup();
     asn1_addlenfield(val->length, val->data, 1, asn1_encode_octetstring);
diff --git a/src/lib/krb5/asn.1/asn1_make.c b/src/lib/krb5/asn.1/asn1_make.c
index c4f740c7f..41e6ffca9 100644
--- a/src/lib/krb5/asn.1/asn1_make.c
+++ b/src/lib/krb5/asn.1/asn1_make.c
@@ -27,18 +27,17 @@
 
 #include "asn1_make.h"
 
-asn1_error_code asn1_make_etag(asn1buf *buf, asn1_class asn1class,
-                               asn1_tagnum tagnum, unsigned int in_len,
-                               unsigned int *retlen)
+asn1_error_code
+asn1_make_etag(asn1buf *buf, asn1_class asn1class, asn1_tagnum tagnum,
+               unsigned int in_len, unsigned int *retlen)
 {
     return asn1_make_tag(buf,asn1class,CONSTRUCTED,tagnum,in_len,retlen);
 }
 
-
-asn1_error_code asn1_make_tag(asn1buf *buf, asn1_class asn1class,
-                              asn1_construction construction,
-                              asn1_tagnum tagnum, unsigned int in_len,
-                              unsigned int *retlen)
+asn1_error_code
+asn1_make_tag(asn1buf *buf, asn1_class asn1class,
+              asn1_construction construction, asn1_tagnum tagnum,
+              unsigned int in_len, unsigned int *retlen)
 {
     asn1_error_code retval;
     unsigned int sumlen=0, length;
@@ -56,7 +55,8 @@ asn1_error_code asn1_make_tag(asn1buf *buf, asn1_class asn1class,
     return 0;
 }
 
-asn1_error_code asn1_make_length(asn1buf *buf, const unsigned int in_len, unsigned int *retlen)
+asn1_error_code
+asn1_make_length(asn1buf *buf, const unsigned int in_len, unsigned int *retlen)
 {
     asn1_error_code retval;
 
@@ -82,9 +82,10 @@ asn1_error_code asn1_make_length(asn1buf *buf, const unsigned int in_len, unsign
     return 0;
 }
 
-asn1_error_code asn1_make_id(asn1buf *buf, asn1_class asn1class,
-                             asn1_construction construction,
-                             asn1_tagnum tagnum, unsigned int *retlen)
+asn1_error_code
+asn1_make_id(asn1buf *buf, asn1_class asn1class,
+             asn1_construction construction, asn1_tagnum tagnum,
+             unsigned int *retlen)
 {
     asn1_error_code retval;
 
@@ -117,7 +118,9 @@ asn1_error_code asn1_make_id(asn1buf *buf, asn1_class asn1class,
     return 0;
 }
 
-asn1_error_code asn1_make_sequence(asn1buf *buf, const unsigned int seq_len, unsigned int *retlen)
+asn1_error_code
+asn1_make_sequence(asn1buf *buf, const unsigned int seq_len,
+                   unsigned int *retlen)
 {
     asn1_error_code retval;
     unsigned int len, sum=0;
@@ -133,7 +136,8 @@ asn1_error_code asn1_make_sequence(asn1buf *buf, const unsigned int seq_len, uns
     return 0;
 }
 
-asn1_error_code asn1_make_set(asn1buf *buf, const unsigned int set_len, unsigned int *retlen)
+asn1_error_code
+asn1_make_set(asn1buf *buf, const unsigned int set_len, unsigned int *retlen)
 {
     asn1_error_code retval;
     unsigned int len, sum=0;
@@ -149,7 +153,9 @@ asn1_error_code asn1_make_set(asn1buf *buf, const unsigned int set_len, unsigned
     return 0;
 }
 
-asn1_error_code asn1_make_string(asn1buf *buf, const unsigned int length, const char *string, int *retlen)
+asn1_error_code
+asn1_make_string(asn1buf *buf, const unsigned int length, const char *string,
+                 int *retlen)
 {
     asn1_error_code retval;
 
diff --git a/src/lib/krb5/asn.1/asn1_misc.c b/src/lib/krb5/asn.1/asn1_misc.c
index c357f60c2..44797d87c 100644
--- a/src/lib/krb5/asn.1/asn1_misc.c
+++ b/src/lib/krb5/asn.1/asn1_misc.c
@@ -27,7 +27,8 @@
 
 #include "asn1_misc.h"
 
-asn1_error_code asn1_krb5_realm_copy(krb5_principal target, krb5_principal source)
+asn1_error_code
+asn1_krb5_realm_copy(krb5_principal target, krb5_principal source)
 {
     target->realm.length = source->realm.length;
     target->realm.data = (char*)malloc(target->realm.length); /* copy realm */
diff --git a/src/lib/krb5/asn.1/krb5_encode.c b/src/lib/krb5/asn.1/krb5_encode.c
index 144b726b6..ae6de7d29 100644
--- a/src/lib/krb5/asn.1/krb5_encode.c
+++ b/src/lib/krb5/asn.1/krb5_encode.c
@@ -63,7 +63,8 @@ error:\
   return 0
 
 #ifndef DISABLE_PKINIT
-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(const krb5_pa_pk_as_req *rep, krb5_data **code)
 {
     krb5_setup();
     retval = asn1_encode_pa_pk_as_req(buf,rep,&length);
@@ -72,7 +73,9 @@ krb5_error_code encode_krb5_pa_pk_as_req(const krb5_pa_pk_as_req *rep, krb5_data
     krb5_cleanup();
 }
 
-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_pa_pk_as_req_draft9(const krb5_pa_pk_as_req_draft9 *rep,
+                                krb5_data **code)
 {
     krb5_setup();
     retval = asn1_encode_pa_pk_as_req_draft9(buf,rep,&length);
@@ -81,7 +84,8 @@ krb5_error_code encode_krb5_pa_pk_as_req_draft9(const krb5_pa_pk_as_req_draft9 *
     krb5_cleanup();
 }
 
-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(const krb5_pa_pk_as_rep *rep, krb5_data **code)
 {
     krb5_setup();
     retval = asn1_encode_pa_pk_as_rep(buf,rep,&length);
@@ -90,7 +94,8 @@ krb5_error_code encode_krb5_pa_pk_as_rep(const krb5_pa_pk_as_rep *rep, krb5_data
     krb5_cleanup();
 }
 
-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_rep_draft9(const krb5_pa_pk_as_rep_draft9 *rep, krb5_data **code)
 {
     krb5_setup();
     retval = asn1_encode_pa_pk_as_rep_draft9(buf,rep,&length);
@@ -99,7 +104,8 @@ krb5_error_code encode_krb5_pa_pk_as_rep_draft9(const krb5_pa_pk_as_rep_draft9 *
     krb5_cleanup();
 }
 
-krb5_error_code encode_krb5_auth_pack(const krb5_auth_pack *rep, krb5_data **code)
+krb5_error_code
+encode_krb5_auth_pack(const krb5_auth_pack *rep, krb5_data **code)
 {
     krb5_setup();
     retval = asn1_encode_auth_pack(buf,rep,&length);
@@ -108,7 +114,9 @@ krb5_error_code encode_krb5_auth_pack(const krb5_auth_pack *rep, krb5_data **cod
     krb5_cleanup();
 }
 
-krb5_error_code encode_krb5_auth_pack_draft9(const krb5_auth_pack_draft9 *rep, krb5_data **code)
+krb5_error_code
+encode_krb5_auth_pack_draft9(const krb5_auth_pack_draft9 *rep,
+                             krb5_data **code)
 {
     krb5_setup();
     retval = asn1_encode_auth_pack_draft9(buf,rep,&length);
@@ -117,7 +125,8 @@ krb5_error_code encode_krb5_auth_pack_draft9(const krb5_auth_pack_draft9 *rep, k
     krb5_cleanup();
 }
 
-krb5_error_code encode_krb5_kdc_dh_key_info(const krb5_kdc_dh_key_info *rep, krb5_data **code)
+krb5_error_code
+encode_krb5_kdc_dh_key_info(const krb5_kdc_dh_key_info *rep, krb5_data **code)
 {
     krb5_setup();
     retval = asn1_encode_kdc_dh_key_info(buf,rep,&length);
@@ -126,7 +135,8 @@ krb5_error_code encode_krb5_kdc_dh_key_info(const krb5_kdc_dh_key_info *rep, krb
     krb5_cleanup();
 }
 
-krb5_error_code encode_krb5_reply_key_pack(const krb5_reply_key_pack *rep, krb5_data **code)
+krb5_error_code
+encode_krb5_reply_key_pack(const krb5_reply_key_pack *rep, krb5_data **code)
 {
     krb5_setup();
     retval = asn1_encode_reply_key_pack(buf,rep,&length);
@@ -135,7 +145,9 @@ krb5_error_code encode_krb5_reply_key_pack(const krb5_reply_key_pack *rep, krb5_
     krb5_cleanup();
 }
 
-krb5_error_code encode_krb5_reply_key_pack_draft9(const krb5_reply_key_pack_draft9 *rep, krb5_data **code)
+krb5_error_code
+encode_krb5_reply_key_pack_draft9(const krb5_reply_key_pack_draft9 *rep,
+                                  krb5_data **code)
 {
     krb5_setup();
     retval = asn1_encode_reply_key_pack_draft9(buf,rep,&length);
@@ -144,7 +156,9 @@ krb5_error_code encode_krb5_reply_key_pack_draft9(const krb5_reply_key_pack_draf
     krb5_cleanup();
 }
 
-krb5_error_code encode_krb5_td_trusted_certifiers(const krb5_external_principal_identifier **rep, krb5_data **code)
+krb5_error_code
+encode_krb5_td_trusted_certifiers(
+    const krb5_external_principal_identifier **rep, krb5_data **code)
 {
     krb5_setup();
     retval = asn1_encode_td_trusted_certifiers(buf,rep,&length);
@@ -153,7 +167,9 @@ krb5_error_code encode_krb5_td_trusted_certifiers(const krb5_external_principal_
     krb5_cleanup();
 }
 
-krb5_error_code encode_krb5_td_dh_parameters(const krb5_algorithm_identifier **rep, krb5_data **code)
+krb5_error_code
+encode_krb5_td_dh_parameters(const krb5_algorithm_identifier **rep,
+                             krb5_data **code)
 {
     krb5_setup();
     retval = asn1_encode_sequence_of_algorithm_identifier(buf,rep,&length);
@@ -163,7 +179,8 @@ krb5_error_code encode_krb5_td_dh_parameters(const krb5_algorithm_identifier **r
 }
 #endif /* DISABLE_PKINIT */
 
-krb5_error_code encode_krb5_typed_data(const krb5_typed_data **rep, krb5_data **code)
+krb5_error_code
+encode_krb5_typed_data(const krb5_typed_data **rep, krb5_data **code)
 {
     krb5_setup();
     retval = asn1_encode_sequence_of_typed_data(buf,rep,&length);
diff --git a/src/lib/krb5/asn.1/ldap_key_seq.c b/src/lib/krb5/asn.1/ldap_key_seq.c
index 2807a5101..a45cf3bc5 100644
--- a/src/lib/krb5/asn.1/ldap_key_seq.c
+++ b/src/lib/krb5/asn.1/ldap_key_seq.c
@@ -60,7 +60,8 @@ static const struct field_info krbsalt_fields[] = {
     FIELDOF_OPTSTRINGL(krb5_key_data, octetstring, key_data_contents[1],
                        ui_2, key_data_length[1], 1, 1),
 };
-static unsigned int optional_krbsalt (const void *p)
+static unsigned int
+optional_krbsalt (const void *p)
 {
     const krb5_key_data *k = p;
     unsigned int optional = 0;
@@ -208,7 +209,8 @@ last:
     return ret;
 }
 
-static asn1_error_code asn1_decode_key(asn1buf *buf, krb5_key_data *key)
+static asn1_error_code
+asn1_decode_key(asn1buf *buf, krb5_key_data *key)
 {
     int full_buflen, seqindef;
     unsigned int length;
@@ -290,8 +292,8 @@ last:
     return ret;
 }
 
-krb5_error_code krb5int_ldap_decode_sequence_of_keys (krb5_data *in,
-                                                      ldap_seqof_key_data **rep)
+krb5_error_code
+krb5int_ldap_decode_sequence_of_keys (krb5_data *in, ldap_seqof_key_data **rep)
 {
     ldap_seqof_key_data *repval;
     krb5_key_data **out;