Untabify some files mistakenly created with tabs

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

5 files changed, 128 insertions, 128 deletions

diff --git a/src/lib/crypto/krb/checksum_confounder.c b/src/lib/crypto/krb/checksum_confounder.c
index 3d8cd0874..116b3c7ff 100644
--- a/src/lib/crypto/krb/checksum_confounder.c
+++ b/src/lib/crypto/krb/checksum_confounder.c
@@ -43,7 +43,7 @@ mk_xorkey(krb5_key origkey, krb5_key *xorkey)
 
     xorbytes = malloc(origkey->keyblock.length);
     if (xorbytes == NULL)
-	return ENOMEM;
+        return ENOMEM;
     memcpy(xorbytes, origkey->keyblock.contents, origkey->keyblock.length);
     for (i = 0; i < origkey->keyblock.length; i++)
         xorbytes[i] ^= 0xf0;
@@ -85,13 +85,13 @@ krb5int_confounder_checksum(const struct krb5_cksumtypes *ctp,
     /* Hash the confounder, then the input data. */
     hash_iov = k5alloc((num_data + 1) * sizeof(krb5_crypto_iov), &ret);
     if (hash_iov == NULL)
-	goto cleanup;
+        goto cleanup;
     hash_iov[0].flags = KRB5_CRYPTO_TYPE_DATA;
     hash_iov[0].data = conf;
     memcpy(hash_iov + 1, data, num_data * sizeof(krb5_crypto_iov));
     ret = ctp->hash->hash(hash_iov, num_data + 1, &hashval);
     if (ret != 0)
-	goto cleanup;
+        goto cleanup;
 
     /* Confounder and hash are in output buffer; encrypt them in place. */
     iov.flags = KRB5_CRYPTO_TYPE_DATA;
@@ -120,11 +120,11 @@ krb5_error_code krb5int_confounder_verify(const struct krb5_cksumtypes *ctp,
 
     plaintext = k5alloc(input->length, &ret);
     if (plaintext == NULL)
-	return ret;
+        return ret;
 
     ret = mk_xorkey(key, &xorkey);
     if (ret != 0)
-	goto cleanup;
+        goto cleanup;
 
     /* Decrypt the input checksum. */
     iov.flags = KRB5_CRYPTO_TYPE_DATA;
@@ -137,16 +137,16 @@ krb5_error_code krb5int_confounder_verify(const struct krb5_cksumtypes *ctp,
     /* Hash the confounder, then the input data. */
     hash_iov = k5alloc((num_data + 1) * sizeof(krb5_crypto_iov), &ret);
     if (hash_iov == NULL)
-	goto cleanup;
+        goto cleanup;
     hash_iov[0].flags = KRB5_CRYPTO_TYPE_DATA;
     hash_iov[0].data = make_data(plaintext, blocksize);
     memcpy(hash_iov + 1, data, num_data * sizeof(krb5_crypto_iov));
     ret = alloc_data(&computed, hashsize);
     if (ret != 0)
-	goto cleanup;
+        goto cleanup;
     ret = ctp->hash->hash(hash_iov, num_data + 1, &computed);
     if (ret != 0)
-	goto cleanup;
+        goto cleanup;
 
     /* Compare the decrypted hash to the computed one. */
     *valid = (memcmp(plaintext + blocksize, computed.data, hashsize) == 0);
diff --git a/src/lib/crypto/krb/checksum_hmac_md5.c b/src/lib/crypto/krb/checksum_hmac_md5.c
index 12d4c9d64..6c5f6175d 100644
--- a/src/lib/crypto/krb/checksum_hmac_md5.c
+++ b/src/lib/crypto/krb/checksum_hmac_md5.c
@@ -49,37 +49,37 @@ krb5_error_code krb5int_hmacmd5_checksum(const struct krb5_cksumtypes *ctp,
     if (key == NULL || key->keyblock.length > ctp->hash->blocksize)
         return KRB5_BAD_ENCTYPE;
     if (ctp->ctype == CKSUMTYPE_HMAC_MD5_ARCFOUR) {
-	/* Compute HMAC(key, "signaturekey\0") to get the signing key ks. */
+        /* Compute HMAC(key, "signaturekey\0") to get the signing key ks. */
         ret = alloc_data(&ds, ctp->hash->hashsize);
-	if (ret != 0)
-	    goto cleanup;
+        if (ret != 0)
+            goto cleanup;
 
-	iov.flags = KRB5_CRYPTO_TYPE_DATA;
-	iov.data = make_data("signaturekey", 13);
-	ret = krb5int_hmac(ctp->hash, key, &iov, 1, &ds);
-	if (ret)
-	    goto cleanup;
-	ks.length = key->keyblock.length;
-	ks.contents = (krb5_octet *) ds.data;
-	keyblock = &ks;
+        iov.flags = KRB5_CRYPTO_TYPE_DATA;
+        iov.data = make_data("signaturekey", 13);
+        ret = krb5int_hmac(ctp->hash, key, &iov, 1, &ds);
+        if (ret)
+            goto cleanup;
+        ks.length = key->keyblock.length;
+        ks.contents = (krb5_octet *) ds.data;
+        keyblock = &ks;
     } else  /* For md5-hmac, just use the key. */
-	keyblock = &key->keyblock;
+        keyblock = &key->keyblock;
 
     /* Compute the MD5 value of the input. */
     ms_usage = krb5int_arcfour_translate_usage(usage);
     store_32_le(ms_usage, t);
     hash_iov = k5alloc((num_data + 1) * sizeof(krb5_crypto_iov), &ret);
     if (hash_iov == NULL)
-	goto cleanup;
+        goto cleanup;
     hash_iov[0].flags = KRB5_CRYPTO_TYPE_DATA;
     hash_iov[0].data = make_data(t, 4);
     memcpy(hash_iov + 1, data, num_data * sizeof(krb5_crypto_iov));
     ret = alloc_data(&hashval, ctp->hash->hashsize);
     if (ret != 0)
-	goto cleanup;
+        goto cleanup;
     ret = ctp->hash->hash(hash_iov, num_data + 1, &hashval);
     if (ret != 0)
-	goto cleanup;
+        goto cleanup;
 
     /* Compute HMAC(ks, md5value). */
     iov.flags = KRB5_CRYPTO_TYPE_DATA;
diff --git a/src/lib/crypto/krb/crypto_int.h b/src/lib/crypto/krb/crypto_int.h
index 77da87de6..cb9aef346 100644
--- a/src/lib/crypto/krb/crypto_int.h
+++ b/src/lib/crypto/krb/crypto_int.h
@@ -173,65 +173,65 @@ extern const size_t krb5int_cksumtypes_length;
 
 /* Length */
 unsigned int krb5int_old_crypto_length(const struct krb5_keytypes *ktp,
-				       krb5_cryptotype type);
+                                       krb5_cryptotype type);
 unsigned int krb5int_raw_crypto_length(const struct krb5_keytypes *ktp,
-				       krb5_cryptotype type);
+                                       krb5_cryptotype type);
 unsigned int krb5int_arcfour_crypto_length(const struct krb5_keytypes *ktp,
-					   krb5_cryptotype type);
+                                           krb5_cryptotype type);
 unsigned int krb5int_dk_crypto_length(const struct krb5_keytypes *ktp,
-				      krb5_cryptotype type);
+                                      krb5_cryptotype type);
 unsigned int krb5int_aes_crypto_length(const struct krb5_keytypes *ktp,
-				       krb5_cryptotype type);
+                                       krb5_cryptotype type);
 unsigned int krb5int_camellia_crypto_length(const struct krb5_keytypes *ktp,
-					    krb5_cryptotype type);
+                                            krb5_cryptotype type);
 
 /* Encrypt */
 krb5_error_code krb5int_old_encrypt(const struct krb5_keytypes *ktp,
-				    krb5_key key, krb5_keyusage usage,
-				    const krb5_data *ivec,
-				    krb5_crypto_iov *data, size_t num_data);
+                                    krb5_key key, krb5_keyusage usage,
+                                    const krb5_data *ivec,
+                                    krb5_crypto_iov *data, size_t num_data);
 krb5_error_code krb5int_raw_encrypt(const struct krb5_keytypes *ktp,
-				    krb5_key key, krb5_keyusage usage,
-				    const krb5_data *ivec,
-				    krb5_crypto_iov *data, size_t num_data);
+                                    krb5_key key, krb5_keyusage usage,
+                                    const krb5_data *ivec,
+                                    krb5_crypto_iov *data, size_t num_data);
 krb5_error_code krb5int_arcfour_encrypt(const struct krb5_keytypes *ktp,
-					krb5_key key, krb5_keyusage usage,
-					const krb5_data *ivec,
-					krb5_crypto_iov *data,
-					size_t num_data);
+                                        krb5_key key, krb5_keyusage usage,
+                                        const krb5_data *ivec,
+                                        krb5_crypto_iov *data,
+                                        size_t num_data);
 krb5_error_code krb5int_dk_encrypt(const struct krb5_keytypes *ktp,
-				   krb5_key key, krb5_keyusage usage,
-				   const krb5_data *ivec,
-				   krb5_crypto_iov *data, size_t num_data);
+                                   krb5_key key, krb5_keyusage usage,
+                                   const krb5_data *ivec,
+                                   krb5_crypto_iov *data, size_t num_data);
 krb5_error_code krb5int_dk_cmac_encrypt(const struct krb5_keytypes *ktp,
-					krb5_key key, krb5_keyusage usage,
-					const krb5_data *ivec,
-					krb5_crypto_iov *data,
-					size_t num_data);
+                                        krb5_key key, krb5_keyusage usage,
+                                        const krb5_data *ivec,
+                                        krb5_crypto_iov *data,
+                                        size_t num_data);
 
 /* Decrypt */
 krb5_error_code krb5int_old_decrypt(const struct krb5_keytypes *ktp,
-				    krb5_key key, krb5_keyusage usage,
-				    const krb5_data *ivec,
-				    krb5_crypto_iov *data, size_t num_data);
+                                    krb5_key key, krb5_keyusage usage,
+                                    const krb5_data *ivec,
+                                    krb5_crypto_iov *data, size_t num_data);
 krb5_error_code krb5int_raw_decrypt(const struct krb5_keytypes *ktp,
-				    krb5_key key, krb5_keyusage usage,
-				    const krb5_data *ivec,
-				    krb5_crypto_iov *data, size_t num_data);
+                                    krb5_key key, krb5_keyusage usage,
+                                    const krb5_data *ivec,
+                                    krb5_crypto_iov *data, size_t num_data);
 krb5_error_code krb5int_arcfour_decrypt(const struct krb5_keytypes *ktp,
-					krb5_key key, krb5_keyusage usage,
-					const krb5_data *ivec,
-					krb5_crypto_iov *data,
-					size_t num_data);
+                                        krb5_key key, krb5_keyusage usage,
+                                        const krb5_data *ivec,
+                                        krb5_crypto_iov *data,
+                                        size_t num_data);
 krb5_error_code krb5int_dk_decrypt(const struct krb5_keytypes *ktp,
-				   krb5_key key, krb5_keyusage usage,
-				   const krb5_data *ivec,
-				   krb5_crypto_iov *data, size_t num_data);
+                                   krb5_key key, krb5_keyusage usage,
+                                   const krb5_data *ivec,
+                                   krb5_crypto_iov *data, size_t num_data);
 krb5_error_code krb5int_dk_cmac_decrypt(const struct krb5_keytypes *ktp,
-					krb5_key key, krb5_keyusage usage,
-					const krb5_data *ivec,
-					krb5_crypto_iov *data,
-					size_t num_data);
+                                        krb5_key key, krb5_keyusage usage,
+                                        const krb5_data *ivec,
+                                        krb5_crypto_iov *data,
+                                        size_t num_data);
 
 /* String to key */
 krb5_error_code krb5int_des_string_to_key(const struct krb5_keytypes *ktp,
@@ -240,46 +240,46 @@ krb5_error_code krb5int_des_string_to_key(const struct krb5_keytypes *ktp,
                                           const krb5_data *params,
                                           krb5_keyblock *key);
 krb5_error_code krb5int_arcfour_string_to_key(const struct krb5_keytypes *ktp,
-					      const krb5_data *string,
-					      const krb5_data *salt,
-					      const krb5_data *params,
-					      krb5_keyblock *key);
+                                              const krb5_data *string,
+                                              const krb5_data *salt,
+                                              const krb5_data *params,
+                                              krb5_keyblock *key);
 krb5_error_code krb5int_dk_string_to_key(const struct krb5_keytypes *enc,
-					 const krb5_data *string,
-					 const krb5_data *salt,
-					 const krb5_data *params,
-					 krb5_keyblock *key);
+                                         const krb5_data *string,
+                                         const krb5_data *salt,
+                                         const krb5_data *params,
+                                         krb5_keyblock *key);
 krb5_error_code krb5int_aes_string_to_key(const struct krb5_keytypes *enc,
-					  const krb5_data *string,
-					  const krb5_data *salt,
-					  const krb5_data *params,
-					  krb5_keyblock *key);
+                                          const krb5_data *string,
+                                          const krb5_data *salt,
+                                          const krb5_data *params,
+                                          krb5_keyblock *key);
 krb5_error_code krb5int_camellia_string_to_key(const struct krb5_keytypes *enc,
-					       const krb5_data *string,
-					       const krb5_data *salt,
-					       const krb5_data *params,
-					       krb5_keyblock *key);
+                                               const krb5_data *string,
+                                               const krb5_data *salt,
+                                               const krb5_data *params,
+                                               krb5_keyblock *key);
 
 /* Random to key */
 krb5_error_code k5_rand2key_direct(const krb5_data *randombits,
-				   krb5_keyblock *keyblock);
+                                   krb5_keyblock *keyblock);
 krb5_error_code k5_rand2key_des(const krb5_data *randombits,
-				krb5_keyblock *keyblock);
+                                krb5_keyblock *keyblock);
 krb5_error_code k5_rand2key_des3(const krb5_data *randombits,
-				 krb5_keyblock *keyblock);
+                                 krb5_keyblock *keyblock);
 
 /* Pseudo-random function */
 krb5_error_code krb5int_des_prf(const struct krb5_keytypes *ktp,
-				krb5_key key, const krb5_data *in,
-				krb5_data *out);
+                                krb5_key key, const krb5_data *in,
+                                krb5_data *out);
 krb5_error_code krb5int_arcfour_prf(const struct krb5_keytypes *ktp,
-				    krb5_key key, const krb5_data *in,
-				    krb5_data *out);
+                                    krb5_key key, const krb5_data *in,
+                                    krb5_data *out);
 krb5_error_code krb5int_dk_prf(const struct krb5_keytypes *ktp, krb5_key key,
-			       const krb5_data *in, krb5_data *out);
+                               const krb5_data *in, krb5_data *out);
 krb5_error_code krb5int_dk_cmac_prf(const struct krb5_keytypes *ktp,
-				    krb5_key key, const krb5_data *in,
-				    krb5_data *out);
+                                    krb5_key key, const krb5_data *in,
+                                    krb5_data *out);
 
 /*** Prototypes for cksumtype handler functions ***/
 
@@ -299,13 +299,13 @@ krb5_error_code krb5int_hmacmd5_checksum(const struct krb5_cksumtypes *ctp,
                                          size_t num_data,
                                          krb5_data *output);
 krb5_error_code krb5int_dk_checksum(const struct krb5_cksumtypes *ctp,
-				    krb5_key key, krb5_keyusage usage,
-				    const krb5_crypto_iov *data,
-				    size_t num_data, krb5_data *output);
+                                    krb5_key key, krb5_keyusage usage,
+                                    const krb5_crypto_iov *data,
+                                    size_t num_data, krb5_data *output);
 krb5_error_code krb5int_dk_cmac_checksum(const struct krb5_cksumtypes *ctp,
-					 krb5_key key, krb5_keyusage usage,
-					 const krb5_crypto_iov *data,
-					 size_t num_data, krb5_data *output);
+                                         krb5_key key, krb5_keyusage usage,
+                                         const krb5_crypto_iov *data,
+                                         size_t num_data, krb5_data *output);
 krb5_error_code krb5int_confounder_checksum(const struct krb5_cksumtypes *ctp,
                                             krb5_key key, krb5_keyusage usage,
                                             const krb5_crypto_iov *data,
@@ -329,17 +329,17 @@ enum deriv_alg {
 };
 
 krb5_error_code krb5int_derive_keyblock(const struct krb5_enc_provider *enc,
-					krb5_key inkey, krb5_keyblock *outkey,
-					const krb5_data *in_constant,
-					enum deriv_alg alg);
+                                        krb5_key inkey, krb5_keyblock *outkey,
+                                        const krb5_data *in_constant,
+                                        enum deriv_alg alg);
 krb5_error_code krb5int_derive_key(const struct krb5_enc_provider *enc,
-				   krb5_key inkey, krb5_key *outkey,
-				   const krb5_data *in_constant,
-				   enum deriv_alg alg);
+                                   krb5_key inkey, krb5_key *outkey,
+                                   const krb5_data *in_constant,
+                                   enum deriv_alg alg);
 krb5_error_code krb5int_derive_random(const struct krb5_enc_provider *enc,
-				      krb5_key inkey, krb5_data *outrnd,
-				      const krb5_data *in_constant,
-				      enum deriv_alg alg);
+                                      krb5_key inkey, krb5_data *outrnd,
+                                      const krb5_data *in_constant,
+                                      enum deriv_alg alg);
 
 /*** Miscellaneous prototypes ***/
 
@@ -399,17 +399,17 @@ struct iov_block_state {
                                          (_state)->pad_to_boundary = 0)
 
 krb5_crypto_iov *krb5int_c_locate_iov(krb5_crypto_iov *data, size_t num_data,
-				      krb5_cryptotype type);
+                                      krb5_cryptotype type);
 
 krb5_error_code krb5int_c_iov_decrypt_stream(const struct krb5_keytypes *ktp,
-					     krb5_key key,
-					     krb5_keyusage keyusage,
-					     const krb5_data *ivec,
-					     krb5_crypto_iov *data,
-					     size_t num_data);
+                                             krb5_key key,
+                                             krb5_keyusage keyusage,
+                                             const krb5_data *ivec,
+                                             krb5_crypto_iov *data,
+                                             size_t num_data);
 
 unsigned int krb5int_c_padding_length(const struct krb5_keytypes *ktp,
-				      size_t data_length);
+                                      size_t data_length);
 
 /*** Crypto module declarations ***/
 
diff --git a/src/lib/crypto/krb/enc_dk_cmac.c b/src/lib/crypto/krb/enc_dk_cmac.c
index 2ec80bdd4..6593d172e 100644
--- a/src/lib/crypto/krb/enc_dk_cmac.c
+++ b/src/lib/crypto/krb/enc_dk_cmac.c
@@ -35,7 +35,7 @@
 
 unsigned int
 krb5int_camellia_crypto_length(const struct krb5_keytypes *ktp,
-			       krb5_cryptotype type)
+                               krb5_cryptotype type)
 {
     switch (type) {
     case KRB5_CRYPTO_TYPE_HEADER:
@@ -54,7 +54,7 @@ krb5int_camellia_crypto_length(const struct krb5_keytypes *ktp,
 /* Derive encryption and integrity keys for CMAC-using enctypes. */
 static krb5_error_code
 derive_keys(const struct krb5_enc_provider *enc, krb5_key key,
-	    krb5_keyusage usage, krb5_key *ke_out, krb5_key *ki_out)
+            krb5_keyusage usage, krb5_key *ke_out, krb5_key *ki_out)
 {
     krb5_error_code ret;
     unsigned char buf[K5CLENGTH];
@@ -68,14 +68,14 @@ derive_keys(const struct krb5_enc_provider *enc, krb5_key key,
     buf[4] = 0xAA;
     ret = krb5int_derive_key(enc, key, &ke, &constant, DERIVE_SP800_108_CMAC);
     if (ret != 0)
-	return ret;
+        return ret;
 
     /* Derive the integrity key. */
     buf[4] = 0x55;
     ret = krb5int_derive_key(enc, key, &ki, &constant, DERIVE_SP800_108_CMAC);
     if (ret != 0) {
-	krb5_k_free_key(NULL, ke);
-	return ret;
+        krb5_k_free_key(NULL, ke);
+        return ret;
     }
 
     *ke_out = ke;
@@ -85,8 +85,8 @@ derive_keys(const struct krb5_enc_provider *enc, krb5_key key,
 
 krb5_error_code
 krb5int_dk_cmac_encrypt(const struct krb5_keytypes *ktp, krb5_key key,
-			krb5_keyusage usage, const krb5_data *ivec,
-			krb5_crypto_iov *data, size_t num_data)
+                        krb5_keyusage usage, const krb5_data *ivec,
+                        krb5_crypto_iov *data, size_t num_data)
 {
     const struct krb5_enc_provider *enc = ktp->enc;
     krb5_error_code ret;
@@ -105,7 +105,7 @@ krb5int_dk_cmac_encrypt(const struct krb5_keytypes *ktp, krb5_key key,
         return KRB5_BAD_MSIZE;
     padding = krb5int_c_locate_iov(data, num_data, KRB5_CRYPTO_TYPE_PADDING);
     if (padding != NULL)
-	padding->data.length = 0;
+        padding->data.length = 0;
 
     /* Derive the encryption and integrity keys. */
     ret = derive_keys(enc, key, usage, &ke, &ki);
diff --git a/src/lib/crypto/krb/prng_os.c b/src/lib/crypto/krb/prng_os.c
index fa6204e28..730ed2ea7 100644
--- a/src/lib/crypto/krb/prng_os.c
+++ b/src/lib/crypto/krb/prng_os.c
@@ -44,9 +44,9 @@ k5_prng_init(void)
      * okay. */
     fd = open(DEVICE, O_RDWR, 0);
     if (fd == -1)
-	fd = open(DEVICE, O_RDONLY, 0);
+        fd = open(DEVICE, O_RDONLY, 0);
     if (fd == -1)
-	return errno;
+        return errno;
     return 0;
 }
 
@@ -81,13 +81,13 @@ krb5_c_random_make_octets(krb5_context context, krb5_data *outdata)
     ssize_t count;
 
     while (len > 0) {
-	count = read(fd, buf, len);
-	if (count == 0)         /* Not expected from a random device. */
-	    return KRB5_CRYPTO_INTERNAL;
-	if (count == -1)
-	    return errno;
-	buf += count;
-	len -= count;
+        count = read(fd, buf, len);
+        if (count == 0)         /* Not expected from a random device. */
+            return KRB5_CRYPTO_INTERNAL;
+        if (count == -1)
+            return errno;
+        buf += count;
+        len -= count;
     }
     return 0;
 }