diff options
author | Tom Yu <tlyu@mit.edu> | 2009-01-22 23:21:11 +0000 |
---|---|---|
committer | Tom Yu <tlyu@mit.edu> | 2009-01-22 23:21:11 +0000 |
commit | f391d18be3aa3de52b391596bd8025010281cfb7 (patch) | |
tree | c5c4d97d09ea4adfe82d70a057c5e6f785037340 /src/lib/krb5/asn.1 | |
parent | 6422c0b5646f4f8e40108c167c50d7aea9abb6da (diff) | |
download | krb5-f391d18be3aa3de52b391596bd8025010281cfb7.tar.gz krb5-f391d18be3aa3de52b391596bd8025010281cfb7.tar.xz krb5-f391d18be3aa3de52b391596bd8025010281cfb7.zip |
whitespace
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21778 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/krb5/asn.1')
-rw-r--r-- | src/lib/krb5/asn.1/asn1_decode.h | 2 | ||||
-rw-r--r-- | src/lib/krb5/asn.1/asn1_encode.c | 6 | ||||
-rw-r--r-- | src/lib/krb5/asn.1/asn1_encode.h | 2 | ||||
-rw-r--r-- | src/lib/krb5/asn.1/asn1_k_decode.c | 28 | ||||
-rw-r--r-- | src/lib/krb5/asn.1/asn1_k_decode.h | 6 | ||||
-rw-r--r-- | src/lib/krb5/asn.1/asn1_k_encode.c | 2 | ||||
-rw-r--r-- | src/lib/krb5/asn.1/krb5_decode.c | 4 | ||||
-rw-r--r-- | src/lib/krb5/asn.1/krbasn1.h | 4 |
8 files changed, 27 insertions, 27 deletions
diff --git a/src/lib/krb5/asn.1/asn1_decode.h b/src/lib/krb5/asn.1/asn1_decode.h index 3e8bac4c6d..b90a369d67 100644 --- a/src/lib/krb5/asn.1/asn1_decode.h +++ b/src/lib/krb5/asn.1/asn1_decode.h @@ -61,7 +61,7 @@ asn1_error_code asn1_decode_boolean - (asn1buf *buf, unsigned int *val); + (asn1buf *buf, unsigned int *val); asn1_error_code asn1_decode_integer (asn1buf *buf, long *val); asn1_error_code asn1_decode_unsigned_integer diff --git a/src/lib/krb5/asn.1/asn1_encode.c b/src/lib/krb5/asn.1/asn1_encode.c index c4cc674e02..d795464939 100644 --- a/src/lib/krb5/asn.1/asn1_encode.c +++ b/src/lib/krb5/asn.1/asn1_encode.c @@ -31,7 +31,7 @@ #include "asn1_make.h" asn1_error_code asn1_encode_boolean(asn1buf *buf, asn1_intmax val, - unsigned int *retlen) + unsigned int *retlen) { asn1_error_code retval; unsigned int length = 0; @@ -321,10 +321,10 @@ asn1_error_code asn1_encode_opaque(asn1buf *buf, unsigned int len, correct byte order, in an allocated krb5_data. */ #ifdef POINTERS_ARE_ALL_THE_SAME -#define LOADPTR(PTR,TYPE) \ +#define LOADPTR(PTR,TYPE) \ (assert((TYPE)->loadptr != NULL), (TYPE)->loadptr(PTR)) #else -#define LOADPTR(PTR,TYPE) \ +#define LOADPTR(PTR,TYPE) \ (*(const void *const *)(PTR)) #endif diff --git a/src/lib/krb5/asn.1/asn1_encode.h b/src/lib/krb5/asn.1/asn1_encode.h index 94ab67fe4e..289b98db10 100644 --- a/src/lib/krb5/asn.1/asn1_encode.h +++ b/src/lib/krb5/asn.1/asn1_encode.h @@ -52,7 +52,7 @@ */ asn1_error_code asn1_encode_boolean - (asn1buf *buf, asn1_intmax val, unsigned int *retlen); + (asn1buf *buf, asn1_intmax val, unsigned int *retlen); asn1_error_code asn1_encode_integer (asn1buf *buf, asn1_intmax val, unsigned int *retlen); /* requires *buf is allocated diff --git a/src/lib/krb5/asn.1/asn1_k_decode.c b/src/lib/krb5/asn.1/asn1_k_decode.c index b4dbd2fe84..035aff17ea 100644 --- a/src/lib/krb5/asn.1/asn1_k_decode.c +++ b/src/lib/krb5/asn.1/asn1_k_decode.c @@ -1193,13 +1193,13 @@ asn1_error_code asn1_decode_setpw_req(asn1buf *buf, krb5_data *newpasswd, krb5_p *principal = NULL; { begin_structure(); - get_lenfield(newpasswd->length, newpasswd->data, 0, asn1_decode_charstring); - if (tagnum == 1) { - alloc_field(*principal, krb5_principal_data); - opt_field(*principal, 1, asn1_decode_principal_name, 0); - opt_field(*principal, 2, asn1_decode_realm, 0); - } - end_structure(); + get_lenfield(newpasswd->length, newpasswd->data, 0, asn1_decode_charstring); + if (tagnum == 1) { + alloc_field(*principal, krb5_principal_data); + opt_field(*principal, 1, asn1_decode_principal_name, 0); + opt_field(*principal, 2, asn1_decode_realm, 0); + } + end_structure(); } cleanup(); } @@ -1208,11 +1208,11 @@ asn1_error_code asn1_decode_pa_for_user(asn1buf *buf, krb5_pa_for_user *val) { setup(); { begin_structure(); - get_field(val->user,0,asn1_decode_principal_name); - get_field(val->user,1,asn1_decode_realm); - get_field(val->cksum,2,asn1_decode_checksum); - get_lenfield(val->auth_package.length,val->auth_package.data,3,asn1_decode_generalstring); - end_structure(); + get_field(val->user,0,asn1_decode_principal_name); + get_field(val->user,1,asn1_decode_realm); + get_field(val->cksum,2,asn1_decode_checksum); + get_lenfield(val->auth_package.length,val->auth_package.data,3,asn1_decode_generalstring); + end_structure(); } cleanup(); } @@ -1221,8 +1221,8 @@ asn1_error_code asn1_decode_pa_pac_req(asn1buf *buf, krb5_pa_pac_req *val) { setup(); { begin_structure(); - get_field(val->include_pac,0,asn1_decode_boolean); - end_structure(); + get_field(val->include_pac,0,asn1_decode_boolean); + end_structure(); } cleanup(); } diff --git a/src/lib/krb5/asn.1/asn1_k_decode.h b/src/lib/krb5/asn.1/asn1_k_decode.h index 22ef264318..3ec84c051e 100644 --- a/src/lib/krb5/asn.1/asn1_k_decode.h +++ b/src/lib/krb5/asn.1/asn1_k_decode.h @@ -234,10 +234,10 @@ asn1_error_code asn1_decode_sequence_of_algorithm_identifier (asn1buf *buf, krb5_algorithm_identifier ***val); asn1_error_code asn1_decode_setpw_req - (asn1buf *buf, krb5_data *rep, krb5_principal *principal); + (asn1buf *buf, krb5_data *rep, krb5_principal *principal); asn1_error_code asn1_decode_pa_for_user - (asn1buf *buf, krb5_pa_for_user *val); + (asn1buf *buf, krb5_pa_for_user *val); asn1_error_code asn1_decode_pa_pac_req - (asn1buf *buf, krb5_pa_pac_req *val); + (asn1buf *buf, krb5_pa_pac_req *val); #endif diff --git a/src/lib/krb5/asn.1/asn1_k_encode.c b/src/lib/krb5/asn.1/asn1_k_encode.c index 3308d0ea14..ac52ebead2 100644 --- a/src/lib/krb5/asn.1/asn1_k_encode.c +++ b/src/lib/krb5/asn.1/asn1_k_encode.c @@ -247,7 +247,7 @@ static const struct field_info enc_kdc_rep_part_fields[] = { /* caddr[11] HostAddresses OPTIONAL */ FIELDOF_OPT(krb5_enc_kdc_rep_part, ptr_seqof_host_addresses, caddrs, 11, 11), - /* encrypted-pa-data[12] SEQUENCE OF PA-DATA OPTIONAL */ + /* 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) diff --git a/src/lib/krb5/asn.1/krb5_decode.c b/src/lib/krb5/asn.1/krb5_decode.c index c413a32f19..2d9a3daf7f 100644 --- a/src/lib/krb5/asn.1/krb5_decode.c +++ b/src/lib/krb5/asn.1/krb5_decode.c @@ -952,8 +952,8 @@ krb5_error_code decode_krb5_predicted_sam_response(const krb5_data *code, krb5_p } krb5_error_code decode_krb5_setpw_req(const krb5_data *code, - krb5_data **rep, - krb5_principal *principal) + krb5_data **rep, + krb5_principal *principal) { setup_buf_only(); alloc_field(*rep, krb5_data); diff --git a/src/lib/krb5/asn.1/krbasn1.h b/src/lib/krb5/asn.1/krbasn1.h index 53feb6dd6b..985381a254 100644 --- a/src/lib/krb5/asn.1/krbasn1.h +++ b/src/lib/krb5/asn.1/krbasn1.h @@ -46,13 +46,13 @@ typedef int asn1_tagnum; #define KVNO 5 /* Universal Tag Numbers */ -#define ASN1_BOOLEAN 1 +#define ASN1_BOOLEAN 1 #define ASN1_INTEGER 2 #define ASN1_BITSTRING 3 #define ASN1_OCTETSTRING 4 #define ASN1_NULL 5 #define ASN1_OBJECTIDENTIFIER 6 -#define ASN1_ENUMERATED 10 +#define ASN1_ENUMERATED 10 #define ASN1_SEQUENCE 16 #define ASN1_SET 17 #define ASN1_PRINTABLESTRING 19 |