summaryrefslogtreecommitdiffstats
path: root/src/lib/crypto/krb
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2011-03-09 21:46:07 +0000
committerGreg Hudson <ghudson@mit.edu>2011-03-09 21:46:07 +0000
commit7da53e2942176c5ddfe007ba0a36f449e9fdb9fb (patch)
tree4881536c48fdeb215e0cbaea18263365330ad9b0 /src/lib/crypto/krb
parentfe012b454a193c1f81ab8011ecd620750e5869f0 (diff)
downloadkrb5-7da53e2942176c5ddfe007ba0a36f449e9fdb9fb.tar.gz
krb5-7da53e2942176c5ddfe007ba0a36f449e9fdb9fb.tar.xz
krb5-7da53e2942176c5ddfe007ba0a36f449e9fdb9fb.zip
Adjust most C source files to match the new standards for copyright
and license comments. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24695 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/krb')
-rw-r--r--src/lib/crypto/krb/aead.c3
-rw-r--r--src/lib/crypto/krb/cf2.c14
-rw-r--r--src/lib/crypto/krb/checksum_cbc.c9
-rw-r--r--src/lib/crypto/krb/checksum_confounder.c7
-rw-r--r--src/lib/crypto/krb/checksum_dk_cmac.c3
-rw-r--r--src/lib/crypto/krb/checksum_hmac_md5.c7
-rw-r--r--src/lib/crypto/krb/checksum_unkeyed.c5
-rw-r--r--src/lib/crypto/krb/cmac.c3
-rw-r--r--src/lib/crypto/krb/combine_keys.c7
-rw-r--r--src/lib/crypto/krb/crc32.c17
-rw-r--r--src/lib/crypto/krb/crypto_length.c3
-rw-r--r--src/lib/crypto/krb/decrypt_iov.c3
-rw-r--r--src/lib/crypto/krb/enc_dk_cmac.c2
-rw-r--r--src/lib/crypto/krb/enc_dk_hmac.c3
-rw-r--r--src/lib/crypto/krb/enc_old.c3
-rw-r--r--src/lib/crypto/krb/enc_raw.c3
-rw-r--r--src/lib/crypto/krb/encrypt_iov.c3
-rw-r--r--src/lib/crypto/krb/enctype_util.c8
-rw-r--r--src/lib/crypto/krb/keyblocks.c8
-rw-r--r--src/lib/crypto/krb/make_checksum_iov.c3
-rw-r--r--src/lib/crypto/krb/prf.c15
-rw-r--r--src/lib/crypto/krb/prf_cmac.c8
-rw-r--r--src/lib/crypto/krb/prf_des.c8
-rw-r--r--src/lib/crypto/krb/prf_dk.c8
-rw-r--r--src/lib/crypto/krb/prf_rc4.c4
-rw-r--r--src/lib/crypto/krb/prng_fortuna.c2
-rw-r--r--src/lib/crypto/krb/prng_nss.c3
-rw-r--r--src/lib/crypto/krb/prng_os.c2
-rw-r--r--src/lib/crypto/krb/state.c3
-rw-r--r--src/lib/crypto/krb/t_fortuna.c2
-rw-r--r--src/lib/crypto/krb/verify_checksum_iov.c3
31 files changed, 64 insertions, 108 deletions
diff --git a/src/lib/crypto/krb/aead.c b/src/lib/crypto/krb/aead.c
index 2bb341cb9..7bfed4b1e 100644
--- a/src/lib/crypto/krb/aead.c
+++ b/src/lib/crypto/krb/aead.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/krb/aead.c */
/*
- * lib/crypto/aead.c
- *
* Copyright 2008 by the Massachusetts Institute of Technology.
* All Rights Reserved.
*
diff --git a/src/lib/crypto/krb/cf2.c b/src/lib/crypto/krb/cf2.c
index 029916144..7c2e96512 100644
--- a/src/lib/crypto/krb/cf2.c
+++ b/src/lib/crypto/krb/cf2.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/krb/cf2.c */
/*
- * lib/crypto/cf2.c
- *
* Copyright (C) 2009 by the Massachusetts Institute of Technology.
* All rights reserved.
*
@@ -23,12 +22,11 @@
* M.I.T. makes no representations about the suitability of
* this software for any purpose. It is provided "as is" without express
* or implied warranty.
- *
- *
- *
- * Implement KRB_FX_CF2 function per
- *draft-ietf-krb-wg-preauth-framework-09. Take two keys and two
- *pepper strings as input and return a combined key.
+ */
+
+/*
+ * Implement KRB_FX_CF2 function per draft-ietf-krb-wg-preauth-framework-09.
+ * Take two keys and two pepper strings as input and return a combined key.
*/
#include "crypto_int.h"
diff --git a/src/lib/crypto/krb/checksum_cbc.c b/src/lib/crypto/krb/checksum_cbc.c
index 3a8c0bc62..48afeb0e5 100644
--- a/src/lib/crypto/krb/checksum_cbc.c
+++ b/src/lib/crypto/krb/checksum_cbc.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/krb/checksum_cbc.c */
/*
- * lib/crypto/krb/checksum/cbc.c
- *
* Copyright (C) 2009 by the Massachusetts Institute of Technology.
* All rights reserved.
*
@@ -23,11 +22,11 @@
* M.I.T. makes no representations about the suitability of
* this software for any purpose. It is provided "as is" without express
* or implied warranty.
- *
- * CBC checksum, which computes the ivec resulting from CBC encryption of the
- * input.
*/
+/* CBC checksum, which computes the ivec resulting from CBC encryption of the
+ * input. */
+
#include "crypto_int.h"
krb5_error_code
diff --git a/src/lib/crypto/krb/checksum_confounder.c b/src/lib/crypto/krb/checksum_confounder.c
index 7006043b8..3d8cd0874 100644
--- a/src/lib/crypto/krb/checksum_confounder.c
+++ b/src/lib/crypto/krb/checksum_confounder.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/krb/checksum_confounder.c */
/*
- * lib/crypto/krb/checksum/confounder.c
- *
* Copyright (C) 2009 by the Massachusetts Institute of Technology.
* All rights reserved.
*
@@ -23,7 +22,9 @@
* M.I.T. makes no representations about the suitability of
* this software for any purpose. It is provided "as is" without express
* or implied warranty.
- *
+ */
+
+/*
* Confounder checksum implementation, using tokens of the form:
* enc(xorkey, confounder | hash(confounder | data))
* where xorkey is the key XOR'd with 0xf0 bytes.
diff --git a/src/lib/crypto/krb/checksum_dk_cmac.c b/src/lib/crypto/krb/checksum_dk_cmac.c
index 166b7c727..2e9a15ec8 100644
--- a/src/lib/crypto/krb/checksum_dk_cmac.c
+++ b/src/lib/crypto/krb/checksum_dk_cmac.c
@@ -1,6 +1,5 @@
+/* lib/crypto/krb/checksum_dk_cmac.c */
/*
- * lib/crypto/krb/dk/checksum_cmac.c
- *
* Copyright 2010 by the Massachusetts Institute of Technology.
* All Rights Reserved.
*
diff --git a/src/lib/crypto/krb/checksum_hmac_md5.c b/src/lib/crypto/krb/checksum_hmac_md5.c
index 4d0010a72..12d4c9d64 100644
--- a/src/lib/crypto/krb/checksum_hmac_md5.c
+++ b/src/lib/crypto/krb/checksum_hmac_md5.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/krb/checksum_hmac_md5.c */
/*
- * lib/crypto/krb/checksum/hmac_md5.c
- *
* Copyright (C) 2009 by the Massachusetts Institute of Technology.
* All rights reserved.
*
@@ -23,7 +22,9 @@
* M.I.T. makes no representations about the suitability of
* this software for any purpose. It is provided "as is" without express
* or implied warranty.
- *
+ */
+
+/*
* Microsoft HMAC-MD5 and MD5-HMAC checksums (see RFC 4757):
* HMAC(KS, hash(msusage || input))
* KS is HMAC(key, "signaturekey\0") for HMAC-MD5, or just the key for
diff --git a/src/lib/crypto/krb/checksum_unkeyed.c b/src/lib/crypto/krb/checksum_unkeyed.c
index cdbc492fa..ff4f2b46c 100644
--- a/src/lib/crypto/krb/checksum_unkeyed.c
+++ b/src/lib/crypto/krb/checksum_unkeyed.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/krb/checksum_unkeyed.c - Unkeyed checksum handler */
/*
- * lib/crypto/krb/checksum/unkeyed.c
- *
* Copyright (C) 2009 by the Massachusetts Institute of Technology.
* All rights reserved.
*
@@ -23,8 +22,6 @@
* M.I.T. makes no representations about the suitability of
* this software for any purpose. It is provided "as is" without express
* or implied warranty.
- *
- * Unkeyed hash checksum implementation.
*/
#include "crypto_int.h"
diff --git a/src/lib/crypto/krb/cmac.c b/src/lib/crypto/krb/cmac.c
index 3e9dfb14b..ba22ebdee 100644
--- a/src/lib/crypto/krb/cmac.c
+++ b/src/lib/crypto/krb/cmac.c
@@ -1,6 +1,5 @@
+/* lib/crypto/krb/cmac.c */
/*
- * lib/crypto/krb/checksum/cmac.c
- *
* Copyright 2010 by the Massachusetts Institute of Technology.
* All Rights Reserved.
*
diff --git a/src/lib/crypto/krb/combine_keys.c b/src/lib/crypto/krb/combine_keys.c
index d70e16f2a..d9235dd73 100644
--- a/src/lib/crypto/krb/combine_keys.c
+++ b/src/lib/crypto/krb/combine_keys.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* Copyright (c) 2002 Naval Research Laboratory (NRL/CCS) */
/*
- * Copyright (c) 2002 Naval Research Laboratory (NRL/CCS)
- *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the software,
@@ -10,7 +9,9 @@
* NRL ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION AND
* DISCLAIMS ANY LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER
* RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ */
+
+/*
* Key combination function.
*
* If Key1 and Key2 are two keys to be combined, the algorithm to combine
diff --git a/src/lib/crypto/krb/crc32.c b/src/lib/crypto/krb/crc32.c
index 39e3e3487..d3b1b7a13 100644
--- a/src/lib/crypto/krb/crc32.c
+++ b/src/lib/crypto/krb/crc32.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/krb/crc32.c */
/*
- * lib/crypto/crc32/crc.c
- *
* Copyright 1990, 2002 by the Massachusetts Institute of Technology.
* All Rights Reserved.
*
@@ -23,19 +22,19 @@
* M.I.T. makes no representations about the suitability of
* this software for any purpose. It is provided "as is" without express
* or implied warranty.
- *
- *
- * CRC-32/AUTODIN-II routines
*/
-
-#include "crypto_int.h"
-
-/* This table and block of comments are taken from code labeled: */
/*
* Copyright (C) 1986 Gary S. Brown. You may use this program, or
* code or tables extracted from it, as desired without restriction.
*/
+/*
+ *
+ * CRC-32/AUTODIN-II routines
+ */
+
+#include "crypto_int.h"
+
/* First, the polynomial itself and its table of feedback terms. The */
/* polynomial is */
/* X^32+X^26+X^23+X^22+X^16+X^12+X^11+X^10+X^8+X^7+X^5+X^4+X^2+X^1+X^0 */
diff --git a/src/lib/crypto/krb/crypto_length.c b/src/lib/crypto/krb/crypto_length.c
index 84c56cc9f..b33235dc4 100644
--- a/src/lib/crypto/krb/crypto_length.c
+++ b/src/lib/crypto/krb/crypto_length.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/krb/crypto_length.c */
/*
- * lib/crypto/crypto_length.c
- *
* Copyright 2008 by the Massachusetts Institute of Technology.
* All Rights Reserved.
*
diff --git a/src/lib/crypto/krb/decrypt_iov.c b/src/lib/crypto/krb/decrypt_iov.c
index 39844d42c..8d43e8ff6 100644
--- a/src/lib/crypto/krb/decrypt_iov.c
+++ b/src/lib/crypto/krb/decrypt_iov.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/krb/decrypt_iov.c */
/*
- * lib/crypto/encrypt_iov.c
- *
* Copyright 2008 by the Massachusetts Institute of Technology.
* All Rights Reserved.
*
diff --git a/src/lib/crypto/krb/enc_dk_cmac.c b/src/lib/crypto/krb/enc_dk_cmac.c
index f00b8edc9..2ec80bdd4 100644
--- a/src/lib/crypto/krb/enc_dk_cmac.c
+++ b/src/lib/crypto/krb/enc_dk_cmac.c
@@ -1,5 +1,5 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* lib/crypto/dk/dk_cmac.c - Derived-key enctype functions using CMAC */
+/* lib/crypto/krb/enc_dk_cmac.c - Derived-key enctype functions using CMAC */
/*
* Copyright 2008, 2009, 2010 by the Massachusetts Institute of Technology.
* All Rights Reserved.
diff --git a/src/lib/crypto/krb/enc_dk_hmac.c b/src/lib/crypto/krb/enc_dk_hmac.c
index 2e2163f69..217aa88f6 100644
--- a/src/lib/crypto/krb/enc_dk_hmac.c
+++ b/src/lib/crypto/krb/enc_dk_hmac.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/krb/enc_dk_hmac.c */
/*
- * lib/crypto/dk/dk_aead.c
- *
* Copyright 2008, 2009 by the Massachusetts Institute of Technology.
* All Rights Reserved.
*
diff --git a/src/lib/crypto/krb/enc_old.c b/src/lib/crypto/krb/enc_old.c
index 00ce609ec..f33cacb5c 100644
--- a/src/lib/crypto/krb/enc_old.c
+++ b/src/lib/crypto/krb/enc_old.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/krb/enc_old.c */
/*
- * lib/crypto/old/old_aead.c
- *
* Copyright 2008 by the Massachusetts Institute of Technology.
* All Rights Reserved.
*
diff --git a/src/lib/crypto/krb/enc_raw.c b/src/lib/crypto/krb/enc_raw.c
index 3364a7d0b..554d5c4d6 100644
--- a/src/lib/crypto/krb/enc_raw.c
+++ b/src/lib/crypto/krb/enc_raw.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/krb/enc_raw.c */
/*
- * lib/crypto/raw/raw_aead.c
- *
* Copyright 2008 by the Massachusetts Institute of Technology.
* All Rights Reserved.
*
diff --git a/src/lib/crypto/krb/encrypt_iov.c b/src/lib/crypto/krb/encrypt_iov.c
index 9f56c1f0b..d66fcfa52 100644
--- a/src/lib/crypto/krb/encrypt_iov.c
+++ b/src/lib/crypto/krb/encrypt_iov.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/krb/encrypt_iov.c */
/*
- * lib/crypto/encrypt_iov.c
- *
* Copyright 2008 by the Massachusetts Institute of Technology.
* All Rights Reserved.
*
diff --git a/src/lib/crypto/krb/enctype_util.c b/src/lib/crypto/krb/enctype_util.c
index 2641537fc..0ed74bd6e 100644
--- a/src/lib/crypto/krb/enctype_util.c
+++ b/src/lib/crypto/krb/enctype_util.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/krb/enctype_util.c */
/*
- * lib/crypto/krb/enctype_util.c
- *
* Copyright (C) 1998 by the FundsXpress, INC.
*
* All rights reserved.
@@ -25,8 +24,9 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- *
+ */
+
+/*
* krb5int_c_valid_enctype()
* krb5int_c_weak_enctype()
* krb5_c_enctype_compare()
diff --git a/src/lib/crypto/krb/keyblocks.c b/src/lib/crypto/krb/keyblocks.c
index b1ef6f2ac..21faa5631 100644
--- a/src/lib/crypto/krb/keyblocks.c
+++ b/src/lib/crypto/krb/keyblocks.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/krb/keyblocks.c - Keyblock utility functions */
/*
- * lib/crypto/keyblocks.c
- *
* Copyright (C) 2002, 2005 by the Massachusetts Institute of Technology.
* All rights reserved.
*
@@ -23,11 +22,6 @@
* M.I.T. makes no representations about the suitability of
* this software for any purpose. It is provided "as is" without express
* or implied warranty.
- *
- *
- *
- * krb5_init_keyblock- a function to set up
- * an empty keyblock
*/
#include "crypto_int.h"
diff --git a/src/lib/crypto/krb/make_checksum_iov.c b/src/lib/crypto/krb/make_checksum_iov.c
index 1c54077fc..549180df5 100644
--- a/src/lib/crypto/krb/make_checksum_iov.c
+++ b/src/lib/crypto/krb/make_checksum_iov.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/krb/make_checksum_iov.c */
/*
- * lib/crypto/make_checksum_iov.c
- *
* Copyright 2008 by the Massachusetts Institute of Technology.
* All Rights Reserved.
*
diff --git a/src/lib/crypto/krb/prf.c b/src/lib/crypto/krb/prf.c
index a315c42a1..67b856a9b 100644
--- a/src/lib/crypto/krb/prf.c
+++ b/src/lib/crypto/krb/prf.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/krb/prf.c */
/*
- * lib/crypto/prf.c
- *
* Copyright (C) 2004 by the Massachusetts Institute of Technology.
* All rights reserved.
*
@@ -23,12 +22,12 @@
* M.I.T. makes no representations about the suitability of
* this software for any purpose. It is provided "as is" without express
* or implied warranty.
- *
- *
- *
- * This contains the implementation of krb5_c_prf, which will find
- *the enctype-specific PRF and then generate pseudo-random data. This
- *function yields krb5_c_prf_length bytes of output.
+ */
+
+/*
+ * This contains the implementation of krb5_c_prf, which will find the
+ * enctype-specific PRF and then generate pseudo-random data. This function
+ * yields krb5_c_prf_length bytes of output.
*/
#include "crypto_int.h"
diff --git a/src/lib/crypto/krb/prf_cmac.c b/src/lib/crypto/krb/prf_cmac.c
index 0a02bf1ea..d3e71617d 100644
--- a/src/lib/crypto/krb/prf_cmac.c
+++ b/src/lib/crypto/krb/prf_cmac.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/krb/prf_cmac.c - CMAC-based PRF */
/*
- * lib/crypto/krb/prf/cmac_prf.c
- *
* Copyright (C) 2010 by the Massachusetts Institute of Technology.
* All rights reserved.
*
@@ -23,11 +22,6 @@
* M.I.T. makes no representations about the suitability of
* this software for any purpose. It is provided "as is" without express
* or implied warranty.
- *
- *
- *
- * This file contains an implementation of the RFC 3961 PRF for
- *simplified profile enctypes.
*/
#include "crypto_int.h"
diff --git a/src/lib/crypto/krb/prf_des.c b/src/lib/crypto/krb/prf_des.c
index 3bb420b57..7a2d719c5 100644
--- a/src/lib/crypto/krb/prf_des.c
+++ b/src/lib/crypto/krb/prf_des.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/krb/prf_des.c - RFC 3961 DES-based PRF */
/*
- * lib/crypto/krb/prf//des_prf.c
- *
* Copyright (C) 2004, 2009 by the Massachusetts Institute of Technology.
* All rights reserved.
*
@@ -23,11 +22,6 @@
* M.I.T. makes no representations about the suitability of
* this software for any purpose. It is provided "as is" without express
* or implied warranty.
- *
- *
- *
- * This file contains an implementation of the RFC 3961 PRF for
- * des-cbc-crc, des-cbc-md4, and des-cbc-md5 enctypes.
*/
#include "crypto_int.h"
diff --git a/src/lib/crypto/krb/prf_dk.c b/src/lib/crypto/krb/prf_dk.c
index b6e69988c..bf8d5223b 100644
--- a/src/lib/crypto/krb/prf_dk.c
+++ b/src/lib/crypto/krb/prf_dk.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/krb/prf_dk.c - RFC 3961 simplified profile PRF */
/*
- * lib/crypto/krb/prf/dk_prf.c
- *
* Copyright (C) 2004 by the Massachusetts Institute of Technology.
* All rights reserved.
*
@@ -23,11 +22,6 @@
* M.I.T. makes no representations about the suitability of
* this software for any purpose. It is provided "as is" without express
* or implied warranty.
- *
- *
- *
- * This file contains an implementation of the RFC 3961 PRF for
- *simplified profile enctypes.
*/
#include "crypto_int.h"
diff --git a/src/lib/crypto/krb/prf_rc4.c b/src/lib/crypto/krb/prf_rc4.c
index be54f361f..092795321 100644
--- a/src/lib/crypto/krb/prf_rc4.c
+++ b/src/lib/crypto/krb/prf_rc4.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/krb/prf_rc4.c */
/*
- * lib/crypto/krb/prf/rc4_prf.c
- *
* Copyright (C) 2009 by the Massachusetts Institute of Technology.
* All rights reserved.
*
@@ -23,7 +22,6 @@
* M.I.T. makes no representations about the suitability of
* this software for any purpose. It is provided "as is" without express
* or implied warranty.
- *
*/
#include "crypto_int.h"
diff --git a/src/lib/crypto/krb/prng_fortuna.c b/src/lib/crypto/krb/prng_fortuna.c
index cdc5acf15..f559df75e 100644
--- a/src/lib/crypto/krb/prng_fortuna.c
+++ b/src/lib/crypto/krb/prng_fortuna.c
@@ -1,5 +1,5 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* lib/crypto/krb/prng/fortuna/prng_fortuna.c - Fortuna PRNG implementation */
+/* lib/crypto/krb/prng_fortuna.c - Fortuna PRNG implementation */
/*
* Copyright (c) 2005 Marko Kreen
* All rights reserved.
diff --git a/src/lib/crypto/krb/prng_nss.c b/src/lib/crypto/krb/prng_nss.c
index 905b24dd3..a304054bf 100644
--- a/src/lib/crypto/krb/prng_nss.c
+++ b/src/lib/crypto/krb/prng_nss.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/krb/prng_nss.c */
/*
- * prng_nss.c
- *
* Copyright (C) 2010 by the Massachusetts Institute of Technology.
* All rights reserved.
*
diff --git a/src/lib/crypto/krb/prng_os.c b/src/lib/crypto/krb/prng_os.c
index 51af17be9..fa6204e28 100644
--- a/src/lib/crypto/krb/prng_os.c
+++ b/src/lib/crypto/krb/prng_os.c
@@ -1,5 +1,5 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* lib/crypto/krb/prng/fortuna/prng_os.c - OS-native PRNG implementation */
+/* lib/crypto/krb/prng_os.c - OS-native PRNG implementation */
/*
* Copyright (C) 2011 by the Massachusetts Institute of Technology.
* All rights reserved.
diff --git a/src/lib/crypto/krb/state.c b/src/lib/crypto/krb/state.c
index 85327de03..a7fb020b2 100644
--- a/src/lib/crypto/krb/state.c
+++ b/src/lib/crypto/krb/state.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/krb/state.c */
/*
- * lib/crypto/state.c
- *
* Copyright (C) 2001 by the Massachusetts Institute of Technology.
* All rights reserved.
*
diff --git a/src/lib/crypto/krb/t_fortuna.c b/src/lib/crypto/krb/t_fortuna.c
index 14149b9d2..561e99009 100644
--- a/src/lib/crypto/krb/t_fortuna.c
+++ b/src/lib/crypto/krb/t_fortuna.c
@@ -1,5 +1,5 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* lib/crypto/krb/prng/fortuna/t_fortuna.c - Fortuna test program */
+/* lib/crypto/krb/t_fortuna.c - Fortuna test program */
/*
* Copyright (c) 2007 Kungliga Tekniska Högskolan
* (Royal Institute of Technology, Stockholm, Sweden).
diff --git a/src/lib/crypto/krb/verify_checksum_iov.c b/src/lib/crypto/krb/verify_checksum_iov.c
index da8f487bf..efa2adcaa 100644
--- a/src/lib/crypto/krb/verify_checksum_iov.c
+++ b/src/lib/crypto/krb/verify_checksum_iov.c
@@ -1,7 +1,6 @@
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/crypto/krb/verify_checksum_iov.c */
/*
- * lib/crypto/verify_checksum_iov.c
- *
* Copyright 2008 by the Massachusetts Institute of Technology.
* All Rights Reserved.
*