diff options
| author | Greg Hudson <ghudson@mit.edu> | 2011-03-09 21:46:07 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2011-03-09 21:46:07 +0000 |
| commit | 7da53e2942176c5ddfe007ba0a36f449e9fdb9fb (patch) | |
| tree | 4881536c48fdeb215e0cbaea18263365330ad9b0 /src/lib | |
| parent | fe012b454a193c1f81ab8011ecd620750e5869f0 (diff) | |
| download | krb5-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')
422 files changed, 1328 insertions, 2178 deletions
diff --git a/src/lib/apputils/daemon.c b/src/lib/apputils/daemon.c index f0843961b..a3d7cd737 100644 --- a/src/lib/apputils/daemon.c +++ b/src/lib/apputils/daemon.c @@ -1,5 +1,5 @@ /* -*- mode: c; c-file-style: "bsd"; indent-tabs-mode: t -*- */ -/*- +/* * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. * diff --git a/src/lib/apputils/net-server.c b/src/lib/apputils/net-server.c index 2439f2c93..abb94dd91 100644 --- a/src/lib/apputils/net-server.c +++ b/src/lib/apputils/net-server.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/apputils/net-server.c - Network code for krb5 servers (kdc, kadmind) */ /* - * lib/apputils/net-server.c - * * Copyright 1990,2000,2007,2008,2009,2010 by the Massachusetts Institute of Technology. * * Export of this software from the United States of America may @@ -22,9 +21,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. - * - * - * Network code for Kerberos v5 servers (kdc, kadmind). */ #include "k5-int.h" diff --git a/src/lib/crypto/builtin/aes/aes.h b/src/lib/crypto/builtin/aes/aes.h index 6009b986a..762190463 100644 --- a/src/lib/crypto/builtin/aes/aes.h +++ b/src/lib/crypto/builtin/aes/aes.h @@ -1,33 +1,34 @@ /* - ------------------------------------------------------------------------- - Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK. - All rights reserved. + * Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK. + * All rights reserved. + * + * LICENSE TERMS + * + * The free distribution and use of this software in both source and binary + * form is allowed (with or without changes) provided that: + * + * 1. distributions of this source code include the above copyright + * notice, this list of conditions and the following disclaimer; + * + * 2. distributions in binary form include the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other associated materials; + * + * 3. the copyright holder's name is not used to endorse products + * built using this software without specific written permission. + * + * DISCLAIMER + * + * This software is provided 'as is' with no explcit or implied warranties + * in respect of any properties, including, but not limited to, correctness + * and fitness for purpose. + */ - LICENSE TERMS - - The free distribution and use of this software in both source and binary - form is allowed (with or without changes) provided that: - - 1. distributions of this source code include the above copyright - notice, this list of conditions and the following disclaimer; - - 2. distributions in binary form include the above copyright - notice, this list of conditions and the following disclaimer - in the documentation and/or other associated materials; - - 3. the copyright holder's name is not used to endorse products - built using this software without specific written permission. - - DISCLAIMER - - This software is provided 'as is' with no explcit or implied warranties - in respect of any properties, including, but not limited to, correctness - and fitness for purpose. - ------------------------------------------------------------------------- - Issue Date: 21/01/2002 - - This file contains the definitions required to use AES (Rijndael) in C. -*/ +/* + * Issue Date: 21/01/2002 + * + * This file contains the definitions required to use AES (Rijndael) in C. + */ #ifndef _AES_H #define _AES_H diff --git a/src/lib/crypto/builtin/aes/aescpp.h b/src/lib/crypto/builtin/aes/aescpp.h index c81dfa6d1..d556224e4 100644 --- a/src/lib/crypto/builtin/aes/aescpp.h +++ b/src/lib/crypto/builtin/aes/aescpp.h @@ -1,31 +1,32 @@ /* - ------------------------------------------------------------------------- - Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK. - All rights reserved. + * Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK. + * All rights reserved. + * + * TERMS + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted subject to the following conditions: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 3. The copyright holder's name must not be used to endorse or promote + * any products derived from this software without his specific prior + * written permission. + * + * This software is provided 'as is' with no express or implied warranties + * of correctness or fitness for purpose. + */ - TERMS - - Redistribution and use in source and binary forms, with or without - modification, are permitted subject to the following conditions: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. The copyright holder's name must not be used to endorse or promote - any products derived from this software without his specific prior - written permission. - - This software is provided 'as is' with no express or implied warranties - of correctness or fitness for purpose. - ------------------------------------------------------------------------- - Issue Date: 21/01/2002 - - This file contains the definitions required to use AES (Rijndael) in C++. -*/ +/* + * Issue Date: 21/01/2002 + * + * This file contains the definitions required to use AES (Rijndael) in C++. + */ #ifndef _AESCPP_H #define _AESCPP_H diff --git a/src/lib/crypto/builtin/aes/aescrypp.c b/src/lib/crypto/builtin/aes/aescrypp.c index c1608df2a..1f1cf638e 100644 --- a/src/lib/crypto/builtin/aes/aescrypp.c +++ b/src/lib/crypto/builtin/aes/aescrypp.c @@ -1,35 +1,36 @@ /* - ------------------------------------------------------------------------- - Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK. - All rights reserved. - - LICENSE TERMS - - The free distribution and use of this software in both source and binary - form is allowed (with or without changes) provided that: - - 1. distributions of this source code include the above copyright - notice, this list of conditions and the following disclaimer; - - 2. distributions in binary form include the above copyright - notice, this list of conditions and the following disclaimer - in the documentation and/or other associated materials; - - 3. the copyright holder's name is not used to endorse products - built using this software without specific written permission. - - DISCLAIMER - - This software is provided 'as is' with no explcit or implied warranties - in respect of any properties, including, but not limited to, correctness - and fitness for purpose. - ------------------------------------------------------------------------- - Issue Date: 21/01/2002 + * Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK. + * All rights reserved. + * + * LICENSE TERMS + * + * The free distribution and use of this software in both source and binary + * form is allowed (with or without changes) provided that: + * + * 1. distributions of this source code include the above copyright + * notice, this list of conditions and the following disclaimer; + * + * 2. distributions in binary form include the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other associated materials; + * + * 3. the copyright holder's name is not used to endorse products + * built using this software without specific written permission. + * + * DISCLAIMER + * + * This software is provided 'as is' with no explcit or implied warranties + * in respect of any properties, including, but not limited to, correctness + * and fitness for purpose. + */ - This file contains the code for implementing encryption and decryption - for AES (Rijndael) for block and key sizes of 16, 20, 24, 28 and 32 bytes. - It can optionally be replaced by code written in assembler using NASM. -*/ +/* + * Issue Date: 21/01/2002 + * + * This file contains the code for implementing encryption and decryption + * for AES (Rijndael) for block and key sizes of 16, 20, 24, 28 and 32 bytes. + * It can optionally be replaced by code written in assembler using NASM. + */ #include "aesopt.h" diff --git a/src/lib/crypto/builtin/aes/aescrypt.c b/src/lib/crypto/builtin/aes/aescrypt.c index 2704b89cd..194f8e54d 100644 --- a/src/lib/crypto/builtin/aes/aescrypt.c +++ b/src/lib/crypto/builtin/aes/aescrypt.c @@ -1,34 +1,35 @@ /* - ------------------------------------------------------------------------- - Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK. - All rights reserved. - - LICENSE TERMS - - The free distribution and use of this software in both source and binary - form is allowed (with or without changes) provided that: - - 1. distributions of this source code include the above copyright - notice, this list of conditions and the following disclaimer; - - 2. distributions in binary form include the above copyright - notice, this list of conditions and the following disclaimer - in the documentation and/or other associated materials; - - 3. the copyright holder's name is not used to endorse products - built using this software without specific written permission. - - DISCLAIMER - - This software is provided 'as is' with no explcit or implied warranties - in respect of any properties, including, but not limited to, correctness - and fitness for purpose. - ------------------------------------------------------------------------- - Issue Date: 21/01/2002 + * Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK. + * All rights reserved. + * + * LICENSE TERMS + * + * The free distribution and use of this software in both source and binary + * form is allowed (with or without changes) provided that: + * + * 1. distributions of this source code include the above copyright + * notice, this list of conditions and the following disclaimer; + * + * 2. distributions in binary form include the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other associated materials; + * + * 3. the copyright holder's name is not used to endorse products + * built using this software without specific written permission. + * + * DISCLAIMER + * + * This software is provided 'as is' with no explcit or implied warranties + * in respect of any properties, including, but not limited to, correctness + * and fitness for purpose. + */ - This file contains the code for implementing encryption and decryption - for AES (Rijndael) for block and key sizes of 16, 24 and 32 bytes. It - can optionally be replaced by code written in assembler using NASM. +/* + * Issue Date: 21/01/2002 + * + * This file contains the code for implementing encryption and decryption + * for AES (Rijndael) for block and key sizes of 16, 24 and 32 bytes. It + * can optionally be replaced by code written in assembler using NASM. */ #include "aesopt.h" diff --git a/src/lib/crypto/builtin/aes/aeskey.c b/src/lib/crypto/builtin/aes/aeskey.c index 36b6404b1..8402b50cf 100644 --- a/src/lib/crypto/builtin/aes/aeskey.c +++ b/src/lib/crypto/builtin/aes/aeskey.c @@ -1,34 +1,35 @@ /* - ------------------------------------------------------------------------- - Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK. - All rights reserved. + * Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK. + * All rights reserved. + * + * LICENSE TERMS + * + * The free distribution and use of this software in both source and binary + * form is allowed (with or without changes) provided that: + * + * 1. distributions of this source code include the above copyright + * notice, this list of conditions and the following disclaimer; + * + * 2. distributions in binary form include the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other associated materials; + * + * 3. the copyright holder's name is not used to endorse products + * built using this software without specific written permission. + * + * DISCLAIMER + * + * This software is provided 'as is' with no explcit or implied warranties + * in respect of any properties, including, but not limited to, correctness + * and fitness for purpose. + */ - LICENSE TERMS - - The free distribution and use of this software in both source and binary - form is allowed (with or without changes) provided that: - - 1. distributions of this source code include the above copyright - notice, this list of conditions and the following disclaimer; - - 2. distributions in binary form include the above copyright - notice, this list of conditions and the following disclaimer - in the documentation and/or other associated materials; - - 3. the copyright holder's name is not used to endorse products - built using this software without specific written permission. - - DISCLAIMER - - This software is provided 'as is' with no explcit or implied warranties - in respect of any properties, including, but not limited to, correctness - and fitness for purpose. - ------------------------------------------------------------------------- - Issue Date: 21/01/2002 - - This file contains the code for implementing the key schedule for AES - (Rijndael) for block and key sizes of 16, 24, and 32 bytes. -*/ +/* + * Issue Date: 21/01/2002 + * + * This file contains the code for implementing the key schedule for AES + * (Rijndael) for block and key sizes of 16, 24, and 32 bytes. + */ #include "aesopt.h" diff --git a/src/lib/crypto/builtin/aes/aeskeypp.c b/src/lib/crypto/builtin/aes/aeskeypp.c index 589d7a392..cd9c5a7a4 100644 --- a/src/lib/crypto/builtin/aes/aeskeypp.c +++ b/src/lib/crypto/builtin/aes/aeskeypp.c @@ -1,34 +1,35 @@ /* - ------------------------------------------------------------------------- - Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK. - All rights reserved. - - LICENSE TERMS - - The free distribution and use of this software in both source and binary - form is allowed (with or without changes) provided that: - - 1. distributions of this source code include the above copyright - notice, this list of conditions and the following disclaimer; - - 2. distributions in binary form include the above copyright - notice, this list of conditions and the following disclaimer - in the documentation and/or other associated materials; - - 3. the copyright holder's name is not used to endorse products - built using this software without specific written permission. - - DISCLAIMER - - This software is provided 'as is' with no explcit or implied warranties - in respect of any properties, including, but not limited to, correctness - and fitness for purpose. - ------------------------------------------------------------------------- - Issue Date: 21/01/2002 + * Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK. + * All rights reserved. + * + * LICENSE TERMS + * + * The free distribution and use of this software in both source and binary + * form is allowed (with or without changes) provided that: + * + * 1. distributions of this source code include the above copyright + * notice, this list of conditions and the following disclaimer; + * + * 2. distributions in binary form include the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other associated materials; + * + * 3. the copyright holder's name is not used to endorse products + * built using this software without specific written permission. + * + * DISCLAIMER + * + * This software is provided 'as is' with no explcit or implied warranties + * in respect of any properties, including, but not limited to, correctness + * and fitness for purpose. + */ - This file contains the code for implementing the key schedule for AES - (Rijndael) for block and key sizes of 16, 20, 24, 28 and 32 bytes. -*/ +/* + * Issue Date: 21/01/2002 + * + * This file contains the code for implementing the key schedule for AES + * (Rijndael) for block and key sizes of 16, 20, 24, 28 and 32 bytes. + */ #include "aesopt.h" diff --git a/src/lib/crypto/builtin/aes/aesopt.h b/src/lib/crypto/builtin/aes/aesopt.h index ede89f653..6588b7fc8 100644 --- a/src/lib/crypto/builtin/aes/aesopt.h +++ b/src/lib/crypto/builtin/aes/aesopt.h @@ -1,29 +1,30 @@ /* - ------------------------------------------------------------------------- - Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK. - All rights reserved. - - LICENSE TERMS - - The free distribution and use of this software in both source and binary - form is allowed (with or without changes) provided that: - - 1. distributions of this source code include the above copyright - notice, this list of conditions and the following disclaimer; - - 2. distributions in binary form include the above copyright - notice, this list of conditions and the following disclaimer - in the documentation and/or other associated materials; - - 3. the copyright holder's name is not used to endorse products - built using this software without specific written permission. - - DISCLAIMER + * Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK. + * All rights reserved. + * + * LICENSE TERMS + * + * The free distribution and use of this software in both source and binary + * form is allowed (with or without changes) provided that: + * + * 1. distributions of this source code include the above copyright + * notice, this list of conditions and the following disclaimer; + * + * 2. distributions in binary form include the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other associated materials; + * + * 3. the copyright holder's name is not used to endorse products + * built using this software without specific written permission. + * + * DISCLAIMER + * + * This software is provided 'as is' with no explcit or implied warranties + * in respect of any properties, including, but not limited to, correctness + * and fitness for purpose. + */ - This software is provided 'as is' with no explcit or implied warranties - in respect of any properties, including, but not limited to, correctness - and fitness for purpose. - ------------------------------------------------------------------------- +/* Issue Date: 07/02/2002 This file contains the compilation options for AES (Rijndael) and code diff --git a/src/lib/crypto/builtin/aes/aestab.c b/src/lib/crypto/builtin/aes/aestab.c index 790288746..ef182d641 100644 --- a/src/lib/crypto/builtin/aes/aestab.c +++ b/src/lib/crypto/builtin/aes/aestab.c @@ -1,31 +1,30 @@ /* - ------------------------------------------------------------------------- - Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK. - All rights reserved. - - LICENSE TERMS - - The free distribution and use of this software in both source and binary - form is allowed (with or without changes) provided that: - - 1. distributions of this source code include the above copyright - notice, this list of conditions and the following disclaimer; - - 2. distributions in binary form include the above copyright - notice, this list of conditions and the following disclaimer - in the documentation and/or other associated materials; - - 3. the copyright holder's name is not used to endorse products - built using this software without specific written permission. - - DISCLAIMER - - This software is provided 'as is' with no explcit or implied warranties - in respect of any properties, including, but not limited to, correctness - and fitness for purpose. - ------------------------------------------------------------------------- - Issue Date: 07/02/2002 -*/ + * Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK. + * All rights reserved. + * + * LICENSE TERMS + * + * The free distribution and use of this software in both source and binary + * form is allowed (with or without changes) provided that: + * + * 1. distributions of this source code include the above copyright + * notice, this list of conditions and the following disclaimer; + * + * 2. distributions in binary form include the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other associated materials; + * + * 3. the copyright holder's name is not used to endorse products + * built using this software without specific written permission. + * + * DISCLAIMER + * + * This software is provided 'as is' with no explcit or implied warranties + * in respect of any properties, including, but not limited to, correctness + * and fitness for purpose. + */ + +/* Issue Date: 07/02/2002 */ #include "aesopt.h" diff --git a/src/lib/crypto/builtin/aes/uitypes.h b/src/lib/crypto/builtin/aes/uitypes.h index fe8f9bacf..563139f66 100644 --- a/src/lib/crypto/builtin/aes/uitypes.h +++ b/src/lib/crypto/builtin/aes/uitypes.h @@ -1,34 +1,35 @@ /* - ------------------------------------------------------------------------- - Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK. - All rights reserved. + * Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK. + * All rights reserved. + * + * LICENSE TERMS + * + * The free distribution and use of this software in both source and binary + * form is allowed (with or without changes) provided that: + * + * 1. distributions of this source code include the above copyright + * notice, this list of conditions and the following disclaimer; + * + * 2. distributions in binary form include the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other associated materials; + * + * 3. the copyright holder's name is not used to endorse products + * built using this software without specific written permission. + * + * DISCLAIMER + * + * This software is provided 'as is' with no explcit or implied warranties + * in respect of any properties, including, but not limited to, correctness + * and fitness for purpose. + */ - LICENSE TERMS - - The free distribution and use of this software in both source and binary - form is allowed (with or without changes) provided that: - - 1. distributions of this source code include the above copyright - notice, this list of conditions and the following disclaimer; - - 2. distributions in binary form include the above copyright - notice, this list of conditions and the following disclaimer - in the documentation and/or other associated materials; - - 3. the copyright holder's name is not used to endorse products - built using this software without specific written permission. - - DISCLAIMER - - This software is provided 'as is' with no explcit or implied warranties - in respect of any properties, including, but not limited to, correctness - and fitness for purpose. - ------------------------------------------------------------------------- - Issue Date: 01/02/2002 - - This file contains code to obtain or set the definitions for fixed length - unsigned integer types. -*/ +/* + * Issue Date: 01/02/2002 + * + * This file contains code to obtain or set the definitions for fixed length + * unsigned integer types. + */ #ifndef _UITYPES_H #define _UITYPES_H diff --git a/src/lib/crypto/builtin/camellia/camellia.c b/src/lib/crypto/builtin/camellia/camellia.c index 30998d043..222b66215 100644 --- a/src/lib/crypto/builtin/camellia/camellia.c +++ b/src/lib/crypto/builtin/camellia/camellia.c @@ -1,5 +1,5 @@ -/* camellia.c ver 1.2.0 - * +/* lib/crypto/builtin/camellia/camellia.c - Camellia version 1.2.0 */ +/* * Copyright (c) 2006,2007,2009 * NTT (Nippon Telegraph and Telephone Corporation) . All rights reserved. * diff --git a/src/lib/crypto/builtin/camellia/camellia.h b/src/lib/crypto/builtin/camellia/camellia.h index a2afc62ea..1e59a2ecb 100644 --- a/src/lib/crypto/builtin/camellia/camellia.h +++ b/src/lib/crypto/builtin/camellia/camellia.h @@ -1,5 +1,5 @@ -/* camellia.h ver 1.2.0 - * +/* lib/crypto/builtin/camellia/camellia.h - Camellia version 1.2.0 */ +/* * Copyright (c) 2006,2007,2009 * NTT (Nippon Telegraph and Telephone Corporation) . All rights reserved. * diff --git a/src/lib/crypto/builtin/des/afsstring2key.c b/src/lib/crypto/builtin/des/afsstring2key.c index 701b50a0f..03fbaba26 100644 --- a/src/lib/crypto/builtin/des/afsstring2key.c +++ b/src/lib/crypto/builtin/des/afsstring2key.c @@ -1,15 +1,7 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/builtin/des/afsstring2key.c */ /* - * lib/crypto/des/string2key.c - * - * based on lib/crypto/des/string2key.c from MIT V5 - * and on lib/des/afs_string_to_key.c from UMD. - * constructed by Mark Eichin, Cygnus Support, 1995. - * made thread-safe by Ken Raeburn, MIT, 2001. - */ - -/* - * Copyright 2001 by the Massachusetts Institute of Technology. + * Copyright 1989, 2001 by the Massachusetts Institute of Technology. * All Rights Reserved. * * Export of this software from the United States of America may @@ -31,7 +23,6 @@ * this software for any purpose. It is provided "as is" without express * or implied warranty. */ - /* * Copyright (C) 1998 by the FundsXpress, INC. * @@ -57,6 +48,34 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +/* + * Copyright (c) 1990 Regents of The University of Michigan. + * All Rights Reserved. + * + * Permission to use, copy, modify, and distribute this software + * and its documentation for any purpose and without fee is hereby + * granted, provided that the above copyright notice appears in all + * copies and that both that copyright notice and this permission + * notice appear in supporting documentation, and that the name of + * The University of Michigan not be used in advertising or + * publicity pertaining to distribution of the software without + * specific, written prior permission. This software is supplied as + * is without expressed or implied warranties of any kind. + * + * ITD Research Systems + * University of Michigan + * 535 W. William Street + * Ann Arbor, Michigan + * +1-313-936-2652 + * netatalk@terminator.cc.umich.edu + */ + +/* + * based on lib/crypto/des/string2key.c from MIT V5 + * and on lib/des/afs_string_to_key.c from UMD. + * constructed by Mark Eichin, Cygnus Support, 1995. + * made thread-safe by Ken Raeburn, MIT, 2001. + */ #include "crypto_int.h" #include "des_int.h" @@ -159,33 +178,6 @@ mit_afs_string_to_key(krb5_keyblock *keyblock, const krb5_data *data, return 0; } - -/* Portions of this code: - Copyright 1989 by the Massachusetts Institute of Technology -*/ - -/* - * Copyright (c) 1990 Regents of The University of Michigan. - * All Rights Reserved. - * - * Permission to use, copy, modify, and distribute this software - * and its documentation for any purpose and without fee is hereby - * granted, provided that the above copyright notice appears in all - * copies and that both that copyright notice and this permission - * notice appear in supporting documentation, and that the name of - * The University of Michigan not be used in advertising or - * publicity pertaining to distribution of the software without - * specific, written prior permission. This software is supplied as - * is without expressed or implied warranties of any kind. - * - * ITD Research Systems - * University of Michigan - * 535 W. William Street - * Ann Arbor, Michigan - * +1-313-936-2652 - * netatalk@terminator.cc.umich.edu - */ - static void krb5_afs_crypt_setkey (char*, char*, char(*)[48]); static void krb5_afs_encrypt (char*,char*,char (*)[48]); diff --git a/src/lib/crypto/builtin/des/des_int.h b/src/lib/crypto/builtin/des/des_int.h index d3a7cc960..8519ad1a0 100644 --- a/src/lib/crypto/builtin/des/des_int.h +++ b/src/lib/crypto/builtin/des/des_int.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/builtin/des/des_int.h */ /* - * lib/crypto/des/des_int.h - * * Copyright 1987, 1988, 1990, 2002 by the Massachusetts Institute of * Technology. All Rights Reserved. * @@ -23,11 +22,7 @@ * 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. - * - * - * Private include file for the Data Encryption Standard library. */ - /* * Copyright (C) 1998 by the FundsXpress, INC. * @@ -54,6 +49,8 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +/* Private include file for the Data Encryption Standard library. */ + /* only do the whole thing once */ #ifndef DES_INTERNAL_DEFS #define DES_INTERNAL_DEFS diff --git a/src/lib/crypto/builtin/des/destest.c b/src/lib/crypto/builtin/des/destest.c index 0af9654ce..85d37f634 100644 --- a/src/lib/crypto/builtin/des/destest.c +++ b/src/lib/crypto/builtin/des/destest.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/builtin/des/destest.c */ /* - * lib/crypto/des/destest.c - * * Copyright 1990,1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +22,7 @@ * 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. - * - * - * Test a DES implementation against known inputs & outputs */ - - /* * Copyright (C) 1998 by the FundsXpress, INC. * @@ -55,6 +49,8 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +/* Test a DES implementation against known inputs & outputs. */ + #include "des_int.h" #include "crypto_int.h" #include <stdio.h> diff --git a/src/lib/crypto/builtin/des/f_cbc.c b/src/lib/crypto/builtin/des/f_cbc.c index 887740bc1..84d5382f2 100644 --- a/src/lib/crypto/builtin/des/f_cbc.c +++ b/src/lib/crypto/builtin/des/f_cbc.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/builtin/des/f_cbc.c */ /* - * lib/crypto/des/f_cbc.c - * * Copyright (C) 1990 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. - * + */ + +/* * CBC functions; used only by the test programs at this time. (krb5 uses the * functions in f_aead.c instead.) */ diff --git a/src/lib/crypto/builtin/des/f_cksum.c b/src/lib/crypto/builtin/des/f_cksum.c index 09ac4a026..4492ce6df 100644 --- a/src/lib/crypto/builtin/des/f_cksum.c +++ b/src/lib/crypto/builtin/des/f_cksum.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/builtin/des/f_cksum.c */ /* - * lib/crypto/des/f_cksum.c - * * Copyright (C) 1990 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,10 +22,10 @@ * 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. - * - * DES implementation donated by Dennis Ferguson */ +/* DES implementation donated by Dennis Ferguson */ + /* * des_cbc_cksum.c - compute an 8 byte checksum using DES in CBC mode */ diff --git a/src/lib/crypto/builtin/des/f_sched.c b/src/lib/crypto/builtin/des/f_sched.c index af9d66b28..89d820f45 100644 --- a/src/lib/crypto/builtin/des/f_sched.c +++ b/src/lib/crypto/builtin/des/f_sched.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/builtin/des/f_sched.c */ /* - * lib/crypto/des/f_sched.c - * * Copyright (C) 1990 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,10 +22,10 @@ * 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. - * - * DES implementation donated by Dennis Ferguson */ +/* DES implementation donated by Dennis Ferguson */ + /* * des_make_sched.c - permute a DES key, returning the resulting key schedule */ diff --git a/src/lib/crypto/builtin/des/f_tables.c b/src/lib/crypto/builtin/des/f_tables.c index 9470b2b97..6308cb0d5 100644 --- a/src/lib/crypto/builtin/des/f_tables.c +++ b/src/lib/crypto/builtin/des/f_tables.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/builtin/des/f_tables.c */ /* - * lib/crypto/des/f_tables.c - * * Copyright (C) 1990 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,10 +22,10 @@ * 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. - * - * DES implementation donated by Dennis Ferguson */ +/* DES implementation donated by Dennis Ferguson */ + /* * des_tables.c - precomputed tables used for the DES cipher function */ diff --git a/src/lib/crypto/builtin/des/f_tables.h b/src/lib/crypto/builtin/des/f_tables.h index 556bffd2a..c0a99ea0b 100644 --- a/src/lib/crypto/builtin/des/f_tables.h +++ b/src/lib/crypto/builtin/des/f_tables.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/builtin/des/f_tables.h */ /* - * lib/crypto/des/f_tables.h - * * Copyright (C) 1990 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. - * + */ + +/* * DES implementation donated by Dennis Ferguson */ diff --git a/src/lib/crypto/builtin/des/key_sched.c b/src/lib/crypto/builtin/des/key_sched.c index 2be558602..87f02b6a9 100644 --- a/src/lib/crypto/builtin/des/key_sched.c +++ b/src/lib/crypto/builtin/des/key_sched.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/builtin/des/key_sched.c */ /* - * lib/crypto/des/key_sched.c - * * Copyright 1985, 1986, 1987, 1988, 1990 by the Massachusetts Institute * of Technology. * All Rights Reserved. @@ -24,8 +23,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. - * - * + */ + +/* * This routine computes the DES key schedule given a key. The * permutations and shifts have been done at compile time, resulting * in a direct one-step mapping from the input key to the key diff --git a/src/lib/crypto/builtin/des/string2key.c b/src/lib/crypto/builtin/des/string2key.c index 8941936bb..a937d6f08 100644 --- a/src/lib/crypto/builtin/des/string2key.c +++ b/src/lib/crypto/builtin/des/string2key.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/builtin/des/string2key.c */ /* - * lib/crypto/des/des_s2k.c - * * Copyright 2004, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,11 +22,10 @@ * 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. - * - * - * Compute encryption key from salt and pass phrase. */ +/* Compute encryption key from salt and pass phrase. */ + #include "crypto_int.h" #include "des_int.h" diff --git a/src/lib/crypto/builtin/des/t_verify.c b/src/lib/crypto/builtin/des/t_verify.c index ae312070a..1f3239fed 100644 --- a/src/lib/crypto/builtin/des/t_verify.c +++ b/src/lib/crypto/builtin/des/t_verify.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/builtin/des/t_verify.c */ /* - * lib/crypto/des/verify.c - * * Copyright 1988, 1990 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,15 +22,7 @@ * 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. - * - * - * Program to test the correctness of the DES library - * implementation. - * - * exit returns 0 ==> success - * -1 ==> error */ - /* * Copyright (C) 1998 by the FundsXpress, INC. * @@ -58,6 +49,15 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +/* + * + * Program to test the correctness of the DES library + * implementation. + * + * exit returns 0 ==> success + * -1 ==> error + */ + #include "k5-int.h" #include "des_int.h" #include <stdio.h> diff --git a/src/lib/crypto/builtin/des/weak_key.c b/src/lib/crypto/builtin/des/weak_key.c index 921ce1026..eb41b267d 100644 --- a/src/lib/crypto/builtin/des/weak_key.c +++ b/src/lib/crypto/builtin/des/weak_key.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/builtin/des/weak_key.c */ /* - * lib/crypto/des/weak_key.c - * * Copyright 1989,1990 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,8 +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. - * - * + */ + +/* * Under U.S. law, this software may not be exported outside the US * without license from the U.S. Commerce department. * diff --git a/src/lib/crypto/builtin/enc_provider/aes.c b/src/lib/crypto/builtin/enc_provider/aes.c index e1f7eca4a..1809cd09a 100644 --- a/src/lib/crypto/builtin/enc_provider/aes.c +++ b/src/lib/crypto/builtin/enc_provider/aes.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/builtin/enc_provider/aes.c */ /* - * lib/crypto/enc_provider/aes.c - * * Copyright (C) 2003, 2007, 2008 by the Massachusetts Institute of Technology. * All rights reserved. * diff --git a/src/lib/crypto/builtin/enc_provider/camellia.c b/src/lib/crypto/builtin/enc_provider/camellia.c index 16723422c..9a8e491b5 100644 --- a/src/lib/crypto/builtin/enc_provider/camellia.c +++ b/src/lib/crypto/builtin/enc_provider/camellia.c @@ -1,5 +1,5 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* lib/crypto/enc_provider/camellia.c - Camellia enc provider definition */ +/* lib/crypto/builtin/enc_provider/camellia.c - Camellia enc provider */ /* * Copyright (C) 2009, 2010 by the Massachusetts Institute of Technology. * All rights reserved. diff --git a/src/lib/crypto/builtin/enc_provider/rc4.c b/src/lib/crypto/builtin/enc_provider/rc4.c index 13255567b..dc78837ed 100644 --- a/src/lib/crypto/builtin/enc_provider/rc4.c +++ b/src/lib/crypto/builtin/enc_provider/rc4.c @@ -1,6 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* arcfour.c - * +/* lib/crypto/builtin/enc_provider/rc4.c */ +/* * Copyright (c) 2000 by Computer Science Laboratory, * Rensselaer Polytechnic Institute * diff --git a/src/lib/crypto/builtin/init.c b/src/lib/crypto/builtin/init.c index cc35ba7e6..b88d5deaf 100644 --- a/src/lib/crypto/builtin/init.c +++ b/src/lib/crypto/builtin/init.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/builtin/init.c - Module init and cleanup functions */ /* - * lib/crypto/builtin/init.c - * * Copyright (C) 2010 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,9 +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. - * - * - * Built-in back-end library init functions */ #include "crypto_int.h" diff --git a/src/lib/crypto/builtin/md4/md4.c b/src/lib/crypto/builtin/md4/md4.c index 6850e1329..27d2ad514 100644 --- a/src/lib/crypto/builtin/md4/md4.c +++ b/src/lib/crypto/builtin/md4/md4.c @@ -1,6 +1,26 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/builtin/md4/md4.c */ + /* - * lib/crypto/md4/md4.c + * Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. + * + * License to copy and use this software is granted provided that + * it is identified as the "RSA Data Security, Inc. MD4 Message + * Digest Algorithm" in all material mentioning or referencing this + * software or this function. + * + * License is also granted to make and use derivative works + * provided that such works are identified as "derived from the RSA + * Data Security, Inc. MD4 Message Digest Algorithm" in all + * material mentioning or referencing the derived work. + * + * RSA Data Security, Inc. makes no representations concerning + * either the merchantability of this software or the suitability + * of this software for any particular purpose. It is provided "as + * is" without express or implied warranty of any kind. + * + * These notices must be retained in any copies of any part of this + * documentation and/or software. */ /* @@ -12,30 +32,6 @@ ********************************************************************** */ -/* -********************************************************************** -** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. ** -** ** -** License to copy and use this software is granted provided that ** -** it is identified as the "RSA Data Security, Inc. MD4 Message ** -** Digest Algorithm" in all material mentioning or referencing this ** -** software or this function. ** -** ** -** License is also granted to make and use derivative works ** -** provided that such works are identified as "derived from the RSA ** -** Data Security, Inc. MD4 Message Digest Algorithm" in all ** -** material mentioning or referencing the derived work. ** -** ** -** RSA Data Security, Inc. makes no representations concerning ** -** either the merchantability of this software or the suitability ** -** of this software for any particular purpose. It is provided "as ** -** is" without express or implied warranty of any kind. ** -** ** -** These notices must be retained in any copies of any part of this ** -** documentation and/or software. ** -********************************************************************** -*/ - #include "k5-int.h" #include "rsa-md4.h" diff --git a/src/lib/crypto/builtin/md4/rsa-md4.h b/src/lib/crypto/builtin/md4/rsa-md4.h index 408f2effe..c404e151b 100644 --- a/src/lib/crypto/builtin/md4/rsa-md4.h +++ b/src/lib/crypto/builtin/md4/rsa-md4.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/builtin/md4/rsa-md4.h */ /* - * lib/crypto/md4/rsa-md4.h - * * Copyright 1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,11 +22,31 @@ * 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. + */ +/* + * Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. * + * License to copy and use this software is granted provided that + * it is identified as the "RSA Data Security, Inc. MD4 Message + * Digest Algorithm" in all material mentioning or referencing this + * software or this function. * - * RSA MD4 header file, with Kerberos/STDC additions. + * License is also granted to make and use derivative works + * provided that such works are identified as "derived from the RSA + * Data Security, Inc. MD4 Message Digest Algorithm" in all + * material mentioning or referencing the derived work. + * + * RSA Data Security, Inc. makes no representations concerning + * either the merchantability of this software or the suitability + * of this software for any particular purpose. It is provided "as + * is" without express or implied warranty of any kind. + * + * These notices must be retained in any copies of any part of this + * documentation and/or software. */ +/* RSA MD4 header file, with Kerberos/STDC additions. */ + #ifndef __KRB5_RSA_MD4_H__ #define __KRB5_RSA_MD4_H__ @@ -51,30 +70,6 @@ ********************************************************************** */ -/* -********************************************************************** -** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. ** -** ** -** License to copy and use this software is granted provided that ** -** it is identified as the "RSA Data Security, Inc. MD4 Message ** -** Digest Algorithm" in all material mentioning or referencing this ** -** software or this function. ** -** ** -** License is also granted to make and use derivative works ** -** provided that such works are identified as "derived from the RSA ** -** Data Security, Inc. MD4 Message Digest Algorithm" in all ** -** material mentioning or referencing the derived work. ** -** ** -** RSA Data Security, Inc. makes no representations concerning ** -** either the merchantability of this software or the suitability ** -** of this software for any particular purpose. It is provided "as ** -** is" without express or implied warranty of any kind. ** -** ** -** These notices must be retained in any copies of any part of this ** -** documentation and/or software. ** -********************************************************************** -*/ - /* Data structure for MD4 (Message Digest) computation */ typedef struct { krb5_ui_4 i[2]; /* number of _bits_ handled mod 2^64 */ diff --git a/src/lib/crypto/builtin/md5/md5.c b/src/lib/crypto/builtin/md5/md5.c index 7e06aa6d2..4a169065c 100644 --- a/src/lib/crypto/builtin/md5/md5.c +++ b/src/lib/crypto/builtin/md5/md5.c @@ -1,5 +1,27 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ /* + * Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. + * + * License to copy and use this software is granted provided that + * it is identified as the "RSA Data Security, Inc. MD5 Message- + * Digest Algorithm" in all material mentioning or referencing this + * software or this function. + * + * License is also granted to make and use derivative works + * provided that such works are identified as "derived from the RSA + * Data Security, Inc. MD5 Message-Digest Algorithm" in all + * material mentioning or referencing the derived work. + * + * RSA Data Security, Inc. makes no representations concerning + * either the merchantability of this software or the suitability + * of this software for any particular purpose. It is provided "as + * is" without express or implied warranty of any kind. + * + * These notices must be retained in any copies of any part of this + * documentation and/or software. + */ + +/* *********************************************************************** ** md5.c -- the source code for MD5 routines ** ** RSA Data Security, Inc. MD5 Message-Digest Algorithm ** @@ -12,30 +34,6 @@ * Modified by John Carr, MIT, to use Kerberos 5 typedefs. */ -/* -*********************************************************************** -** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. ** -** ** -** License to copy and use this software is granted provided that ** -** it is identified as the "RSA Data Security, Inc. MD5 Message- ** -** Digest Algorithm" in all material mentioning or referencing this ** -** software or this function. ** -** ** -** License is also granted to make and use derivative works ** -** provided that such works are identified as "derived from the RSA ** -** Data Security, Inc. MD5 Message-Digest Algorithm" in all ** -** material mentioning or referencing the derived work. ** -** ** -** RSA Data Security, Inc. makes no representations concerning ** -** either the merchantability of this software or the suitability ** -** of this software for any particular purpose. It is provided "as ** -** is" without express or implied warranty of any kind. ** -** ** -** These notices must be retained in any copies of any part of this ** -** documentation and/or software. ** -*********************************************************************** -*/ - #include "k5-int.h" #include "rsa-md5.h" diff --git a/src/lib/crypto/builtin/md5/rsa-md5.h b/src/lib/crypto/builtin/md5/rsa-md5.h index 11a4fc38c..cbdf67cfb 100644 --- a/src/lib/crypto/builtin/md5/rsa-md5.h +++ b/src/lib/crypto/builtin/md5/rsa-md5.h @@ -1,5 +1,27 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ /* + * Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. + * + * License to copy and use this software is granted provided that + * it is identified as the "RSA Data Security, Inc. MD5 Message- + * Digest Algorithm" in all material mentioning or referencing this + * software or this function. + * + * License is also granted to make and use derivative works + * provided that such works are identified as "derived from the RSA + * Data Security, Inc. MD5 Message-Digest Algorithm" in all + * material mentioning or referencing the derived work. + * + * RSA Data Security, Inc. makes no representations concerning + * either the merchantability of this software or the suitability + * of this software for any particular purpose. It is provided "as + * is" without express or implied warranty of any kind. + * + * These notices must be retained in any copies of any part of this + * documentation and/or software. + */ + +/* *********************************************************************** ** md5.h -- header file for implementation of MD5 ** ** RSA Data Security, Inc. MD5 Message-Digest Algorithm ** @@ -14,30 +36,6 @@ *********************************************************************** */ -/* -*********************************************************************** -** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. ** -** ** -** License to copy and use this software is granted provided that ** -** it is identified as the "RSA Data Security, Inc. MD5 Message- ** -** Digest Algorithm" in all material mentioning or referencing this ** -** software or this function. ** -** ** -** License is also granted to make and use derivative works ** -** provided that such works are identified as "derived from the RSA ** -** Data Security, Inc. MD5 Message-Digest Algorithm" in all ** -** material mentioning or referencing the derived work. ** -** ** -** RSA Data Security, Inc. makes no representations concerning ** -** either the merchantability of this software or the suitability ** -** of this software for any particular purpose. It is provided "as ** -** is" without express or implied warranty of any kind. ** -** ** -** These notices must be retained in any copies of any part of this ** -** documentation and/or software. ** -*********************************************************************** -*/ - #ifndef KRB5_RSA_MD5__ #define KRB5_RSA_MD5__ diff --git a/src/lib/crypto/builtin/pbkdf2.c b/src/lib/crypto/builtin/pbkdf2.c index ce721c9c6..5c483b189 100644 --- a/src/lib/crypto/builtin/pbkdf2.c +++ b/src/lib/crypto/builtin/pbkdf2.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/builtin/pbkdf2.c - Implementation of PBKDF2 from RFC 2898 */ /* - * lib/crypto/pbkdf2.c - * * Copyright 2002, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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. - * - * - * Implementation of PBKDF2 from RFC 2898. */ #include <ctype.h> diff --git a/src/lib/crypto/builtin/sha2/t_sha256.c b/src/lib/crypto/builtin/sha2/t_sha256.c index 4facb0f31..c2da3818d 100644 --- a/src/lib/crypto/builtin/sha2/t_sha256.c +++ b/src/lib/crypto/builtin/sha2/t_sha256.c @@ -1,5 +1,5 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* lib/crypto/builtin/t_sha256.c */ +/* lib/crypto/builtin/sha2/t_sha256.c */ /* * Copyright (c) 1995 - 2002 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). diff --git a/src/lib/crypto/crypto_tests/aes-test.c b/src/lib/crypto/crypto_tests/aes-test.c index b86b5ab8c..1ed033b11 100644 --- a/src/lib/crypto/crypto_tests/aes-test.c +++ b/src/lib/crypto/crypto_tests/aes-test.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/crypto_tests/aes-test.c */ /* - * lib/crypto/aes/aes-test.c - * * Copyright (C) 2002 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,8 +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. - * - * + */ + +/* * Subset of NIST tests for AES; specifically, the variable-key and * variable-text tests for 128- and 256-bit keys. */ diff --git a/src/lib/crypto/crypto_tests/camellia-test.c b/src/lib/crypto/crypto_tests/camellia-test.c index a84587352..9975d4d26 100644 --- a/src/lib/crypto/crypto_tests/camellia-test.c +++ b/src/lib/crypto/crypto_tests/camellia-test.c @@ -1,6 +1,5 @@ +/* lib/crypto/crypto_tests/camellia-test.c */ /* - * lib/crypto/camellia/camellia-test.c - * * Copyright (c) 2009 * NTT (Nippon Telegraph and Telephone Corporation) . All rights reserved. * diff --git a/src/lib/crypto/crypto_tests/t_cf2.c b/src/lib/crypto/crypto_tests/t_cf2.c index 550192c44..3254e972a 100644 --- a/src/lib/crypto/crypto_tests/t_cf2.c +++ b/src/lib/crypto/crypto_tests/t_cf2.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/crypto_tests/t_cf2.c */ /* - * lib/crypto/t_cf2.c - * * Copyright (C) 2004, 2009 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,18 +22,23 @@ * 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 tests for the KRB-FX-CF2 code in Kerberos, based on the + * PRF regression tests. It reads an input file, and writes an output file. + * It is assumed that the output file will be diffed against expected output to + * see whether regression tests pass. The input file is a very primitive + * format. + * + * Line 1: enctype + * Line 2: key to pass to string2key; also used as salt + * Line 3: second key to pass to string2key + * Line 4: pepper1 + * Line 5: pepper2 * - * This file contains tests for theKRB-FX-CF2 code in Kerberos, based - *on the PRF regression tests. It reads an input file, and writes an - *output file. It is assumed that the output file will be diffed - *against expected output to see whether regression tests pass. The - *input file is a very primitive format. - *First line: enctype - *second line: key to pass to string2key; also used as salt - *Third line: second key to pass to string2key - *fourth line: pepper1 - *fifth line: pepper2 - *scanf is used to read the file, so interior spaces are not permitted. The program outputs the hex bytes of the key. + * scanf is used to read the file, so interior spaces are not permitted. The + * program outputs the hex bytes of the key. */ #include <krb5.h> diff --git a/src/lib/crypto/crypto_tests/t_cksum.c b/src/lib/crypto/crypto_tests/t_cksum.c index c4f22bcd7..2200fe76e 100644 --- a/src/lib/crypto/crypto_tests/t_cksum.c +++ b/src/lib/crypto/crypto_tests/t_cksum.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/crypto_tests/t_cksum.c */ /* - * lib/crypto/md5/t_cksum.c - * * Copyright 1995 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +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. - * */ -/* - * t_cksum.c - Test checksum and checksum compatability for rsa-md[4,5]-des - */ +/* Test checksum and checksum compatability for rsa-md[4,5]-des. */ #include "k5-int.h" diff --git a/src/lib/crypto/crypto_tests/t_cksums.c b/src/lib/crypto/crypto_tests/t_cksums.c index 868d91bee..7e9df72f2 100644 --- a/src/lib/crypto/crypto_tests/t_cksums.c +++ b/src/lib/crypto/crypto_tests/t_cksums.c @@ -1,5 +1,5 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* lib/crypto/crypto-tests/t_cksums.c - Test known checksum results */ +/* lib/crypto/crypto_tests/t_cksums.c - Test known checksum results */ /* * Copyright (C) 2010 by the Massachusetts Institute of Technology. * All rights reserved. diff --git a/src/lib/crypto/crypto_tests/t_cmac.c b/src/lib/crypto/crypto_tests/t_cmac.c index c140f24f5..7a4b3aeee 100644 --- a/src/lib/crypto/crypto_tests/t_cmac.c +++ b/src/lib/crypto/crypto_tests/t_cmac.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/crypto_tests/t_cmac.c */ /* - * lib/crypto/t_cmac.c - * * Copyright 2010 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,8 +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. - * - * + */ + +/* * Test vectors for CMAC. Inputs are taken from RFC 4493 section 4. Outputs * are changed for the use of Camellia-128 in place of AES-128. * diff --git a/src/lib/crypto/crypto_tests/t_crc.c b/src/lib/crypto/crypto_tests/t_crc.c index 500e020c4..7161fb083 100644 --- a/src/lib/crypto/crypto_tests/t_crc.c +++ b/src/lib/crypto/crypto_tests/t_crc.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/crypto_tests/t_crc.c */ /* - * lib/crypto/crc32/t_crc.c - * * Copyright 2002,2005 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. - * + */ + +/* * Sanity checks for CRC32. */ #include <sys/times.h> diff --git a/src/lib/crypto/crypto_tests/t_cts.c b/src/lib/crypto/crypto_tests/t_cts.c index 39aef9d84..f2a3012b2 100644 --- a/src/lib/crypto/crypto_tests/t_cts.c +++ b/src/lib/crypto/crypto_tests/t_cts.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/crypto_tests/t_cts.c */ /* - * lib/crypto/vectors.c - * * Copyright 2001, 2007 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. - * + */ + +/* * * Test vectors for crypto code, matching data submitted for inclusion * with RFC1510bis. diff --git a/src/lib/crypto/crypto_tests/t_encrypt.c b/src/lib/crypto/crypto_tests/t_encrypt.c index db75e22a8..580120b8f 100644 --- a/src/lib/crypto/crypto_tests/t_encrypt.c +++ b/src/lib/crypto/crypto_tests/t_encrypt.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/crypto_tests/t_encrypt.c */ /* - * lib/crypto/t_encrypt.c - * * Copyright 2001, 2008 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. - * + */ + +/* * * <<< Description >>> */ diff --git a/src/lib/crypto/crypto_tests/t_hmac.c b/src/lib/crypto/crypto_tests/t_hmac.c index 1f5cae596..02168e5c7 100644 --- a/src/lib/crypto/crypto_tests/t_hmac.c +++ b/src/lib/crypto/crypto_tests/t_hmac.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/crypto_tests/t_hmac.c */ /* - * lib/crypto/t_hmac.c - * * Copyright 2001,2002 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,8 +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. - * - * + */ + +/* * Test vectors for HMAC-MD5 and HMAC-SHA1 (placeholder only). * Tests taken from RFC 2202. */ diff --git a/src/lib/crypto/crypto_tests/t_kperf.c b/src/lib/crypto/crypto_tests/t_kperf.c index a07a364dd..68956bfae 100644 --- a/src/lib/crypto/crypto_tests/t_kperf.c +++ b/src/lib/crypto/crypto_tests/t_kperf.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/crypto_tests/t_kperf.c */ /* - * lib/crypto/crypto_tests/t_kperf.c - * * Copyright (C) 2009 by the Massachusetts Institute of Technology. * All rights reserved. * diff --git a/src/lib/crypto/crypto_tests/t_mdcksum.c b/src/lib/crypto/crypto_tests/t_mdcksum.c index 0b8a4fe19..2ed78a1d2 100644 --- a/src/lib/crypto/crypto_tests/t_mdcksum.c +++ b/src/lib/crypto/crypto_tests/t_mdcksum.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/crypto_tests/t_mdcksum.c */ /* - * lib/crypto/md5/t_cksum.c - * * Copyright 1995 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +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. - * */ -/* - * t_cksum.c - Test checksum and checksum compatability for rsa-md[4,5]-des - */ +/* Test checksum and checksum compatability for rsa-md[4,5]-des. */ #ifndef MD #define MD 5 diff --git a/src/lib/crypto/crypto_tests/t_mddriver.c b/src/lib/crypto/crypto_tests/t_mddriver.c index 59b4a48de..ad65d0315 100644 --- a/src/lib/crypto/crypto_tests/t_mddriver.c +++ b/src/lib/crypto/crypto_tests/t_mddriver.c @@ -1,19 +1,18 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* MDDRIVER.C - test driver for MD2, MD4 and MD5 +/* lib/crypto/crypto_tests/t_mddriver.c - test driver for MD2, MD4 and MD5 */ +/* + * Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All + * rights reserved. + * + * RSA Data Security, Inc. makes no representations concerning either + * the merchantability of this software or the suitability of this + * software for any particular purpose. It is provided "as is" + * without express or implied warranty of any kind. + * + * These notices must be retained in any copies of any part of this + * documentation and/or software. */ -/* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All - rights reserved. - - RSA Data Security, Inc. makes no representations concerning either - the merchantability of this software or the suitability of this - software for any particular purpose. It is provided "as is" - without express or implied warranty of any kind. - - These notices must be retained in any copies of any part of this - documentation and/or software. -*/ - /* The following makes MD default to MD5 if it has not already been defined with C compiler flags. */ diff --git a/src/lib/crypto/crypto_tests/t_nfold.c b/src/lib/crypto/crypto_tests/t_nfold.c index f9e36e57f..6fa644a29 100644 --- a/src/lib/crypto/crypto_tests/t_nfold.c +++ b/src/lib/crypto/crypto_tests/t_nfold.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/crypto_tests/t_nfold.c - Test nfold implementation correctness */ /* - * lib/crypto/t_nfold.c - * * Copyright 1988, 1990 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +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. - * - * - * Program to test the correctness of nfold implementation. - * - * exit returns 0 ==> success - * -1 ==> error */ #include <stdio.h> diff --git a/src/lib/crypto/crypto_tests/t_pkcs5.c b/src/lib/crypto/crypto_tests/t_pkcs5.c index 34d884ff5..7ab078df7 100644 --- a/src/lib/crypto/crypto_tests/t_pkcs5.c +++ b/src/lib/crypto/crypto_tests/t_pkcs5.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/crypto_tests/t_pkcs5.c */ /* - * lib/crypto/t_pkcs5.c - * * Copyright 2002 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,11 +22,10 @@ * 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. - * - * - * Test vectors for PBKDF2 (from PKCS #5v2), based on RFC 3211. */ +/* Test vectors for PBKDF2 (from PKCS #5v2), based on RFC 3211. */ + #include <assert.h> #include <stdio.h> #include <string.h> diff --git a/src/lib/crypto/crypto_tests/t_prf.c b/src/lib/crypto/crypto_tests/t_prf.c index d9ac3d8b9..83864274a 100644 --- a/src/lib/crypto/crypto_tests/t_prf.c +++ b/src/lib/crypto/crypto_tests/t_prf.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/crypto_tests/t_prf.c */ /* - * lib/crypto/t_prf.c - * * Copyright (C) 2004 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. - * + */ + +/* * This file contains tests for the PRF code in Kerberos. IT reads an * input file, and writes an output file. It is assumed that the * output file will be diffed against expected output to see whether diff --git a/src/lib/crypto/crypto_tests/t_prng.c b/src/lib/crypto/crypto_tests/t_prng.c index 634667ab6..196c41f1b 100644 --- a/src/lib/crypto/crypto_tests/t_prng.c +++ b/src/lib/crypto/crypto_tests/t_prng.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/crypto_tests/t_prng.c */ /* - * lib/crypto/t_prng.c - * * Copyright (C) 2001 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. - * + */ + +/* * This file contains tests for the PRNG code in Kerberos. It reads * an input file, and writes an output file. It is assumed that the * output file will be diffed against expected output to see whether diff --git a/src/lib/crypto/crypto_tests/t_short.c b/src/lib/crypto/crypto_tests/t_short.c index 7f9f3ad67..295206651 100644 --- a/src/lib/crypto/crypto_tests/t_short.c +++ b/src/lib/crypto/crypto_tests/t_short.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/crypto_tests/t_short.c */ /* - * lib/crypto/crypto_tests/t_short.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. - * + */ + +/* * Tests the outcome of decrypting overly short tokens. This program can be * run under a tool like valgrind to detect bad memory accesses; when run * normally by the test suite, it verifies that each operation returns diff --git a/src/lib/crypto/crypto_tests/t_str2key.c b/src/lib/crypto/crypto_tests/t_str2key.c index 79e0e855f..85a7a9f25 100644 --- a/src/lib/crypto/crypto_tests/t_str2key.c +++ b/src/lib/crypto/crypto_tests/t_str2key.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/crypto_tests/t_str2key.c */ /* - * lib/crypto/crypto_tests/t_str2key.c - * * Copyright (C) 2010 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. - * + */ + +/* * * String-to-key test vectors */ diff --git a/src/lib/crypto/crypto_tests/vectors.c b/src/lib/crypto/crypto_tests/vectors.c index 8e9728765..482d2de20 100644 --- a/src/lib/crypto/crypto_tests/vectors.c +++ b/src/lib/crypto/crypto_tests/vectors.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/crypto_tests/vectors.c */ /* - * lib/crypto/vectors.c - * * Copyright 2001 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,8 +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. - * - * + */ + +/* * Test vectors for crypto code, matching data submitted for inclusion * with RFC1510bis. * 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. * diff --git a/src/lib/crypto/nss/des/des_oldapis.c b/src/lib/crypto/nss/des/des_oldapis.c index 79163c40c..c26439f54 100644 --- a/src/lib/crypto/nss/des/des_oldapis.c +++ b/src/lib/crypto/nss/des/des_oldapis.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/nss/des/des_oldapis.c */ /* - * lib/crypto/openssl/des/des_oldapis.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/nss/des/string2key.c b/src/lib/crypto/nss/des/string2key.c index d9f9e3a18..8474c4057 100644 --- a/src/lib/crypto/nss/des/string2key.c +++ b/src/lib/crypto/nss/des/string2key.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/nss/des/string2key.c */ /* - * lib/crypto/openssl/des/string2key.c - * * Copyright (C) 2009 by the Massachusetts Institute of Technology. * All rights reserved. * diff --git a/src/lib/crypto/nss/enc_provider/aes.c b/src/lib/crypto/nss/enc_provider/aes.c index 6f24e3f37..3fe79967d 100644 --- a/src/lib/crypto/nss/enc_provider/aes.c +++ b/src/lib/crypto/nss/enc_provider/aes.c @@ -1,6 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* lib/crypto/nss/enc_provider/aes.c - * +/* lib/crypto/nss/enc_provider/aes.c */ +/* * Copyright (c) 2010 Red Hat, Inc. * All Rights Reserved. * diff --git a/src/lib/crypto/nss/enc_provider/camellia.c b/src/lib/crypto/nss/enc_provider/camellia.c index 5a3495de7..820071add 100644 --- a/src/lib/crypto/nss/enc_provider/camellia.c +++ b/src/lib/crypto/nss/enc_provider/camellia.c @@ -1,6 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* lib/crypto/nss/enc_provider/camellia.c - * +/* lib/crypto/nss/enc_provider/camellia.c */ +/* * Copyright (c) 2010 Red Hat, Inc. * All Rights Reserved. * diff --git a/src/lib/crypto/nss/enc_provider/des.c b/src/lib/crypto/nss/enc_provider/des.c index 60b5097d1..46a3e0fc1 100644 --- a/src/lib/crypto/nss/enc_provider/des.c +++ b/src/lib/crypto/nss/enc_provider/des.c @@ -1,6 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* lib/crypto/nss/enc_provider/des.c - * +/* lib/crypto/nss/enc_provider/des.c */ +/* * Copyright (c) 2010 Red Hat, Inc. * All Rights Reserved. * diff --git a/src/lib/crypto/nss/enc_provider/des3.c b/src/lib/crypto/nss/enc_provider/des3.c index b32e56897..5030dde2e 100644 --- a/src/lib/crypto/nss/enc_provider/des3.c +++ b/src/lib/crypto/nss/enc_provider/des3.c @@ -1,6 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* lib/crypto/nss/enc_provider/des3.c - * +/* lib/crypto/nss/enc_provider/des3.c */ +/* * Copyright (c) 2010 Red Hat, Inc. * All Rights Reserved. * diff --git a/src/lib/crypto/nss/enc_provider/enc_gen.c b/src/lib/crypto/nss/enc_provider/enc_gen.c index bdd9d6726..943726352 100644 --- a/src/lib/crypto/nss/enc_provider/enc_gen.c +++ b/src/lib/crypto/nss/enc_provider/enc_gen.c @@ -1,6 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* lib/crypto/nss/enc_provider/enc_gen.c - * +/* lib/crypto/nss/enc_provider/enc_gen.c */ +/* * Copyright (c) 2010 Red Hat, Inc. * All Rights Reserved. * diff --git a/src/lib/crypto/nss/enc_provider/rc4.c b/src/lib/crypto/nss/enc_provider/rc4.c index bd1cefd7e..17d90d94f 100644 --- a/src/lib/crypto/nss/enc_provider/rc4.c +++ b/src/lib/crypto/nss/enc_provider/rc4.c @@ -1,6 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* lib/crypto/nss/enc_provider/rc4.c - * +/* lib/crypto/nss/enc_provider/rc4.c */ +/* * Copyright (c) 2010 Red Hat, Inc. * All Rights Reserved. * diff --git a/src/lib/crypto/nss/hash_provider/hash_gen.c b/src/lib/crypto/nss/hash_provider/hash_gen.c index a11aa6d14..7e54ccce9 100644 --- a/src/lib/crypto/nss/hash_provider/hash_gen.c +++ b/src/lib/crypto/nss/hash_provider/hash_gen.c @@ -1,6 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* lib/crypto/nss/hash_provider/hash_gen.c - * +/* lib/crypto/nss/hash_provider/hash_gen.c */ +/* * Copyright (c) 2010 Red Hat, Inc. * All Rights Reserved. * diff --git a/src/lib/crypto/nss/hash_provider/hash_gen.h b/src/lib/crypto/nss/hash_provider/hash_gen.h index 1658e745c..95e29002f 100644 --- a/src/lib/crypto/nss/hash_provider/hash_gen.h +++ b/src/lib/crypto/nss/hash_provider/hash_gen.h @@ -1,6 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* lib/crypto/nss/hash_provider/hash_gen.h - * +/* lib/crypto/nss/hash_provider/hash_gen.h */ +/* * Copyright (c) 2010 Red Hat, Inc. * All Rights Reserved. * diff --git a/src/lib/crypto/nss/hash_provider/hash_md5.c b/src/lib/crypto/nss/hash_provider/hash_md5.c index 2fb2998ef..167114f68 100644 --- a/src/lib/crypto/nss/hash_provider/hash_md5.c +++ b/src/lib/crypto/nss/hash_provider/hash_md5.c @@ -1,6 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* lib/crypto/nss/hash_provider/hash_md5.c - * +/* lib/crypto/nss/hash_provider/hash_md5.c */ +/* * Copyright (c) 2010 Red Hat, Inc. * All Rights Reserved. * diff --git a/src/lib/crypto/nss/hash_provider/hash_sha1.c b/src/lib/crypto/nss/hash_provider/hash_sha1.c index c78b45ac7..bd84d742f 100644 --- a/src/lib/crypto/nss/hash_provider/hash_sha1.c +++ b/src/lib/crypto/nss/hash_provider/hash_sha1.c @@ -1,6 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* lib/crypto/nss/hash_provider/hash_sha1.c - * +/* lib/crypto/nss/hash_provider/hash_sha1.c */ +/* * Copyright (c) 2010 Red Hat, Inc. * All Rights Reserved. * diff --git a/src/lib/crypto/nss/hmac.c b/src/lib/crypto/nss/hmac.c index adf600ea0..8de0d7add 100644 --- a/src/lib/crypto/nss/hmac.c +++ b/src/lib/crypto/nss/hmac.c @@ -1,6 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* lib/crypto/nss/hmac.c - * +/* lib/crypto/nss/hmac.c */ +/* * Copyright (c) 2010 Red Hat, Inc. * All Rights Reserved. * diff --git a/src/lib/crypto/nss/md4/md4.c b/src/lib/crypto/nss/md4/md4.c index 6850e1329..1853207b9 100644 --- a/src/lib/crypto/nss/md4/md4.c +++ b/src/lib/crypto/nss/md4/md4.c @@ -1,6 +1,25 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/nss/md4/md4.c */ /* - * lib/crypto/md4/md4.c + * Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. + * + * License to copy and use this software is granted provided that + * it is identified as the "RSA Data Security, Inc. MD4 Message + * Digest Algorithm" in all material mentioning or referencing this + * software or this function. + * + * License is also granted to make and use derivative works + * provided that such works are identified as "derived from the RSA + * Data Security, Inc. MD4 Message Digest Algorithm" in all + * material mentioning or referencing the derived work. + * + * RSA Data Security, Inc. makes no representations concerning + * either the merchantability of this software or the suitability + * of this software for any particular purpose. It is provided "as + * is" without express or implied warranty of any kind. + * + * These notices must be retained in any copies of any part of this + * documentation and/or software. */ /* @@ -12,30 +31,6 @@ ********************************************************************** */ -/* -********************************************************************** -** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. ** -** ** -** License to copy and use this software is granted provided that ** -** it is identified as the "RSA Data Security, Inc. MD4 Message ** -** Digest Algorithm" in all material mentioning or referencing this ** -** software or this function. ** -** ** -** License is also granted to make and use derivative works ** -** provided that such works are identified as "derived from the RSA ** -** Data Security, Inc. MD4 Message Digest Algorithm" in all ** -** material mentioning or referencing the derived work. ** -** ** -** RSA Data Security, Inc. makes no representations concerning ** -** either the merchantability of this software or the suitability ** -** of this software for any particular purpose. It is provided "as ** -** is" without express or implied warranty of any kind. ** -** ** -** These notices must be retained in any copies of any part of this ** -** documentation and/or software. ** -********************************************************************** -*/ - #include "k5-int.h" #include "rsa-md4.h" diff --git a/src/lib/crypto/nss/md4/rsa-md4.h b/src/lib/crypto/nss/md4/rsa-md4.h index 408f2effe..d44869a4b 100644 --- a/src/lib/crypto/nss/md4/rsa-md4.h +++ b/src/lib/crypto/nss/md4/rsa-md4.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/nss/md4/rsa-md4.h */ /* - * lib/crypto/md4/rsa-md4.h - * * Copyright 1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,11 +22,31 @@ * 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. + */ +/* + * Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. * + * License to copy and use this software is granted provided that + * it is identified as the "RSA Data Security, Inc. MD4 Message + * Digest Algorithm" in all material mentioning or referencing this + * software or this function. * - * RSA MD4 header file, with Kerberos/STDC additions. + * License is also granted to make and use derivative works + * provided that such works are identified as "derived from the RSA + * Data Security, Inc. MD4 Message Digest Algorithm" in all + * material mentioning or referencing the derived work. + * + * RSA Data Security, Inc. makes no representations concerning + * either the merchantability of this software or the suitability + * of this software for any particular purpose. It is provided "as + * is" without express or implied warranty of any kind. + * + * These notices must be retained in any copies of any part of this + * documentation and/or software. */ +/* RSA MD4 header file, with Kerberos/STDC additions */ + #ifndef __KRB5_RSA_MD4_H__ #define __KRB5_RSA_MD4_H__ @@ -51,30 +70,6 @@ ********************************************************************** */ -/* -********************************************************************** -** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. ** -** ** -** License to copy and use this software is granted provided that ** -** it is identified as the "RSA Data Security, Inc. MD4 Message ** -** Digest Algorithm" in all material mentioning or referencing this ** -** software or this function. ** -** ** -** License is also granted to make and use derivative works ** -** provided that such works are identified as "derived from the RSA ** -** Data Security, Inc. MD4 Message Digest Algorithm" in all ** -** material mentioning or referencing the derived work. ** -** ** -** RSA Data Security, Inc. makes no representations concerning ** -** either the merchantability of this software or the suitability ** -** of this software for any particular purpose. It is provided "as ** -** is" without express or implied warranty of any kind. ** -** ** -** These notices must be retained in any copies of any part of this ** -** documentation and/or software. ** -********************************************************************** -*/ - /* Data structure for MD4 (Message Digest) computation */ typedef struct { krb5_ui_4 i[2]; /* number of _bits_ handled mod 2^64 */ diff --git a/src/lib/crypto/nss/nss_gen.h b/src/lib/crypto/nss/nss_gen.h index 54e1022af..ccf921903 100644 --- a/src/lib/crypto/nss/nss_gen.h +++ b/src/lib/crypto/nss/nss_gen.h @@ -1,6 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* lib/crypto/nss/nss_gen.h - * +/* lib/crypto/nss/nss_gen.h */ +/* * Copyright (c) 2010 Red Hat, Inc. * All Rights Reserved. * diff --git a/src/lib/crypto/nss/pbkdf2.c b/src/lib/crypto/nss/pbkdf2.c index f89f00df6..9a0d4fd66 100644 --- a/src/lib/crypto/nss/pbkdf2.c +++ b/src/lib/crypto/nss/pbkdf2.c @@ -1,6 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* lib/crypto/nss/pbkdf2.c - * +/* lib/crypto/nss/pbkdf2.c */ +/* * Copyright (c) 2010 Red Hat, Inc. * All Rights Reserved. * diff --git a/src/lib/crypto/openssl/des/des_oldapis.c b/src/lib/crypto/openssl/des/des_oldapis.c index 79163c40c..584140f2c 100644 --- a/src/lib/crypto/openssl/des/des_oldapis.c +++ b/src/lib/crypto/openssl/des/des_oldapis.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/openssl/des/des_oldapis.c */ /* - * lib/crypto/openssl/des/des_oldapis.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/openssl/des/f_parity.c b/src/lib/crypto/openssl/des/f_parity.c index 1fb3f6eb8..f5744726a 100644 --- a/src/lib/crypto/openssl/des/f_parity.c +++ b/src/lib/crypto/openssl/des/f_parity.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/openssl/des/f_parity.c */ /* - * lib/crypto/openssl/des/f_parity.c - * * Copyright (C) 2009 by the Massachusetts Institute of Technology. * All rights reserved. * diff --git a/src/lib/crypto/openssl/des/string2key.c b/src/lib/crypto/openssl/des/string2key.c index 923cee52b..cd3e75935 100644 --- a/src/lib/crypto/openssl/des/string2key.c +++ b/src/lib/crypto/openssl/des/string2key.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/openssl/des/string2key.c */ /* - * lib/crypto/openssl/des/string2key.c - * * Copyright (C) 2009 by the Massachusetts Institute of Technology. * All rights reserved. * diff --git a/src/lib/crypto/openssl/enc_provider/aes.c b/src/lib/crypto/openssl/enc_provider/aes.c index 1b16c0ca4..ced93f742 100644 --- a/src/lib/crypto/openssl/enc_provider/aes.c +++ b/src/lib/crypto/openssl/enc_provider/aes.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/openssl/enc_provider/aes.c */ /* - * lib/crypto/openssl/enc_provider/aes.c - * * Copyright (C) 2003, 2007, 2008, 2009 by the Massachusetts Institute of Technology. * All rights reserved. * diff --git a/src/lib/crypto/openssl/enc_provider/camellia.c b/src/lib/crypto/openssl/enc_provider/camellia.c index ab7370feb..a7175e328 100644 --- a/src/lib/crypto/openssl/enc_provider/camellia.c +++ b/src/lib/crypto/openssl/enc_provider/camellia.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/openssl/enc_provider/camellia.c */ /* - * lib/crypto/openssl/enc_provider/camellia.c - * * Copyright (C) 2003, 2007, 2008, 2009, 2010 by the Massachusetts Institute of * Technology. All rights reserved. * diff --git a/src/lib/crypto/openssl/enc_provider/des.c b/src/lib/crypto/openssl/enc_provider/des.c index 151b6ddfb..591e13b80 100644 --- a/src/lib/crypto/openssl/enc_provider/des.c +++ b/src/lib/crypto/openssl/enc_provider/des.c @@ -1,6 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* lib/crypto/openssl/enc_provider/des.c - * +/* lib/crypto/openssl/enc_provider/des.c */ +/* * Copyright (C) 2009 by the Massachusetts Institute of Technology. * All rights reserved. * diff --git a/src/lib/crypto/openssl/enc_provider/des3.c b/src/lib/crypto/openssl/enc_provider/des3.c index fe41ef772..ca843f9f5 100644 --- a/src/lib/crypto/openssl/enc_provider/des3.c +++ b/src/lib/crypto/openssl/enc_provider/des3.c @@ -1,6 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* lib/crypto/openssl/enc_provider/des3.c - * +/* lib/crypto/openssl/enc_provider/des3.c */ +/* * Copyright (C) 2009 by the Massachusetts Institute of Technology. * All rights reserved. * diff --git a/src/lib/crypto/openssl/enc_provider/rc4.c b/src/lib/crypto/openssl/enc_provider/rc4.c index 2ae4a84f1..a8db75459 100644 --- a/src/lib/crypto/openssl/enc_provider/rc4.c +++ b/src/lib/crypto/openssl/enc_provider/rc4.c @@ -1,8 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* lib/crypto/openssl/enc_provider/rc4.c - * - * #include STD_DISCLAIMER - * +/* lib/crypto/openssl/enc_provider/rc4.c */ +/* * Copyright (C) 2009 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -26,8 +24,7 @@ * or implied warranty. */ -/* arcfour.c - * +/* * Copyright (c) 2000 by Computer Science Laboratory, * Rensselaer Polytechnic Institute * diff --git a/src/lib/crypto/openssl/hash_provider/hash_sha1.c b/src/lib/crypto/openssl/hash_provider/hash_sha1.c index f6f1a6569..cdfed55f3 100644 --- a/src/lib/crypto/openssl/hash_provider/hash_sha1.c +++ b/src/lib/crypto/openssl/hash_provider/hash_sha1.c @@ -1,6 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* lib/crypto/openssl/hash/yhash.h - * +/* lib/crypto/openssl/hash_provider/hash_sha1.c */ +/* * Copyright (C) 1998 by the FundsXpress, INC. * * All rights reserved. diff --git a/src/lib/crypto/openssl/hmac.c b/src/lib/crypto/openssl/hmac.c index ac5af3fc0..f92ce8b5c 100644 --- a/src/lib/crypto/openssl/hmac.c +++ b/src/lib/crypto/openssl/hmac.c @@ -1,6 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* lib/crypto/openssl/hmac.c - * +/* lib/crypto/openssl/hmac.c */ +/* * Copyright (C) 2009 by the Massachusetts Institute of Technology. * All rights reserved. * diff --git a/src/lib/crypto/openssl/init.c b/src/lib/crypto/openssl/init.c index b3db6c214..1139bce53 100644 --- a/src/lib/crypto/openssl/init.c +++ b/src/lib/crypto/openssl/init.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/openssl/init.c - Module init and cleanup functions */ /* - * lib/crypto/openssl/init.c - * * Copyright (C) 2010 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,9 +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. - * - * - * OpenSSL back-end library init functions */ #include "crypto_int.h" diff --git a/src/lib/crypto/openssl/pbkdf2.c b/src/lib/crypto/openssl/pbkdf2.c index ba51ad4a0..2a7da3f89 100644 --- a/src/lib/crypto/openssl/pbkdf2.c +++ b/src/lib/crypto/openssl/pbkdf2.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/crypto/openssl/pbkdf2.c */ /* - * lib/crypto/openssl/pbkdf2.c - * * Copyright 2002, 2008, 2009 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,10 +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. - * - * - * Implementation of PBKDF2 from RFC 2898. - * Not currently used; likely to be used when we get around to AES support. */ #include "crypto_int.h" diff --git a/src/lib/gssapi/generic/gssapi_ext.h b/src/lib/gssapi/generic/gssapi_ext.h index d68b6cd0a..d92bbcff4 100644 --- a/src/lib/gssapi/generic/gssapi_ext.h +++ b/src/lib/gssapi/generic/gssapi_ext.h @@ -20,7 +20,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. - * */ #ifndef GSSAPI_EXT_H_ diff --git a/src/lib/gssapi/generic/oid_ops.c b/src/lib/gssapi/generic/oid_ops.c index d7cd5a444..c42354295 100644 --- a/src/lib/gssapi/generic/oid_ops.c +++ b/src/lib/gssapi/generic/oid_ops.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/gssapi/generic/oid_ops.c */ /* - * lib/gssapi/generic/oid_ops.c - * * Copyright 1995 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,13 +22,31 @@ * 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. - * */ - /* - * oid_ops.c - GSS-API V2 interfaces to manipulate OIDs + * Copyright 1993 by OpenVision Technologies, Inc. + * + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without fee, + * provided that the above copyright notice appears in all copies and + * that both that copyright notice and this permission notice appear in + * supporting documentation, and that the name of OpenVision not be used + * in advertising or publicity pertaining to distribution of the software + * without specific, written prior permission. OpenVision makes no + * representations about the suitability of this software for any + * purpose. It is provided "as is" without express or implied warranty. + * + * OPENVISION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL OPENVISION BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF + * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. */ +/* GSS-API V2 interfaces to manipulate OIDs */ + #include "gssapiP_generic.h" #ifdef HAVE_UNISTD_H #include <unistd.h> @@ -478,27 +495,6 @@ generic_gss_oid_decompose(OM_uint32 *minor_status, return GSS_S_COMPLETE; } -/* - * Copyright 1993 by OpenVision Technologies, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software - * and its documentation for any purpose is hereby granted without fee, - * provided that the above copyright notice appears in all copies and - * that both that copyright notice and this permission notice appear in - * supporting documentation, and that the name of OpenVision not be used - * in advertising or publicity pertaining to distribution of the software - * without specific, written prior permission. OpenVision makes no - * representations about the suitability of this software for any - * purpose. It is provided "as is" without express or implied warranty. - * - * OPENVISION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL OPENVISION BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF - * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ OM_uint32 generic_gss_copy_oid_set(OM_uint32 *minor_status, const gss_OID_set_desc * const oidset, diff --git a/src/lib/gssapi/generic/utl_nohash_validate.c b/src/lib/gssapi/generic/utl_nohash_validate.c index 066780a52..1315532d7 100644 --- a/src/lib/gssapi/generic/utl_nohash_validate.c +++ b/src/lib/gssapi/generic/utl_nohash_validate.c @@ -21,12 +21,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. - * */ -/* - * stub functions for those without the hash library. - */ +/* Stub functions for those without the hash library */ #include "gssapiP_generic.h" diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c index 0344ebd10..4c8d15306 100644 --- a/src/lib/gssapi/krb5/accept_sec_context.c +++ b/src/lib/gssapi/krb5/accept_sec_context.c @@ -21,7 +21,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. - * */ /* * Copyright 1993 by OpenVision Technologies, Inc. diff --git a/src/lib/gssapi/krb5/acquire_cred.c b/src/lib/gssapi/krb5/acquire_cred.c index ae34f95cc..93e188ae9 100644 --- a/src/lib/gssapi/krb5/acquire_cred.c +++ b/src/lib/gssapi/krb5/acquire_cred.c @@ -21,7 +21,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. - * */ /* * Copyright 1993 by OpenVision Technologies, Inc. diff --git a/src/lib/gssapi/krb5/canon_name.c b/src/lib/gssapi/krb5/canon_name.c index 3dd01dcd3..81b08a534 100644 --- a/src/lib/gssapi/krb5/canon_name.c +++ b/src/lib/gssapi/krb5/canon_name.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/gssapi/krb5/canon_name.c */ /* - * lib/gssapi/krb5/canon_name.c - * * Copyright 1997 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 "gssapiP_krb5.h" diff --git a/src/lib/gssapi/krb5/duplicate_name.c b/src/lib/gssapi/krb5/duplicate_name.c index c054d74aa..256fb5e75 100644 --- a/src/lib/gssapi/krb5/duplicate_name.c +++ b/src/lib/gssapi/krb5/duplicate_name.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/gssapi/krb5/duplicate_name.c */ /* - * lib/gssapi/krb5/duplicate_name.c - * * Copyright 1997,2007 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 "gssapiP_krb5.h" diff --git a/src/lib/gssapi/krb5/export_name.c b/src/lib/gssapi/krb5/export_name.c index 52c2440f6..c4a1a1241 100644 --- a/src/lib/gssapi/krb5/export_name.c +++ b/src/lib/gssapi/krb5/export_name.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/gssapi/krb5/export_name.c */ /* - * lib/gssapi/krb5/export_name.c - * * Copyright 1997, 2007 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 "gssapiP_krb5.h" diff --git a/src/lib/gssapi/krb5/export_sec_context.c b/src/lib/gssapi/krb5/export_sec_context.c index 271c58cab..ac12d82b9 100644 --- a/src/lib/gssapi/krb5/export_sec_context.c +++ b/src/lib/gssapi/krb5/export_sec_context.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/gssapi/krb5/export_sec_context.c - Externalize a security context */ /* - * lib/gssapi/krb5/export_sec_context.c - * * Copyright 1995, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +22,8 @@ * 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. - * */ -/* - * export_sec_context.c - Externalize the security context. - */ #include "gssapiP_krb5.h" #ifndef LEAN_CLIENT OM_uint32 diff --git a/src/lib/gssapi/krb5/iakerb.c b/src/lib/gssapi/krb5/iakerb.c index 8c9958ffd..b58d384da 100644 --- a/src/lib/gssapi/krb5/iakerb.c +++ b/src/lib/gssapi/krb5/iakerb.c @@ -21,7 +21,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 "k5-int.h" #include "gssapiP_krb5.h" @@ -789,9 +788,6 @@ iakerb_make_exts(iakerb_ctx_id_t ctx, krb5_gss_ctx_ext_rec *exts) exts->iakerb.conv = &ctx->conv; } -/* - * - */ OM_uint32 iakerb_gss_accept_sec_context(OM_uint32 *minor_status, gss_ctx_id_t *context_handle, diff --git a/src/lib/gssapi/krb5/import_sec_context.c b/src/lib/gssapi/krb5/import_sec_context.c index 30ec2309e..daf3577be 100644 --- a/src/lib/gssapi/krb5/import_sec_context.c +++ b/src/lib/gssapi/krb5/import_sec_context.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/gssapi/krb5/import_sec_context.c - Internalize the security context */ /* - * lib/gssapi/krb5/import_sec_context.c - * * Copyright 1995,2004,2007,2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +22,8 @@ * 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. - * */ -/* - * import_sec_context.c - Internalize the security context. - */ #include "gssapiP_krb5.h" /* for serialization initialization functions */ #include "k5-int.h" diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c index d811eb30c..b04330adf 100644 --- a/src/lib/gssapi/krb5/init_sec_context.c +++ b/src/lib/gssapi/krb5/init_sec_context.c @@ -1,7 +1,7 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ /* - * Copyright 2000, 2002, 2003, 2007, 2008 by the Massachusetts Institute of Technology. - * All Rights Reserved. + * Copyright 2000, 2002, 2003, 2007, 2008 by the Massachusetts Institute of + * Technology. All Rights Reserved. * * Export of this software from the United States of America may * require a specific license from the United States Government. @@ -21,7 +21,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. - * */ /* * Copyright 1993 by OpenVision Technologies, Inc. diff --git a/src/lib/gssapi/krb5/inq_cred.c b/src/lib/gssapi/krb5/inq_cred.c index b97ed89aa..493dd039d 100644 --- a/src/lib/gssapi/krb5/inq_cred.c +++ b/src/lib/gssapi/krb5/inq_cred.c @@ -21,7 +21,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. - * */ /* * Copyright 1993 by OpenVision Technologies, Inc. diff --git a/src/lib/gssapi/krb5/inq_names.c b/src/lib/gssapi/krb5/inq_names.c index 19c477f83..3980062cd 100644 --- a/src/lib/gssapi/krb5/inq_names.c +++ b/src/lib/gssapi/krb5/inq_names.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/gssapi/krb5/inq_names.c - Return nametypes supported by krb5 mech */ /* - * lib/gssapi/krb5/inq_names.c - * * Copyright 1995 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +22,8 @@ * 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. - * */ -/* - * inq_names.c - Return set of nametypes supported by the KRB5 mechanism. - */ #include "gssapiP_krb5.h" OM_uint32 diff --git a/src/lib/gssapi/krb5/k5sealiov.c b/src/lib/gssapi/krb5/k5sealiov.c index d797ce930..445cdc79a 100644 --- a/src/lib/gssapi/krb5/k5sealiov.c +++ b/src/lib/gssapi/krb5/k5sealiov.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/gssapi/krb5/k5sealiov.c */ /* - * lib/gssapi/krb5/k5sealiov.c - * * Copyright 2008, 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. - * - * */ #include <assert.h> diff --git a/src/lib/gssapi/krb5/k5sealv3.c b/src/lib/gssapi/krb5/k5sealv3.c index 1613913a7..f050f6dea 100644 --- a/src/lib/gssapi/krb5/k5sealv3.c +++ b/src/lib/gssapi/krb5/k5sealv3.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/gssapi/krb5/k5sealv3.c */ /* - * lib/gssapi/krb5/k5sealv3.c - * * Copyright 2003,2004,2007 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +22,8 @@ * 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. - * - * */ + /* draft-ietf-krb-wg-gssapi-cfx-05 */ #include <assert.h> diff --git a/src/lib/gssapi/krb5/k5sealv3iov.c b/src/lib/gssapi/krb5/k5sealv3iov.c index 5ccee2cd7..d6829607b 100644 --- a/src/lib/gssapi/krb5/k5sealv3iov.c +++ b/src/lib/gssapi/krb5/k5sealv3iov.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/gssapi/krb5/k5sealv3iov.c */ /* - * lib/gssapi/krb5/k5sealv3iov.c - * * Copyright 2008 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. - * - * */ #include <assert.h> diff --git a/src/lib/gssapi/krb5/k5unsealiov.c b/src/lib/gssapi/krb5/k5unsealiov.c index 9c821a6fc..185389d68 100644 --- a/src/lib/gssapi/krb5/k5unsealiov.c +++ b/src/lib/gssapi/krb5/k5unsealiov.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/gssapi/krb5/k5unsealiov.c */ /* - * lib/gssapi/krb5/k5unsealiov.c - * * Copyright 2008, 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. - * - * */ #include <assert.h> diff --git a/src/lib/gssapi/krb5/lucid_context.c b/src/lib/gssapi/krb5/lucid_context.c index 6fe069bda..c670b14fe 100644 --- a/src/lib/gssapi/krb5/lucid_context.c +++ b/src/lib/gssapi/krb5/lucid_context.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/gssapi/krb5/lucid_context.c */ /* - * lib/gssapi/krb5/lucid_context.c - * * Copyright 2004, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,13 +22,10 @@ * 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. - * */ -/* - * lucid_context.c - Externalize a "lucid" security - * context from a krb5_gss_ctx_id_rec structure. - */ +/* Externalize a "lucid" security context from a krb5_gss_ctx_id_rec + * structure. */ #include "gssapiP_krb5.h" #include "gssapi_krb5.h" diff --git a/src/lib/gssapi/krb5/naming_exts.c b/src/lib/gssapi/krb5/naming_exts.c index 986717016..31bfb723b 100644 --- a/src/lib/gssapi/krb5/naming_exts.c +++ b/src/lib/gssapi/krb5/naming_exts.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/gssapi/krb5/naming_exts.c */ /* - * lib/gssapi/krb5/naming_exts.c - * * Copyright 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. - * - * */ #include <assert.h> diff --git a/src/lib/gssapi/krb5/prf.c b/src/lib/gssapi/krb5/prf.c index 79e2d8759..ae7ee9fde 100644 --- a/src/lib/gssapi/krb5/prf.c +++ b/src/lib/gssapi/krb5/prf.c @@ -1,7 +1,6 @@ /* -*- mode: c; indent-tabs-mode: nil -*- */ +/* lib/gssapi/krb5/prf.c */ /* - * lib/gssapi/krb5/prf.c - * * Copyright 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. - * - * */ #include <assert.h> diff --git a/src/lib/gssapi/krb5/rel_oid.c b/src/lib/gssapi/krb5/rel_oid.c index 4e6c0f671..e5720e587 100644 --- a/src/lib/gssapi/krb5/rel_oid.c +++ b/src/lib/gssapi/krb5/rel_oid.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/gssapi/krb5/rel_oid.c - Release an OID */ /* - * lib/gssapi/krb5/rel_oid.c - * * Copyright 1995, 2007 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +22,8 @@ * 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. - * */ -/* - * rel_oid.c - Release an OID. - */ #include "gssapiP_krb5.h" OM_uint32 krb5_gss_internal_release_oid (OM_uint32 *, /* minor_status */ diff --git a/src/lib/gssapi/krb5/s4u_gss_glue.c b/src/lib/gssapi/krb5/s4u_gss_glue.c index 4cebf7fa6..ac3fa2909 100644 --- a/src/lib/gssapi/krb5/s4u_gss_glue.c +++ b/src/lib/gssapi/krb5/s4u_gss_glue.c @@ -21,7 +21,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 "k5-int.h" #include "gssapiP_krb5.h" diff --git a/src/lib/gssapi/krb5/ser_sctx.c b/src/lib/gssapi/krb5/ser_sctx.c index dc679c9d8..ba57511e7 100644 --- a/src/lib/gssapi/krb5/ser_sctx.c +++ b/src/lib/gssapi/krb5/ser_sctx.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/gssapi/krb5/ser_sctx.c - [De]serialization of security context */ /* - * lib/gssapi/krb5/ser_sctx.c - * * Copyright 1995, 2004, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +22,8 @@ * 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. - * */ -/* - * ser_sctx.c - Handle [de]serialization of GSSAPI security context. - */ #include "k5-int.h" #include "gssapiP_krb5.h" diff --git a/src/lib/gssapi/krb5/set_allowable_enctypes.c b/src/lib/gssapi/krb5/set_allowable_enctypes.c index fe88d1b85..7ef4aeedb 100644 --- a/src/lib/gssapi/krb5/set_allowable_enctypes.c +++ b/src/lib/gssapi/krb5/set_allowable_enctypes.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/gssapi/krb5/set_allowable_enctypes.c */ /* - * lib/gssapi/krb5/set_allowable_enctypes.c - * * Copyright 2004 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. - * + */ + +/* * krb5_gss_set_allowable_enctypes() */ diff --git a/src/lib/gssapi/krb5/set_ccache.c b/src/lib/gssapi/krb5/set_ccache.c index 4b6c89065..dcbe024e3 100644 --- a/src/lib/gssapi/krb5/set_ccache.c +++ b/src/lib/gssapi/krb5/set_ccache.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/gssapi/krb5/set_ccache.c */ /* - * lib/gssapi/krb5/set_ccache.c - * * Copyright 1999, 2003 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. - * + */ + +/* * Set ccache name used by gssapi, and optionally obtain old ccache * name. Caller should not free returned name. */ diff --git a/src/lib/gssapi/krb5/store_cred.c b/src/lib/gssapi/krb5/store_cred.c index 65c903b58..7cae1b86d 100644 --- a/src/lib/gssapi/krb5/store_cred.c +++ b/src/lib/gssapi/krb5/store_cred.c @@ -1,7 +1,6 @@ /* -*- mode: c; indent-tabs-mode: nil -*- */ +/* lib/gssapi/krb5/store_cred.c */ /* - * lib/gssapi/krb5/store_cred.c - * * Copyright 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. - * - * */ #include <assert.h> diff --git a/src/lib/gssapi/krb5/val_cred.c b/src/lib/gssapi/krb5/val_cred.c index 2351d9f77..0e1cacd32 100644 --- a/src/lib/gssapi/krb5/val_cred.c +++ b/src/lib/gssapi/krb5/val_cred.c @@ -21,15 +21,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. - * */ #include "gssapiP_krb5.h" -/* - * Check to see whether or not a GSSAPI krb5 credential is valid. If - * it is not, return an error. - */ +/* Check to see whether or not a GSSAPI krb5 credential is valid. If + * it is not, return an error. */ OM_uint32 krb5_gss_validate_cred_1(OM_uint32 *minor_status, gss_cred_id_t cred_handle, diff --git a/src/lib/gssapi/krb5/wrap_size_limit.c b/src/lib/gssapi/krb5/wrap_size_limit.c index b047483cb..c13e22ca6 100644 --- a/src/lib/gssapi/krb5/wrap_size_limit.c +++ b/src/lib/gssapi/krb5/wrap_size_limit.c @@ -21,7 +21,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. - * */ /* * Copyright 1993 by OpenVision Technologies, Inc. diff --git a/src/lib/gssapi/mechglue/g_acquire_cred_imp_name.c b/src/lib/gssapi/mechglue/g_acquire_cred_imp_name.c index 9ba6a1faa..972d1c50c 100644 --- a/src/lib/gssapi/mechglue/g_acquire_cred_imp_name.c +++ b/src/lib/gssapi/mechglue/g_acquire_cred_imp_name.c @@ -22,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. - * */ /* * Copyright 1996 by Sun Microsystems, Inc. @@ -46,9 +45,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * glue routine for gss_acquire_cred_impersonate_name - */ +/* Glue routine for gss_acquire_cred_impersonate_name */ #include "mglueP.h" #include <stdio.h> diff --git a/src/lib/gssapi/mechglue/g_buffer_set.c b/src/lib/gssapi/mechglue/g_buffer_set.c index 38d744dc1..9310ddb4b 100644 --- a/src/lib/gssapi/mechglue/g_buffer_set.c +++ b/src/lib/gssapi/mechglue/g_buffer_set.c @@ -20,7 +20,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 "mglueP.h" diff --git a/src/lib/gssapi/mechglue/g_del_name_attr.c b/src/lib/gssapi/mechglue/g_del_name_attr.c index b72ee3b51..e81e3315a 100644 --- a/src/lib/gssapi/mechglue/g_del_name_attr.c +++ b/src/lib/gssapi/mechglue/g_del_name_attr.c @@ -21,12 +21,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. - * */ -/* - * glue routine for gss_delete_name_attribute - */ +/* Glue routine for gss_delete_name_attribute */ #include "mglueP.h" diff --git a/src/lib/gssapi/mechglue/g_get_name_attr.c b/src/lib/gssapi/mechglue/g_get_name_attr.c index fcd9558dd..d9363c118 100644 --- a/src/lib/gssapi/mechglue/g_get_name_attr.c +++ b/src/lib/gssapi/mechglue/g_get_name_attr.c @@ -21,12 +21,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. - * */ -/* - * glue routine for gss_get_name_attribute - */ +/* Glue routine for gss_get_name_attribute */ #include "mglueP.h" diff --git a/src/lib/gssapi/mechglue/g_inq_context_oid.c b/src/lib/gssapi/mechglue/g_inq_context_oid.c index 469aa7080..ebdeaaee8 100644 --- a/src/lib/gssapi/mechglue/g_inq_context_oid.c +++ b/src/lib/gssapi/mechglue/g_inq_context_oid.c @@ -20,12 +20,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. - * */ -/* - * glue routine for gss_inquire_sec_context_by_oid - */ +/* Glue routine for gss_inquire_sec_context_by_oid */ #include "mglueP.h" diff --git a/src/lib/gssapi/mechglue/g_inq_cred_oid.c b/src/lib/gssapi/mechglue/g_inq_cred_oid.c index 288c08044..4c23dfcbd 100644 --- a/src/lib/gssapi/mechglue/g_inq_cred_oid.c +++ b/src/lib/gssapi/mechglue/g_inq_cred_oid.c @@ -20,12 +20,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. - * */ -/* - * glue routine for gss_inquire_cred_by_oid - */ +/* Glue routine for gss_inquire_cred_by_oid */ #include "mglueP.h" #include <stdio.h> diff --git a/src/lib/gssapi/mechglue/g_inq_name.c b/src/lib/gssapi/mechglue/g_inq_name.c index b2681ead9..915f687af 100644 --- a/src/lib/gssapi/mechglue/g_inq_name.c +++ b/src/lib/gssapi/mechglue/g_inq_name.c @@ -21,12 +21,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. - * */ -/* - * glue routine for gss_inquire_name - */ +/* Glue routine for gss_inquire_name */ #include "mglueP.h" diff --git a/src/lib/gssapi/mechglue/g_map_name_to_any.c b/src/lib/gssapi/mechglue/g_map_name_to_any.c index 3ed19e3c4..ebf49450f 100644 --- a/src/lib/gssapi/mechglue/g_map_name_to_any.c +++ b/src/lib/gssapi/mechglue/g_map_name_to_any.c @@ -21,12 +21,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. - * */ -/* - * glue routine for gss_map_name_to_any - */ +/* Glue routine for gss_map_name_to_any */ #include "mglueP.h" diff --git a/src/lib/gssapi/mechglue/g_mech_invoke.c b/src/lib/gssapi/mechglue/g_mech_invoke.c index 0b8019f92..cb9412e0e 100644 --- a/src/lib/gssapi/mechglue/g_mech_invoke.c +++ b/src/lib/gssapi/mechglue/g_mech_invoke.c @@ -20,12 +20,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. - * */ -/* - * glue routine for gssspi_mech_invoke - */ +/* Glue routine for gssspi_mech_invoke */ #include "mglueP.h" #ifdef HAVE_STDLIB_H diff --git a/src/lib/gssapi/mechglue/g_mechattr.c b/src/lib/gssapi/mechglue/g_mechattr.c index 5f863e38b..663e02ad4 100644 --- a/src/lib/gssapi/mechglue/g_mechattr.c +++ b/src/lib/gssapi/mechglue/g_mechattr.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/gssapi/mechglue/g_mechattr.c */ /* - * src/lib/gssapi/mechglue/g_mechattr.c - * * Copyright (C) 2010 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,10 +22,8 @@ * 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 "mglueP.h" static int diff --git a/src/lib/gssapi/mechglue/g_oid_ops.c b/src/lib/gssapi/mechglue/g_oid_ops.c index f87febfb2..9521d9ade 100644 --- a/src/lib/gssapi/mechglue/g_oid_ops.c +++ b/src/lib/gssapi/mechglue/g_oid_ops.c @@ -1,7 +1,6 @@ /* #pragma ident "@(#)g_oid_ops.c 1.11 98/01/22 SMI" */ +/* lib/gssapi/mechglue/g_oid_ops.c - GSSAPI V2 interfaces to manipulate OIDs */ /* - * lib/gssapi/mechglue/g_oid_ops.c - * * Copyright 1995, 2007 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. - * - */ - -/* - * oid_ops.c - GSS-API V2 interfaces to manipulate OIDs */ #include "mglueP.h" diff --git a/src/lib/gssapi/mechglue/g_prf.c b/src/lib/gssapi/mechglue/g_prf.c index 74a3a21b6..fcca3e44c 100644 --- a/src/lib/gssapi/mechglue/g_prf.c +++ b/src/lib/gssapi/mechglue/g_prf.c @@ -20,12 +20,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. - * */ -/* - * glue routine for gss_pseudo_random - */ +/* Glue routine for gss_pseudo_random */ #include "mglueP.h" diff --git a/src/lib/gssapi/mechglue/g_rel_cred.c b/src/lib/gssapi/mechglue/g_rel_cred.c index 2e9a0c75b..50426d9dd 100644 --- a/src/lib/gssapi/mechglue/g_rel_cred.c +++ b/src/lib/gssapi/mechglue/g_rel_cred.c @@ -22,9 +22,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * glue routine for gss_release_cred - */ +/* Glue routine for gss_release_cred */ #include "mglueP.h" #include <stdio.h> diff --git a/src/lib/gssapi/mechglue/g_rel_name_mapping.c b/src/lib/gssapi/mechglue/g_rel_name_mapping.c index 9420ae80d..f09136afe 100644 --- a/src/lib/gssapi/mechglue/g_rel_name_mapping.c +++ b/src/lib/gssapi/mechglue/g_rel_name_mapping.c @@ -21,12 +21,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. - * */ -/* - * glue routine for gss_release_any_name_mapping - */ +/* Glue routine for gss_release_any_name_mapping */ #include "mglueP.h" diff --git a/src/lib/gssapi/mechglue/g_saslname.c b/src/lib/gssapi/mechglue/g_saslname.c index 4bffdd602..b025d9c93 100644 --- a/src/lib/gssapi/mechglue/g_saslname.c +++ b/src/lib/gssapi/mechglue/g_saslname.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/gssapi/mechglue/g_saslname.c */ /* - * src/lib/gssapi/mechglue/g_saslname.c - * * Copyright (C) 2010 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,10 +22,8 @@ * 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 "mglueP.h" #include <krb5/krb5.h> diff --git a/src/lib/gssapi/mechglue/g_set_context_option.c b/src/lib/gssapi/mechglue/g_set_context_option.c index 6a666dcd5..87db240df 100644 --- a/src/lib/gssapi/mechglue/g_set_context_option.c +++ b/src/lib/gssapi/mechglue/g_set_context_option.c @@ -20,12 +20,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. - * */ -/* - * glue routine for gss_set_sec_context_option - */ +/* Glue routine for gss_set_sec_context_option */ #include "mglueP.h" #ifdef HAVE_STDLIB_H diff --git a/src/lib/gssapi/mechglue/g_set_cred_option.c b/src/lib/gssapi/mechglue/g_set_cred_option.c index 7bb73ed0b..897c84fe0 100644 --- a/src/lib/gssapi/mechglue/g_set_cred_option.c +++ b/src/lib/gssapi/mechglue/g_set_cred_option.c @@ -20,12 +20,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. - * */ -/* - * glue routine for gssspi_set_cred_option - */ +/* Glue routine for gssspi_set_cred_option */ #include "mglueP.h" #include <stdio.h> diff --git a/src/lib/gssapi/mechglue/g_set_name_attr.c b/src/lib/gssapi/mechglue/g_set_name_attr.c index 1ec72fc27..a479762a7 100644 --- a/src/lib/gssapi/mechglue/g_set_name_attr.c +++ b/src/lib/gssapi/mechglue/g_set_name_attr.c @@ -21,12 +21,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. - * */ -/* - * glue routine for gss_set_name_attribute - */ +/* Glue routine for gss_set_name_attribute */ #include "mglueP.h" diff --git a/src/lib/gssapi/mechglue/g_set_neg_mechs.c b/src/lib/gssapi/mechglue/g_set_neg_mechs.c index 167537675..69cac7037 100644 --- a/src/lib/gssapi/mechglue/g_set_neg_mechs.c +++ b/src/lib/gssapi/mechglue/g_set_neg_mechs.c @@ -1,6 +1,5 @@ +/* lib/gssapi/mechglue/g_set_neg_mechs.c - Glue for gss_set_neg_mechs */ /* - * lib/gssapi/mechglue/g_set_neg_mechs.c - * * Copyright (C) 2010 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -22,9 +21,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. - * - * - * Glue routine for gss_set_neg_mechs. */ #include "mglueP.h" diff --git a/src/lib/gssapi/mechglue/mglueP.h b/src/lib/gssapi/mechglue/mglueP.h index 3524ceae4..5edddebaf 100644 --- a/src/lib/gssapi/mechglue/mglueP.h +++ b/src/lib/gssapi/mechglue/mglueP.h @@ -1,12 +1,12 @@ -/* #ident "@(#)mglueP.h 1.2 96/01/18 SMI" */ +/* lib/gssapi/mechglue/mglueP.h */ /* - * This header contains the private mechglue definitions. - * * Copyright (c) 1995, by Sun Microsystems, Inc. * All rights reserved. */ +/* This header contains the private mechglue definitions. */ + #ifndef _GSS_MECHGLUEP_H #define _GSS_MECHGLUEP_H diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c index 073d7fc97..191c0abca 100644 --- a/src/lib/gssapi/spnego/spnego_mech.c +++ b/src/lib/gssapi/spnego/spnego_mech.c @@ -20,9 +20,7 @@ * 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. - * */ - /* * Copyright 2004 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. diff --git a/src/lib/kadm5/admin.h b/src/lib/kadm5/admin.h index 8b59c6b5b..7bcc7fcbc 100644 --- a/src/lib/kadm5/admin.h +++ b/src/lib/kadm5/admin.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/kadm5/admin.h */ /* - * lib/kadm5/admin.h - * * Copyright 2001, 2008 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. - * */ /* * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved diff --git a/src/lib/kadm5/alt_prof.c b/src/lib/kadm5/alt_prof.c index cdd732113..f6ee1c2f8 100644 --- a/src/lib/kadm5/alt_prof.c +++ b/src/lib/kadm5/alt_prof.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/kadm5/alt_prof.c */ /* - * lib/kadm/alt_prof.c - * * Copyright 1995,2001,2008,2009 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,16 +22,13 @@ * 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. - * */ /* * Copyright 2004 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -/* - * alt_prof.c - Implement alternate profile file handling. - */ +/* Implement alternate profile file handling. */ #include "fake-addrinfo.h" #include "k5-int.h" #include <kadm5/admin.h> diff --git a/src/lib/kadm5/logger.c b/src/lib/kadm5/logger.c index b43a96fcd..cddb620a3 100644 --- a/src/lib/kadm5/logger.c +++ b/src/lib/kadm5/logger.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/kadm5/logger.c */ /* - * lib/kadm/logger.c - * * Copyright 1995, 2007 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. - * */ /* KADM5 wants non-syslog log files to contain syslog-like entries */ diff --git a/src/lib/kadm5/srv/kadm5_hook.c b/src/lib/kadm5/srv/kadm5_hook.c index 73016c8bd..c9a630ea9 100644 --- a/src/lib/kadm5/srv/kadm5_hook.c +++ b/src/lib/kadm5/srv/kadm5_hook.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/kadm5/srv/kadm5_hook.c */ /* - * lib/kadm5/srv/kadm5_hook.c - * * Copyright (C) 2010 by the Massachusetts Institute of Technology. * All rights reserved. * diff --git a/src/lib/kadm5/srv/pwqual.c b/src/lib/kadm5/srv/pwqual.c index d1a9f7834..71ffa6644 100644 --- a/src/lib/kadm5/srv/pwqual.c +++ b/src/lib/kadm5/srv/pwqual.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/kadm5/srv/pwqual.c */ /* - * lib/kadm5/srv/pwqual.c - * * Copyright (C) 2010 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. - * + */ + +/* * * Consumer interface for password quality plugins. */ diff --git a/src/lib/kadm5/srv/pwqual_dict.c b/src/lib/kadm5/srv/pwqual_dict.c index 58ece2fe0..778b177b5 100644 --- a/src/lib/kadm5/srv/pwqual_dict.c +++ b/src/lib/kadm5/srv/pwqual_dict.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/kadm5/srv/pwqual_dict.c */ /* - * lib/kadm5/srv/pwqual_dict.c - * * Copyright (C) 2010 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,16 +22,13 @@ * 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. - * - * Dictionary initialization and lookup code is (see top-level NOTICE file for - * license): - * + */ +/* * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved - * - * - * Password quality module to look up passwords within the realm dictionary. */ +/* Password quality module to look up passwords within the realm dictionary. */ + #include "k5-platform.h" #include <krb5/pwqual_plugin.h> #include <sys/types.h> diff --git a/src/lib/kadm5/srv/pwqual_empty.c b/src/lib/kadm5/srv/pwqual_empty.c index 79e7534d5..8c26a13c3 100644 --- a/src/lib/kadm5/srv/pwqual_empty.c +++ b/src/lib/kadm5/srv/pwqual_empty.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/kadm5/srv/pwqual_empty.c */ /* - * lib/kadm5/srv/pwqual_empty.c - * * Copyright (C) 2010 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,11 +22,10 @@ * 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. - * - * - * Password quality module to reject empty passwords. */ +/* Password quality module to reject empty passwords */ + #include "k5-platform.h" #include <krb5/pwqual_plugin.h> #include "server_internal.h" diff --git a/src/lib/kadm5/srv/pwqual_hesiod.c b/src/lib/kadm5/srv/pwqual_hesiod.c index 93ced4f3e..43f4f84b8 100644 --- a/src/lib/kadm5/srv/pwqual_hesiod.c +++ b/src/lib/kadm5/srv/pwqual_hesiod.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/kadm5/srv/pwqual_hesiod.c */ /* - * lib/kadm5/srv/pwqual_hesiod.c - * * Copyright (C) 2010 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,8 +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. - * - * + */ + +/* * Password quality module to check passwords against GECOS fields of Hesiod * passwd information, if the tree is compiled with Hesiod support. */ diff --git a/src/lib/kadm5/srv/pwqual_princ.c b/src/lib/kadm5/srv/pwqual_princ.c index 510980e9e..ff16ccf75 100644 --- a/src/lib/kadm5/srv/pwqual_princ.c +++ b/src/lib/kadm5/srv/pwqual_princ.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/kadm5/srv/pwqual_princ.c */ /* - * lib/kadm5/srv/pwqual_princ.c - * * Copyright (C) 2010 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,11 +22,10 @@ * 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. - * - * - * Password quality module to check passwords against principal components. */ +/* Password quality module to check passwords against principal components */ + #include "k5-platform.h" #include <krb5/pwqual_plugin.h> #include "server_internal.h" diff --git a/src/lib/kadm5/srv/server_acl.c b/src/lib/kadm5/srv/server_acl.c index b8abe8afd..0ca30f44d 100644 --- a/src/lib/kadm5/srv/server_acl.c +++ b/src/lib/kadm5/srv/server_acl.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/kadm5/srv/server_acl.c */ /* - * lib/kadm5/srv/server_acl.c - * * Copyright 1995-2004, 2007, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +22,8 @@ * 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. - * */ -/* - * srv_acl.c - Handle Kerberos ACL related functions. - */ #include <stdio.h> #include <syslog.h> #include <sys/param.h> diff --git a/src/lib/kadm5/srv/server_acl.h b/src/lib/kadm5/srv/server_acl.h index 827da9044..1ca4dfa1d 100644 --- a/src/lib/kadm5/srv/server_acl.h +++ b/src/lib/kadm5/srv/server_acl.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/kadm5/srv/server_acl.h */ /* - * lib/kadm5/srv/server_acl.h - * * Copyright 1995-2004, 2007, 2008 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. - * */ #ifndef SERVER_ACL_H__ diff --git a/src/lib/kadm5/srv/server_misc.c b/src/lib/kadm5/srv/server_misc.c index 5b6171949..907a3c5c9 100644 --- a/src/lib/kadm5/srv/server_misc.c +++ b/src/lib/kadm5/srv/server_misc.c @@ -21,12 +21,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. - * - * check_against_policy code is originally (see top-level NOTICE file for - * license): - * + */ +/* * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved - * */ #include "k5-int.h" diff --git a/src/lib/kadm5/str_conv.c b/src/lib/kadm5/str_conv.c index c6fd435f7..5151d1819 100644 --- a/src/lib/kadm5/str_conv.c +++ b/src/lib/kadm5/str_conv.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/kadm5/str_conv.c */ /* - * lib/kadm/str_conv.c - * * Copyright 1995 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +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. - * */ -/* - * str_conv.c - Convert between strings and Kerberos internal data. - */ +/* Convert between strings and Kerberos internal data. */ /* * Table of contents: diff --git a/src/lib/kdb/decrypt_key.c b/src/lib/kdb/decrypt_key.c index dbbd9476c..541064d88 100644 --- a/src/lib/kdb/decrypt_key.c +++ b/src/lib/kdb/decrypt_key.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/kdb/decrypt_key.c */ /* - * lib/kdb/decrypt_key.c - * * Copyright 1990,1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,11 +22,7 @@ * 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_kdb_encrypt_key(), krb5_kdb_decrypt_key functions */ - /* * Copyright (C) 1998 by the FundsXpress, INC. * diff --git a/src/lib/kdb/encrypt_key.c b/src/lib/kdb/encrypt_key.c index 5e6e4e46f..2ca463276 100644 --- a/src/lib/kdb/encrypt_key.c +++ b/src/lib/kdb/encrypt_key.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/kdb/encrypt_key.c */ /* - * lib/kdb/encrypt_key.c - * * Copyright 1990,1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,11 +22,7 @@ * 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_kdb_encrypt_key(), krb5_kdb_decrypt_key functions */ - /* * Copyright (C) 1998 by the FundsXpress, INC. * diff --git a/src/lib/kdb/kdb5int.h b/src/lib/kdb/kdb5int.h index 9d63ca86c..56570ceac 100644 --- a/src/lib/kdb/kdb5int.h +++ b/src/lib/kdb/kdb5int.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/kdb/kdb5int.h - Private header for kdb5 library */ /* - * lib/kdb5/kdb5int.h - * * Copyright (C) 2008 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,9 +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. - * - * - * Private header file for the kdb5 library for internal functions */ #ifndef __KDB5INT_H__ diff --git a/src/lib/kdb/kdb_convert.c b/src/lib/kdb/kdb_convert.c index 20bcc31e8..2799b443b 100644 --- a/src/lib/kdb/kdb_convert.c +++ b/src/lib/kdb/kdb_convert.c @@ -145,8 +145,7 @@ find_changed_attrs(krb5_db_entry *current, krb5_db_entry *new, } -/* - */ +/* Initialize *u with a copy of d. Return 0 on success, -1 on failure. */ static int data_to_utf8str(utf8str_t *u, krb5_data d) { diff --git a/src/lib/kdb/kdb_cpw.c b/src/lib/kdb/kdb_cpw.c index a2dff2ef9..88811e71b 100644 --- a/src/lib/kdb/kdb_cpw.c +++ b/src/lib/kdb/kdb_cpw.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/kdb/kdb_cpw.c */ /* - * lib/kdb/kdb_cpw.c - * * Copyright 1995, 2009 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +22,7 @@ * 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. - * */ - /* * Copyright (C) 1998 by the FundsXpress, INC. * diff --git a/src/lib/kdb/kdb_default.c b/src/lib/kdb/kdb_default.c index 18de7c75a..9763d6e80 100644 --- a/src/lib/kdb/kdb_default.c +++ b/src/lib/kdb/kdb_default.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/kdb/kdb_default.c */ /* - * lib/kdb/kdb_helper.c - * * Copyright 1995, 2009 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +22,7 @@ * 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. - * */ - /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. diff --git a/src/lib/kdb/keytab.c b/src/lib/kdb/keytab.c index dbbbe75cd..00b45f810 100644 --- a/src/lib/kdb/keytab.c +++ b/src/lib/kdb/keytab.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/kdb/keytab.c */ /* - * kadmin/v5server/keytab.c - * * Copyright 1995 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,8 +22,8 @@ * 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 <string.h> #include "k5-int.h" diff --git a/src/lib/krb5/asn.1/asn1_decode.c b/src/lib/krb5/asn.1/asn1_decode.c index a3883cd48..659fed86c 100644 --- a/src/lib/krb5/asn.1/asn1_decode.c +++ b/src/lib/krb5/asn.1/asn1_decode.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/asn.1/asn1_decode.c */ /* - * src/lib/krb5/asn.1/asn1_decode.c - * * Copyright 1994, 2003 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/asn.1/asn1_decode.h b/src/lib/krb5/asn.1/asn1_decode.h index 09bb6415d..d495040c8 100644 --- a/src/lib/krb5/asn.1/asn1_decode.h +++ b/src/lib/krb5/asn.1/asn1_decode.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/asn.1/asn1_decode.h */ /* - * src/lib/krb5/asn.1/asn1_decode.h - * * Copyright 1994 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/asn.1/asn1_encode.c b/src/lib/krb5/asn.1/asn1_encode.c index a32830653..a9077093d 100644 --- a/src/lib/krb5/asn.1/asn1_encode.c +++ b/src/lib/krb5/asn.1/asn1_encode.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/asn.1/asn1_encode.c */ /* - * src/lib/krb5/asn.1/asn1_encode.c - * * Copyright 1994, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/asn.1/asn1_encode.h b/src/lib/krb5/asn.1/asn1_encode.h index 59d53ab8d..a17a20cb2 100644 --- a/src/lib/krb5/asn.1/asn1_encode.h +++ b/src/lib/krb5/asn.1/asn1_encode.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/asn.1/asn1_encode.h */ /* - * src/lib/krb5/asn.1/asn1_encode.h - * * Copyright 1994, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/asn.1/asn1_get.c b/src/lib/krb5/asn.1/asn1_get.c index 99761f47a..11934c31c 100644 --- a/src/lib/krb5/asn.1/asn1_get.c +++ b/src/lib/krb5/asn.1/asn1_get.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/asn.1/asn1_get.c */ /* - * src/lib/krb5/asn.1/asn1_get.c - * * Copyright 1994 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/asn.1/asn1_get.h b/src/lib/krb5/asn.1/asn1_get.h index c2d3f0339..6bf78ef11 100644 --- a/src/lib/krb5/asn.1/asn1_get.h +++ b/src/lib/krb5/asn.1/asn1_get.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/asn.1/asn1_get.h */ /* - * src/lib/krb5/asn.1/asn1_get.h - * * Copyright 1994 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/asn.1/asn1_k_decode.c b/src/lib/krb5/asn.1/asn1_k_decode.c index 365d18aaf..e2ba5757f 100644 --- a/src/lib/krb5/asn.1/asn1_k_decode.c +++ b/src/lib/krb5/asn.1/asn1_k_decode.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/asn.1/asn1_k_decode.c */ /* - * src/lib/krb5/asn.1/asn1_k_decode.c - * * Copyright 1994, 2007, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/asn.1/asn1_k_decode.h b/src/lib/krb5/asn.1/asn1_k_decode.h index 79a4a05e4..8f7bf0ccd 100644 --- a/src/lib/krb5/asn.1/asn1_k_decode.h +++ b/src/lib/krb5/asn.1/asn1_k_decode.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/asn.1/asn1_k_decode.h */ /* - * src/lib/krb5/asn.1/asn1_k_decode.h - * * Copyright 1994 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/asn.1/asn1_k_decode_fast.c b/src/lib/krb5/asn.1/asn1_k_decode_fast.c index 8007371bc..6d9ddd436 100644 --- a/src/lib/krb5/asn.1/asn1_k_decode_fast.c +++ b/src/lib/krb5/asn.1/asn1_k_decode_fast.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/asn.1/asn1_k_decode_fast.c */ /* - * src/lib/krb5/asn.1/asn1_k_decode_fast.c - * * Copyright 1994, 2007, 2008, 2010 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/asn.1/asn1_k_decode_kdc.c b/src/lib/krb5/asn.1/asn1_k_decode_kdc.c index d8499bb7a..52c371b9b 100644 --- a/src/lib/krb5/asn.1/asn1_k_decode_kdc.c +++ b/src/lib/krb5/asn.1/asn1_k_decode_kdc.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/asn.1/asn1_k_decode_kdc.c */ /* - * src/lib/krb5/asn.1/asn1_k_decode_kdc.c - * * Copyright 1994, 2007, 2008, 2010 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/asn.1/asn1_k_decode_macros.h b/src/lib/krb5/asn.1/asn1_k_decode_macros.h index 24580af66..4160b10d6 100644 --- a/src/lib/krb5/asn.1/asn1_k_decode_macros.h +++ b/src/lib/krb5/asn.1/asn1_k_decode_macros.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/asn.1/asn1_k_decode_macros.h */ /* - * src/lib/krb5/asn.1/asn1_k_decode_macros.h - * * Copyright 1994, 2007, 2008, 2010 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/asn.1/asn1_k_decode_sam.c b/src/lib/krb5/asn.1/asn1_k_decode_sam.c index 083e5435c..ae4e42f4b 100644 --- a/src/lib/krb5/asn.1/asn1_k_decode_sam.c +++ b/src/lib/krb5/asn.1/asn1_k_decode_sam.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/asn.1/asn1_k_decode_sam.c */ /* - * src/lib/krb5/asn.1/asn1_k_decode_sam.c - * * Copyright 1994, 2007, 2008, 2010 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/asn.1/asn1_k_encode.c b/src/lib/krb5/asn.1/asn1_k_encode.c index ae88c5880..746b9128c 100644 --- a/src/lib/krb5/asn.1/asn1_k_encode.c +++ b/src/lib/krb5/asn.1/asn1_k_encode.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/asn.1/asn1_k_encode.c */ /* - * src/lib/krb5/asn.1/asn1_k_encode.c - * * Copyright 1994, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/asn.1/asn1_k_encode.h b/src/lib/krb5/asn.1/asn1_k_encode.h index 818119c80..604ca6a21 100644 --- a/src/lib/krb5/asn.1/asn1_k_encode.h +++ b/src/lib/krb5/asn.1/asn1_k_encode.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/asn.1/asn1_k_encode.h */ /* - * src/lib/krb5/asn.1/asn1_k_encode.h - * * Copyright 1994, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/asn.1/asn1_make.c b/src/lib/krb5/asn.1/asn1_make.c index 39fa95766..310282d99 100644 --- a/src/lib/krb5/asn.1/asn1_make.c +++ b/src/lib/krb5/asn.1/asn1_make.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/asn.1/asn1_make.c */ /* - * src/lib/krb5/asn.1/asn1_make.c - * * Copyright 1994 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/asn.1/asn1_make.h b/src/lib/krb5/asn.1/asn1_make.h index dcbaa16c4..c07bf8cca 100644 --- a/src/lib/krb5/asn.1/asn1_make.h +++ b/src/lib/krb5/asn.1/asn1_make.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/asn.1/asn1_make.h */ /* - * src/lib/krb5/asn.1/asn1_make.h - * * Copyright 1994 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/asn.1/asn1_misc.c b/src/lib/krb5/asn.1/asn1_misc.c index bc0696688..cfe18a527 100644 --- a/src/lib/krb5/asn.1/asn1_misc.c +++ b/src/lib/krb5/asn.1/asn1_misc.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/asn.1/asn1_misc.c */ /* - * src/lib/krb5/asn.1/asn1_misc.c - * * Copyright 1994 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/asn.1/asn1_misc.h b/src/lib/krb5/asn.1/asn1_misc.h index 7d6832162..88948d2a7 100644 --- a/src/lib/krb5/asn.1/asn1_misc.h +++ b/src/lib/krb5/asn.1/asn1_misc.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/asn.1/asn1_misc.h */ /* - * src/lib/krb5/asn.1/asn1_misc.h - * * Copyright 1994 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/asn.1/asn1glue.h b/src/lib/krb5/asn.1/asn1glue.h index 25cd4509e..31839eac9 100644 --- a/src/lib/krb5/asn.1/asn1glue.h +++ b/src/lib/krb5/asn.1/asn1glue.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/asn.1/asn1glue.h */ /* - * lib/krb5/asn.1/asn1glue.h - * * Copyright 1989,1990 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. - * + */ + +/* * * Header file for some glue functions (macros, mostly) */ diff --git a/src/lib/krb5/asn.1/krb5_decode.c b/src/lib/krb5/asn.1/krb5_decode.c index 0fa8e0434..6cee3d681 100644 --- a/src/lib/krb5/asn.1/krb5_decode.c +++ b/src/lib/krb5/asn.1/krb5_decode.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/asn.1/krb5_decode.c */ /* - * src/lib/krb5/asn.1/krb5_decode.c - * * Copyright 1994, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/asn.1/krb5_decode_kdc.c b/src/lib/krb5/asn.1/krb5_decode_kdc.c index e888d71aa..21a3ec232 100644 --- a/src/lib/krb5/asn.1/krb5_decode_kdc.c +++ b/src/lib/krb5/asn.1/krb5_decode_kdc.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/asn.1/krb5_decode_kdc.c */ /* - * src/lib/krb5/asn.1/krb5_decode_kdc.c - * * Copyright 1994, 2008. 2010 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/asn.1/krb5_decode_macros.h b/src/lib/krb5/asn.1/krb5_decode_macros.h index a77e74bac..fc8670500 100644 --- a/src/lib/krb5/asn.1/krb5_decode_macros.h +++ b/src/lib/krb5/asn.1/krb5_decode_macros.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/asn.1/krb5_decode_macros.h */ /* - * src/lib/krb5/asn.1/krb5_decode_macros.h - * * Copyright 1994, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/asn.1/krb5_encode.c b/src/lib/krb5/asn.1/krb5_encode.c index 3947579ea..0f61b5d53 100644 --- a/src/lib/krb5/asn.1/krb5_encode.c +++ b/src/lib/krb5/asn.1/krb5_encode.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/asn.1/krb5_encode.c */ /* - * src/lib/krb5/asn.1/krb5_encode.c - * * Copyright 1994, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/ccache/cc-int.h b/src/lib/krb5/ccache/cc-int.h index 685426546..97fed6362 100644 --- a/src/lib/krb5/ccache/cc-int.h +++ b/src/lib/krb5/ccache/cc-int.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/ccache/cc-int.h */ /* - * lib/krb5/ccache/file/cc-int.h - * * Copyright 1990,1991 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. - * - * - * This file contains constant and function declarations used in the - * file-based credential cache routines. */ +/* This file contains constant and function declarations used in the + * file-based credential cache routines. */ + #ifndef __KRB5_CCACHE_H__ #define __KRB5_CCACHE_H__ diff --git a/src/lib/krb5/ccache/cc_file.c b/src/lib/krb5/ccache/cc_file.c index 0dce7686e..117cdd546 100644 --- a/src/lib/krb5/ccache/cc_file.c +++ b/src/lib/krb5/ccache/cc_file.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/ccache/cc_file.c - File-based credential cache */ /* - * lib/krb5/ccache/cc_file.c - * * Copyright 1990,1991,1992,1993,1994,2000,2004,2007 Massachusetts Institute of Technology. * All Rights Reserved. * @@ -25,9 +24,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. - * - * - * implementation of file-based credentials cache */ /* diff --git a/src/lib/krb5/ccache/cc_keyring.c b/src/lib/krb5/ccache/cc_keyring.c index 9841ed5fc..2c77c3cda 100644 --- a/src/lib/krb5/ccache/cc_keyring.c +++ b/src/lib/krb5/ccache/cc_keyring.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/ccache/cc_keyring.c */ /* - * lib/krb5/ccache/cc_keyring.c - * * Copyright (c) 2006 * The Regents of the University of Michigan * ALL RIGHTS RESERVED @@ -29,11 +28,10 @@ * OUT OF OR IN CONNECTION WITH THE USE OF THE SOFTWARE, EVEN * IF IT HAS BEEN OR IS HEREAFTER ADVISED OF THE POSSIBILITY OF * SUCH DAMAGES. - * */ /* - * Copyright 1990,1991,1992,1993,1994,2000,2004 Massachusetts Institute of Technology. - * All Rights Reserved. + * Copyright 1990,1991,1992,1993,1994,2000,2004 Massachusetts Institute of + * Technology. All Rights Reserved. * * Original stdio support copyright 1995 by Cygnus Support. * diff --git a/src/lib/krb5/ccache/cc_memory.c b/src/lib/krb5/ccache/cc_memory.c index 578b5ddc5..5ce6a0e6c 100644 --- a/src/lib/krb5/ccache/cc_memory.c +++ b/src/lib/krb5/ccache/cc_memory.c @@ -1,9 +1,8 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/ccache/cc_memory.c - Memory-based credential cache */ /* - * lib/krb5/ccache/cc_memory.c - * - * Copyright 1990,1991,2000,2004,2008 by the Massachusetts Institute of Technology. - * All Rights Reserved. + * Copyright 1990,1991,2000,2004,2008 by the Massachusetts Institute of + * Technology. All Rights Reserved. * * Export of this software from the United States of America may * require a specific license from the United States Government. @@ -23,10 +22,8 @@ * 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. - * - * - * implementation of memory-based credentials cache */ + #include "cc-int.h" #include <errno.h> diff --git a/src/lib/krb5/ccache/cc_mslsa.c b/src/lib/krb5/ccache/cc_mslsa.c index 826794f89..9727b4fea 100644 --- a/src/lib/krb5/ccache/cc_mslsa.c +++ b/src/lib/krb5/ccache/cc_mslsa.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/ccache/cc_mslsa.c */ /* - * lib/krb5/ccache/cc_mslsa.c - * * Copyright 2007 Secure Endpoints Inc. * * Copyright 2003,2004 by the Massachusetts Institute of Technology. diff --git a/src/lib/krb5/ccache/cc_retr.c b/src/lib/krb5/ccache/cc_retr.c index c2e305f90..52ea8cdfe 100644 --- a/src/lib/krb5/ccache/cc_retr.c +++ b/src/lib/krb5/ccache/cc_retr.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/ccache/cc_retr.c */ /* - * lib/krb5/ccache/cc_retr.c - * * Copyright 1990,1991,1999,2007,2008 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. - * - * */ #include "k5-int.h" diff --git a/src/lib/krb5/ccache/ccapi/stdcc.c b/src/lib/krb5/ccache/ccapi/stdcc.c index de2bc9d32..b646b761b 100644 --- a/src/lib/krb5/ccache/ccapi/stdcc.c +++ b/src/lib/krb5/ccache/ccapi/stdcc.c @@ -1,13 +1,8 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/ccache/ccapi/stdcc.c - ccache API support functions */ /* - * stdcc.c - additions to the Kerberos 5 library to support the memory - * credentical cache API - * - * Written by Frank Dabek July 1998 - * Updated by Jeffrey Altman June 2006 - * - * Copyright 1998, 1999, 2006, 2008 by the Massachusetts Institute of Technology. - * All Rights Reserved. + * Copyright 1998, 1999, 2006, 2008 by the Massachusetts Institute of + * Technology. All Rights Reserved. * * Export of this software from the United States of America may * require a specific license from the United States Government. @@ -27,7 +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. - * + */ + +/* + * Written by Frank Dabek July 1998 + * Updated by Jeffrey Altman June 2006 */ #if defined(_WIN32) || defined(USE_CCAPI) diff --git a/src/lib/krb5/ccache/ccbase.c b/src/lib/krb5/ccache/ccbase.c index ab163b3d1..6a113346a 100644 --- a/src/lib/krb5/ccache/ccbase.c +++ b/src/lib/krb5/ccache/ccbase.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/ccache/ccbase.c - Registration functions for ccache */ /* - * lib/krb5/ccache/ccbase.c - * * Copyright 1990,2004,2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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. - * - * - * Registration functions for ccache. */ #include "k5-int.h" diff --git a/src/lib/krb5/ccache/cccursor.c b/src/lib/krb5/ccache/cccursor.c index 4272c0461..3d9bb7c8b 100644 --- a/src/lib/krb5/ccache/cccursor.c +++ b/src/lib/krb5/ccache/cccursor.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/ccache/cccursor.c */ /* - * lib/krb5/ccache/cccursor.c - * * Copyright 2006, 2007 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. - * + */ + +/* * cursor for sequential traversal of ccaches */ diff --git a/src/lib/krb5/ccache/ccdefault.c b/src/lib/krb5/ccache/ccdefault.c index a4498d069..e43b1638b 100644 --- a/src/lib/krb5/ccache/ccdefault.c +++ b/src/lib/krb5/ccache/ccdefault.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/ccache/ccdefault.c - Find default credential cache */ /* - * lib/krb5/ccache/ccdefault.c - * * Copyright 1990, 2007, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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. - * - * - * Find default credential cache */ #include "k5-int.h" diff --git a/src/lib/krb5/ccache/ccdefops.c b/src/lib/krb5/ccache/ccdefops.c index e517a2543..abe0c6d83 100644 --- a/src/lib/krb5/ccache/ccdefops.c +++ b/src/lib/krb5/ccache/ccdefops.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/ccache/ccdefops.c */ /* - * lib/krb5/ccache/ccdefops.c - * * Copyright 1990 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. - * - * - * Default credentials cache determination. This is a separate file - * so that the user can more easily override it. */ +/* Default credentials cache determination. This is a separate file + * so that the user can more easily override it. */ + #include "k5-int.h" #if defined(USE_CCAPI) diff --git a/src/lib/krb5/ccache/ccfns.c b/src/lib/krb5/ccache/ccfns.c index 01acd22f2..0a23738da 100644 --- a/src/lib/krb5/ccache/ccfns.c +++ b/src/lib/krb5/ccache/ccfns.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/ccache/ccfns.c */ /* - * lib/krb5/ccache/ccfns.c - * * Copyright 2000, 2007, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/ccache/fcc.h b/src/lib/krb5/ccache/fcc.h index 7ca60da8b..7524e12d8 100644 --- a/src/lib/krb5/ccache/fcc.h +++ b/src/lib/krb5/ccache/fcc.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/ccache/fcc.h */ /* - * lib/krb5/ccache/file/fcc.h - * * Copyright 1990,1991 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. - * + */ + +/* * * This file contains constant and function declarations used in the * file-based credential cache routines. diff --git a/src/lib/krb5/ccache/scc.h b/src/lib/krb5/ccache/scc.h index c6b5254ba..70d4a36e5 100644 --- a/src/lib/krb5/ccache/scc.h +++ b/src/lib/krb5/ccache/scc.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/ccache/scc.h */ /* - * lib/krb5/ccache/stdio/scc.h - * * Copyright 1990,1991 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. - * + */ + +/* * * This file contains constant and function declarations used in the * file-based credential cache routines. diff --git a/src/lib/krb5/ccache/ser_cc.c b/src/lib/krb5/ccache/ser_cc.c index 2438dd670..3821b0ece 100644 --- a/src/lib/krb5/ccache/ser_cc.c +++ b/src/lib/krb5/ccache/ser_cc.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/ccache/ser_cc.c - Serialize credential cache context */ /* - * lib/krb5/ccache/ser_rc.c - * * Copyright 1995 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +22,8 @@ * 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. - * */ -/* - * ser_rcdfl.c - Serialize replay cache context. - */ #include "k5-int.h" /* diff --git a/src/lib/krb5/ccache/t_cc.c b/src/lib/krb5/ccache/t_cc.c index 8d4023feb..e14ae7f80 100644 --- a/src/lib/krb5/ccache/t_cc.c +++ b/src/lib/krb5/ccache/t_cc.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/ccache/t_cc.c */ /* - * lib/krb5/ccache/scc_test.c - * * Copyright 2000 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,11 +22,8 @@ * 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 "k5-int.h" #include <stdio.h> #include <stdlib.h> diff --git a/src/lib/krb5/ccache/t_cccursor.c b/src/lib/krb5/ccache/t_cccursor.c index 1e4f4b9e5..355484f6f 100644 --- a/src/lib/krb5/ccache/t_cccursor.c +++ b/src/lib/krb5/ccache/t_cccursor.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/ccache/t_cccursor.c */ /* - * lib/krb5/ccache/t_cccursor.c - * * Copyright 2006 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 "autoconf.h" diff --git a/src/lib/krb5/ccache/t_memory.c b/src/lib/krb5/ccache/t_memory.c index 924341069..6d103a00d 100644 --- a/src/lib/krb5/ccache/t_memory.c +++ b/src/lib/krb5/ccache/t_memory.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/ccache/t_memory.c */ /* - * lib/krb5/ccache/file/mcc_test.c - * * Copyright 1990 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,11 +22,8 @@ * 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 "mcc.h" krb5_data client1 = { diff --git a/src/lib/krb5/ccache/t_stdio.c b/src/lib/krb5/ccache/t_stdio.c index 0917f5c4f..15185e301 100644 --- a/src/lib/krb5/ccache/t_stdio.c +++ b/src/lib/krb5/ccache/t_stdio.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/ccache/t_stdio.c */ /* - * lib/krb5/ccache/stdio/scc_test.c - * * Copyright 1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,11 +22,8 @@ * 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 "scc.h" krb5_data client1 = { diff --git a/src/lib/krb5/error_tables/init_ets.c b/src/lib/krb5/error_tables/init_ets.c index 66ef74721..e5e50c7e1 100644 --- a/src/lib/krb5/error_tables/init_ets.c +++ b/src/lib/krb5/error_tables/init_ets.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/error_tables/init_ets.c - Initialize krb5 library error tables */ /* - * lib/krb5/error_tables/init_ets.c - * * Copyright 1990 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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. - * - * - * Initialize Kerberos library error tables. */ #include "k5-int.h" diff --git a/src/lib/krb5/keytab/kt-int.h b/src/lib/krb5/keytab/kt-int.h index 383d346f7..ebefe8090 100644 --- a/src/lib/krb5/keytab/kt-int.h +++ b/src/lib/krb5/keytab/kt-int.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/keytab/kt-int.h */ /* - * lib/krb5/keytab/kt-int.h - * * Copyright 2004 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. - * + */ + +/* * * This file contains constant and function declarations used in the * file-based credential cache routines. diff --git a/src/lib/krb5/keytab/kt_file.c b/src/lib/krb5/keytab/kt_file.c index 677a1971e..f2e26db8b 100644 --- a/src/lib/krb5/keytab/kt_file.c +++ b/src/lib/krb5/keytab/kt_file.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/keytab/kt_file.c */ /* - * lib/krb5/keytab/kt_file.c - * * Copyright 1990,1991,1995,2007,2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,7 +22,33 @@ * 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. + */ +/* + * Copyright (c) Hewlett-Packard Company 1991 + * Released to the Massachusetts Institute of Technology for inclusion + * in the Kerberos source code distribution. + * + * Copyright 1990,1991 by the Massachusetts Institute of Technology. + * All Rights Reserved. + * + * Export of this software from the United States of America may + * require a specific license from the United States Government. + * It is the responsibility of any person or organization contemplating + * export to obtain such a license before exporting. * + * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and + * distribute this software and its documentation for any purpose and + * without fee is hereby granted, provided that the above copyright + * notice appear in all copies and that both that copyright notice and + * this permission notice appear in supporting documentation, and that + * the name of M.I.T. not be used in advertising or publicity pertaining + * to distribution of the software without specific, written prior + * permission. Furthermore if you modify this software you must label + * your software as modified software and not distribute it in such a + * fashion that it might be confused with the original M.I.T. software. + * 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. */ #ifndef LEAN_CLIENT @@ -940,36 +965,9 @@ const krb5_kt_ops krb5_kt_dfl_ops = { &krb5_ktfile_ser_entry }; +/* Formerly lib/krb5/keytab/file/ktf_util.c */ + /* - * lib/krb5/keytab/file/ktf_util.c - * - * Copyright (c) Hewlett-Packard Company 1991 - * Released to the Massachusetts Institute of Technology for inclusion - * in the Kerberos source code distribution. - * - * Copyright 1990,1991 by the Massachusetts Institute of Technology. - * All Rights Reserved. - * - * Export of this software from the United States of America may - * require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. Furthermore if you modify this software you must label - * your software as modified software and not distribute it in such a - * fashion that it might be confused with the original M.I.T. software. - * 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 function contains utilities for the file based implementation of * the keytab. There are no public functions in this file. * diff --git a/src/lib/krb5/keytab/kt_memory.c b/src/lib/krb5/keytab/kt_memory.c index 54bbaf004..5ec304af0 100644 --- a/src/lib/krb5/keytab/kt_memory.c +++ b/src/lib/krb5/keytab/kt_memory.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/keytab/kt_memory.c */ /* - * lib/krb5/keytab/kt_memory.c - * * Copyright 2007 by Secure Endpoints Inc. * * Permission is hereby granted, free of charge, to any person diff --git a/src/lib/krb5/keytab/kt_srvtab.c b/src/lib/krb5/keytab/kt_srvtab.c index 01bd1ed73..2ca616684 100644 --- a/src/lib/krb5/keytab/kt_srvtab.c +++ b/src/lib/krb5/keytab/kt_srvtab.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/keytab/kt_srvtab.c */ /* - * lib/krb5/keytab/srvtab/kts_resolv.c - * * Copyright 1990,1991,2002,2007,2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -24,6 +23,33 @@ * this software for any purpose. It is provided "as is" without express * or implied warranty. */ +/* + * Copyright (c) Hewlett-Packard Company 1991 + * Released to the Massachusetts Institute of Technology for inclusion + * in the Kerberos source code distribution. + * + * Copyright 1990,1991 by the Massachusetts Institute of Technology. + * All Rights Reserved. + * + * Export of this software from the United States of America may + * require a specific license from the United States Government. + * It is the responsibility of any person or organization contemplating + * export to obtain such a license before exporting. + * + * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and + * distribute this software and its documentation for any purpose and + * without fee is hereby granted, provided that the above copyright + * notice appear in all copies and that both that copyright notice and + * this permission notice appear in supporting documentation, and that + * the name of M.I.T. not be used in advertising or publicity pertaining + * to distribution of the software without specific, written prior + * permission. Furthermore if you modify this software you must label + * your software as modified software and not distribute it in such a + * fashion that it might be confused with the original M.I.T. software. + * 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 "k5-int.h" #include <stdio.h> @@ -311,39 +337,7 @@ const struct _krb5_kt_ops krb5_kts_ops = { 0 }; -/* - * formerly: lib/krb5/keytab/srvtab/kts_util.c - * - * Copyright (c) Hewlett-Packard Company 1991 - * Released to the Massachusetts Institute of Technology for inclusion - * in the Kerberos source code distribution. - * - * Copyright 1990,1991 by the Massachusetts Institute of Technology. - * All Rights Reserved. - * - * Export of this software from the United States of America may - * require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. Furthermore if you modify this software you must label - * your software as modified software and not distribute it in such a - * fashion that it might be confused with the original M.I.T. software. - * 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 function contains utilities for the srvtab based implementation - * of the keytab. There are no public functions in this file. - */ +/* formerly: lib/krb5/keytab/srvtab/kts_util.c */ #include <stdio.h> diff --git a/src/lib/krb5/keytab/ktadd.c b/src/lib/krb5/keytab/ktadd.c index 10bb24649..71f47e7fb 100644 --- a/src/lib/krb5/keytab/ktadd.c +++ b/src/lib/krb5/keytab/ktadd.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/keytab/ktadd.c */ /* - * lib/krb5/keytab/ktadd.c - * * Copyright 1990,2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_kt_add_entry() */ #include "k5-int.h" diff --git a/src/lib/krb5/keytab/ktbase.c b/src/lib/krb5/keytab/ktbase.c index b88380e27..564e11199 100644 --- a/src/lib/krb5/keytab/ktbase.c +++ b/src/lib/krb5/keytab/ktbase.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/keytab/ktbase.c - Registration functions for keytab */ /* - * lib/krb5/keytab/ktbase.c - * * Copyright 1990,2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,8 +22,8 @@ * 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. - * - * + */ +/* * Copyright 2007 by Secure Endpoints Inc. * * Permission is hereby granted, free of charge, to any person @@ -46,8 +45,6 @@ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. - * - * Registration functions for keytab. */ #include "k5-int.h" diff --git a/src/lib/krb5/keytab/ktdefault.c b/src/lib/krb5/keytab/ktdefault.c index 7a4d68f1b..7ee94edae 100644 --- a/src/lib/krb5/keytab/ktdefault.c +++ b/src/lib/krb5/keytab/ktdefault.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/keytab/ktdefault.c */ /* - * lib/krb5/keytab/ktdefault.c - * * Copyright 1990,2008 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. - * + */ + +/* * * Get a default keytab. */ diff --git a/src/lib/krb5/keytab/ktfns.c b/src/lib/krb5/keytab/ktfns.c index 33c91844d..a06689c4d 100644 --- a/src/lib/krb5/keytab/ktfns.c +++ b/src/lib/krb5/keytab/ktfns.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/keytab/ktfns.c */ /* - * lib/krb5/keytab/ktfns.c - * * Copyright 2001,2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/keytab/ktfr_entry.c b/src/lib/krb5/keytab/ktfr_entry.c index 8fdbda2fc..c00484071 100644 --- a/src/lib/krb5/keytab/ktfr_entry.c +++ b/src/lib/krb5/keytab/ktfr_entry.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/keytab/ktfr_entry.c */ /* - * lib/krb5/keytab/ktfr_entry.c - * * Copyright 1990, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,10 +22,8 @@ * 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_kt_free_entry() */ + #ifndef LEAN_CLIENT #include "k5-int.h" diff --git a/src/lib/krb5/keytab/ktremove.c b/src/lib/krb5/keytab/ktremove.c index 1ccefd842..da6a4dffb 100644 --- a/src/lib/krb5/keytab/ktremove.c +++ b/src/lib/krb5/keytab/ktremove.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/keytab/ktremove.c */ /* - * lib/krb5/keytab/ktremove.c - * * Copyright 1990,2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,10 +22,8 @@ * 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_kt_remove_entry() */ + #ifndef LEAN_CLIENT #include "k5-int.h" diff --git a/src/lib/krb5/keytab/read_servi.c b/src/lib/krb5/keytab/read_servi.c index 0172edbb0..5d5edffc2 100644 --- a/src/lib/krb5/keytab/read_servi.c +++ b/src/lib/krb5/keytab/read_servi.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/keytab/read_servi.c */ /* - * lib/krb5/keytab/read_servi.c - * * Copyright 1990,2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,8 +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. - * - * + */ + +/* * This routine is designed to be passed to krb5_rd_req. * It is a convenience function that reads a key out of a keytab. * It handles all of the opening and closing of the keytab diff --git a/src/lib/krb5/keytab/t_keytab.c b/src/lib/krb5/keytab/t_keytab.c index be7f68411..6e8707649 100644 --- a/src/lib/krb5/keytab/t_keytab.c +++ b/src/lib/krb5/keytab/t_keytab.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/keytab/t_keytab.c - Tests for keytab interface */ /* - * lib/krb5/keytab/t_keytab.c - * * Copyright (C) 2007 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,13 +22,8 @@ * 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. - * - * - * - * A set of tests for the keytab interface */ - #include "k5-int.h" #include "autoconf.h" #include <stdio.h> diff --git a/src/lib/krb5/krb/addr_comp.c b/src/lib/krb5/krb/addr_comp.c index 194fc2bb6..12177e6ef 100644 --- a/src/lib/krb5/krb/addr_comp.c +++ b/src/lib/krb5/krb/addr_comp.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/addr_comp.c */ /* - * lib/krb5/krb/addr_comp.c - * * Copyright 1990 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_address_compare() */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/addr_order.c b/src/lib/krb5/krb/addr_order.c index b742d01ec..e9ea0ba8c 100644 --- a/src/lib/krb5/krb/addr_order.c +++ b/src/lib/krb5/krb/addr_order.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/addr_order.c */ /* - * lib/krb5/krb/addr_order.c - * * Copyright 1990 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_address_order() */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/addr_srch.c b/src/lib/krb5/krb/addr_srch.c index 7a6030490..113c52097 100644 --- a/src/lib/krb5/krb/addr_srch.c +++ b/src/lib/krb5/krb/addr_srch.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/addr_srch.c */ /* - * lib/krb5/krb/addr_srch.c - * * Copyright 1990 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_address_search() */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/allow_weak.c b/src/lib/krb5/krb/allow_weak.c index 1290d1f79..1c8873757 100644 --- a/src/lib/krb5/krb/allow_weak.c +++ b/src/lib/krb5/krb/allow_weak.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/allow_weak.c */ /* - * lib/krb5/krb/allow_weak.c - * * Copyright (C) 2010 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,9 +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. - * - * - * Implements krb5_allow_weak_crypto. */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/auth_con.c b/src/lib/krb5/krb/auth_con.c index 65c87667d..42e548271 100644 --- a/src/lib/krb5/krb/auth_con.c +++ b/src/lib/krb5/krb/auth_con.c @@ -1,8 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ - +/* lib/krb5/krb/auth_con.c */ /* - * lib/krb5/krb/auth_con.c - * * Copyright 2010 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -24,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 "k5-int.h" diff --git a/src/lib/krb5/krb/authdata.h b/src/lib/krb5/krb/authdata.h index af5016ebb..7108fd32d 100644 --- a/src/lib/krb5/krb/authdata.h +++ b/src/lib/krb5/krb/authdata.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/authdata.h */ /* - * lib/krb5/krb/authdata.h - * * Copyright (C) 2009 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,10 +22,8 @@ * 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. - * - * - * <<< Description >>> */ + #ifndef KRB_AUTHDATA_H #define KRB_AUTHDATA_H diff --git a/src/lib/krb5/krb/authdata_dec.c b/src/lib/krb5/krb/authdata_dec.c index b244b32a5..5c9efbb16 100644 --- a/src/lib/krb5/krb/authdata_dec.c +++ b/src/lib/krb5/krb/authdata_dec.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/authdata_dec.c */ /* - * lib/krb5/krb/copy_auth.c - * * Copyright 1990 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,10 +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_decode_authdata_container() - * krb5_verify_authdata_kdc_issued() - * */ /* * Copyright (c) 2006-2008, Novell, Inc. diff --git a/src/lib/krb5/krb/authdata_enc.c b/src/lib/krb5/krb/authdata_enc.c index 007a4c16d..3f7b38971 100644 --- a/src/lib/krb5/krb/authdata_enc.c +++ b/src/lib/krb5/krb/authdata_enc.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/authdata_enc.c */ /* - * lib/krb5/krb/copy_auth.c - * * Copyright 1990 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,10 +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_encode_authdata_container() - * krb5_make_authdata_kdc_issued() - * */ /* * Copyright (c) 2006-2008, Novell, Inc. diff --git a/src/lib/krb5/krb/bld_pr_ext.c b/src/lib/krb5/krb/bld_pr_ext.c index 899b9ee3b..9c6a4dcce 100644 --- a/src/lib/krb5/krb/bld_pr_ext.c +++ b/src/lib/krb5/krb/bld_pr_ext.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/bld_pr_ext.c */ /* - * lib/krb5/krb/bld_pr_ext.c - * * Copyright 1991, 2008, 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. - * + */ + +/* * * Build a principal from a list of lengths and strings */ diff --git a/src/lib/krb5/krb/bld_princ.c b/src/lib/krb5/krb/bld_princ.c index 372f6c991..4b979a391 100644 --- a/src/lib/krb5/krb/bld_princ.c +++ b/src/lib/krb5/krb/bld_princ.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/bld_princ.c - Build a principal from a list of strings */ /* - * lib/krb5/krb/bld_princ.c - * * Copyright 1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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. - * - * - * Build a principal from a list of strings */ #include <stdarg.h> diff --git a/src/lib/krb5/krb/brand.c b/src/lib/krb5/krb/brand.c index c7b8a61dc..60662d5b0 100644 --- a/src/lib/krb5/krb/brand.c +++ b/src/lib/krb5/krb/brand.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/brand.c */ /* - * lib/krb5/krb/brand.c - * * Copyright (C) 2004 by the Massachusetts Institute of Technology. * All rights reserved. * diff --git a/src/lib/krb5/krb/chk_trans.c b/src/lib/krb5/krb/chk_trans.c index 64ccb3030..0d42c97dc 100644 --- a/src/lib/krb5/krb/chk_trans.c +++ b/src/lib/krb5/krb/chk_trans.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/chk_trans.c */ /* - * lib/krb5/krb/chk_trans.c - * * Copyright 2001, 2007 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,10 +22,8 @@ * 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_check_transited_list() */ + #include "k5-int.h" #include <stdarg.h> diff --git a/src/lib/krb5/krb/conv_princ.c b/src/lib/krb5/krb/conv_princ.c index 5f63f465a..17b5ccc18 100644 --- a/src/lib/krb5/krb/conv_princ.c +++ b/src/lib/krb5/krb/conv_princ.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/conv_princ.c */ /* - * lib/krb5/krb/conv_princ.c - * * Copyright 1992 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. - * + */ + +/* * Build a principal from a V4 specification, or separate a V5 * principal into name, instance, and realm. * diff --git a/src/lib/krb5/krb/copy_addrs.c b/src/lib/krb5/krb/copy_addrs.c index da55f992d..494bccf92 100644 --- a/src/lib/krb5/krb/copy_addrs.c +++ b/src/lib/krb5/krb/copy_addrs.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/copy_addrs.c */ /* - * lib/krb5/krb/copy_addrs.c - * * Copyright 1990 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_copy_addresses() */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/copy_athctr.c b/src/lib/krb5/krb/copy_athctr.c index 9b942ba25..81473d08e 100644 --- a/src/lib/krb5/krb/copy_athctr.c +++ b/src/lib/krb5/krb/copy_athctr.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/copy_athctr.c */ /* - * lib/krb5/krb/copy_athctr.c - * * Copyright 1990,1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,10 +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_copy_authenticator() - * krb5_auth_con_getauthenticator() */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/copy_auth.c b/src/lib/krb5/krb/copy_auth.c index 2accc3423..a22d8cbb8 100644 --- a/src/lib/krb5/krb/copy_auth.c +++ b/src/lib/krb5/krb/copy_auth.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/copy_auth.c */ /* - * lib/krb5/krb/copy_auth.c - * * Copyright 1990 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_merge_authdata() - * krb5_copy_authdata() */ /* * Copyright (c) 2006-2008, Novell, Inc. diff --git a/src/lib/krb5/krb/copy_cksum.c b/src/lib/krb5/krb/copy_cksum.c index 68822d213..90b677b43 100644 --- a/src/lib/krb5/krb/copy_cksum.c +++ b/src/lib/krb5/krb/copy_cksum.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/copy_cksum.c */ /* - * lib/krb5/krb/copy_cksum.c - * * Copyright 1990 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_copy_checksum() */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/copy_creds.c b/src/lib/krb5/krb/copy_creds.c index 0e1a814cc..42372a14f 100644 --- a/src/lib/krb5/krb/copy_creds.c +++ b/src/lib/krb5/krb/copy_creds.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/copy_creds.c */ /* - * lib/krb5/krb/copy_creds.c - * * Copyright 1990,1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_copy_cred() */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/copy_ctx.c b/src/lib/krb5/krb/copy_ctx.c index d916c26b2..c52472119 100644 --- a/src/lib/krb5/krb/copy_ctx.c +++ b/src/lib/krb5/krb/copy_ctx.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/copy_ctx.c */ /* - * lib/krb5/krb/copy_ctx.c - * * Copyright 1994,1999,2000, 2002, 2003, 2007, 2008, 2009 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,10 +22,7 @@ * 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_copy_contex() */ - /* * Copyright (C) 1998 by the FundsXpress, INC. * diff --git a/src/lib/krb5/krb/copy_data.c b/src/lib/krb5/krb/copy_data.c index fa4b6ed7c..9969e0424 100644 --- a/src/lib/krb5/krb/copy_data.c +++ b/src/lib/krb5/krb/copy_data.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/copy_data.c */ /* - * lib/krb5/krb/copy_data.c - * * Copyright 1990,1991,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. - * + */ + +/* * * krb5_copy_data() */ diff --git a/src/lib/krb5/krb/copy_key.c b/src/lib/krb5/krb/copy_key.c index 532cced46..26d9b7d53 100644 --- a/src/lib/krb5/krb/copy_key.c +++ b/src/lib/krb5/krb/copy_key.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/copy_key.c */ /* - * lib/krb5/krb/copy_key.c - * * Copyright 1990,1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,18 +22,14 @@ * 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_copy_keyblock() */ #include "k5-int.h" -/* - * Copy a keyblock, including alloc'ed storage. - */ +/* Copy a keyblock, including alloc'ed storage. */ krb5_error_code KRB5_CALLCONV -krb5_copy_keyblock(krb5_context context, const krb5_keyblock *from, krb5_keyblock **to) +krb5_copy_keyblock(krb5_context context, const krb5_keyblock *from, + krb5_keyblock **to) { return krb5int_c_copy_keyblock(context, from, to); } diff --git a/src/lib/krb5/krb/copy_princ.c b/src/lib/krb5/krb/copy_princ.c index b7badefa2..3db027e17 100644 --- a/src/lib/krb5/krb/copy_princ.c +++ b/src/lib/krb5/krb/copy_princ.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/copy_princ.c */ /* - * lib/krb5/krb/copy_princ.c - * * Copyright 1990, 2009 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_copy_principal() */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/copy_tick.c b/src/lib/krb5/krb/copy_tick.c index db0815315..c3e33ff82 100644 --- a/src/lib/krb5/krb/copy_tick.c +++ b/src/lib/krb5/krb/copy_tick.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/copy_tick.c */ /* - * lib/krb5/krb/copy_tick.c - * * Copyright 1990,1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_copy_ticket() */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/cp_key_cnt.c b/src/lib/krb5/krb/cp_key_cnt.c index 2f97dbd0c..18cb0f21f 100644 --- a/src/lib/krb5/krb/cp_key_cnt.c +++ b/src/lib/krb5/krb/cp_key_cnt.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/cp_key_cnt.c */ /* - * lib/krb5/krb/cp_key_cnt.c - * * Copyright 1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_copy_keyblock() */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/decode_kdc.c b/src/lib/krb5/krb/decode_kdc.c index f998a4676..b149f0f01 100644 --- a/src/lib/krb5/krb/decode_kdc.c +++ b/src/lib/krb5/krb/decode_kdc.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/decode_kdc.c */ /* - * lib/krb5/krb/decode_kdc.c - * * Copyright 1990 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_decode_kdc_rep() function. */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/decrypt_tk.c b/src/lib/krb5/krb/decrypt_tk.c index 7ce411552..db75c0fa4 100644 --- a/src/lib/krb5/krb/decrypt_tk.c +++ b/src/lib/krb5/krb/decrypt_tk.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/decrypt_tk.c */ /* - * lib/krb5/krb/decrypt_tk.c - * * Copyright 1990 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_decrypt_tkt_part() function. */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/deltat.c b/src/lib/krb5/krb/deltat.c index 36c0d0e95..58aacce00 100644 --- a/src/lib/krb5/krb/deltat.c +++ b/src/lib/krb5/krb/deltat.c @@ -1,6 +1,4 @@ -/* A Bison parser, made by GNU Bison 1.875d. */ - -/* Skeleton parser for Yacc-like parsing with Bison, +/* Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -18,6 +16,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* A Bison parser, made by GNU Bison 1.875d. */ +/* Skeleton parser for Yacc-like parsing with Bison. */ + /* As a special exception, when this file is copied by Bison into a Bison output file, you may use that output file without restriction. This special exception was added by the Free Software Foundation diff --git a/src/lib/krb5/krb/enc_helper.c b/src/lib/krb5/krb/enc_helper.c index 0a45857d1..b9bf94c2e 100644 --- a/src/lib/krb5/krb/enc_helper.c +++ b/src/lib/krb5/krb/enc_helper.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/enc_helper.c */ /* - * lib/krb5/krb/enc_helper.c - * * Copyright (C) 1998 by the FundsXpress, INC. * * All rights reserved. @@ -25,9 +24,6 @@ * 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. - * - * krb5_encrypt_helper() - * */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/enc_keyhelper.c b/src/lib/krb5/krb/enc_keyhelper.c index 43db716e4..40ac4af15 100644 --- a/src/lib/krb5/krb/enc_keyhelper.c +++ b/src/lib/krb5/krb/enc_keyhelper.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/enc_keyhelper.c */ /* - * lib/krb5/krb/enc_keyhelper.c - * * Copyright (C) 1998 by the FundsXpress, INC. * * All rights reserved. diff --git a/src/lib/krb5/krb/encode_kdc.c b/src/lib/krb5/krb/encode_kdc.c index c86bd4cd5..5e652d9fa 100644 --- a/src/lib/krb5/krb/encode_kdc.c +++ b/src/lib/krb5/krb/encode_kdc.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/encode_kdc.c */ /* - * lib/krb5/krb/encode_kdc.c - * * Copyright 1990 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_encode_kdc_rep() function. */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/encrypt_tk.c b/src/lib/krb5/krb/encrypt_tk.c index acf9c6fa4..7fcd0ffc8 100644 --- a/src/lib/krb5/krb/encrypt_tk.c +++ b/src/lib/krb5/krb/encrypt_tk.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/encrypt_tk.c */ /* - * lib/krb5/krb/encrypt_tk.c - * * Copyright 1990 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_encrypt_tkt_part() routine. */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/etype_list.c b/src/lib/krb5/krb/etype_list.c index a7fe0d514..a56155f04 100644 --- a/src/lib/krb5/krb/etype_list.c +++ b/src/lib/krb5/krb/etype_list.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/etype_list.c */ /* - * lib/krb5/krb/etype_list.c - * * Copyright (C) 2010 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. - * + */ + +/* * * Helper functions related to zero-terminated lists of enctypes. */ diff --git a/src/lib/krb5/krb/fast.c b/src/lib/krb5/krb/fast.c index 3137195ae..3939f0e4a 100644 --- a/src/lib/krb5/krb/fast.c +++ b/src/lib/krb5/krb/fast.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/fast.c */ /* - * lib/krb5/krb/fast.c - * * Copyright (C) 2009 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,9 +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 <k5-int.h> diff --git a/src/lib/krb5/krb/fast.h b/src/lib/krb5/krb/fast.h index 26a3eff7d..522821d05 100644 --- a/src/lib/krb5/krb/fast.h +++ b/src/lib/krb5/krb/fast.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/fast.h */ /* - * lib/krb5/krb/fast.h - * * Copyright (C) 2009 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,9 +22,8 @@ * 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. - * - * */ + #ifndef KRB_FAST_H #define KRB_FAST_H diff --git a/src/lib/krb5/krb/fwd_tgt.c b/src/lib/krb5/krb/fwd_tgt.c index 5725e4931..c3981276d 100644 --- a/src/lib/krb5/krb/fwd_tgt.c +++ b/src/lib/krb5/krb/fwd_tgt.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/fwd_tgt.c */ /* - * lib/krb5/krb/get_in_tkt.c - * * Copyright 1995 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/krb/gc_via_tkt.c b/src/lib/krb5/krb/gc_via_tkt.c index 5bee608a7..525de0c09 100644 --- a/src/lib/krb5/krb/gc_via_tkt.c +++ b/src/lib/krb5/krb/gc_via_tkt.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/gc_via_tkt.c */ /* - * lib/krb5/krb/gc_via_tgt.c - * * Copyright 1990,1991,2007-2009 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,8 +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. - * - * + */ + +/* * Given a tkt, and a target cred, get it. * Assumes that the kdc_rep has been decrypted. */ diff --git a/src/lib/krb5/krb/gen_save_subkey.c b/src/lib/krb5/krb/gen_save_subkey.c index b7f63d2d9..801eed43e 100644 --- a/src/lib/krb5/krb/gen_save_subkey.c +++ b/src/lib/krb5/krb/gen_save_subkey.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/gen_save_subkey.c */ /* - * lib/krb5/krb/gen_save_subkey.c - * * Copyright 2009 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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. - * - * - * krb5int_generate_and_save_subkey() */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/gen_seqnum.c b/src/lib/krb5/krb/gen_seqnum.c index 8703457be..7ac282122 100644 --- a/src/lib/krb5/krb/gen_seqnum.c +++ b/src/lib/krb5/krb/gen_seqnum.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/gen_seqnum.c */ /* - * lib/krb5/krb/gen_seqnum.c - * * Copyright 1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,8 +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. - * - * + */ + +/* * Routine to automatically generate a starting sequence number. * We do this by getting a random key and encrypting something with it, * then taking the output and slicing it up. diff --git a/src/lib/krb5/krb/gen_subkey.c b/src/lib/krb5/krb/gen_subkey.c index 7739f04ef..45f7b18e7 100644 --- a/src/lib/krb5/krb/gen_subkey.c +++ b/src/lib/krb5/krb/gen_subkey.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/gen_subkey.c - Generate a subsession key based on input key */ /* - * lib/krb5/krb/gen_subkey.c - * * Copyright 1991, 2002 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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. - * - * - * Routine to automatically generate a subsession key based on an input key. */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/get_creds.c b/src/lib/krb5/krb/get_creds.c index cf216b707..dcce7ed08 100644 --- a/src/lib/krb5/krb/get_creds.c +++ b/src/lib/krb5/krb/get_creds.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/get_creds.c */ /* - * lib/krb5/krb/get_creds.c - * * Copyright 1990, 2008, 2010 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,26 +22,20 @@ * 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_get_credentials() */ - - /* - Attempts to use the credentials cache or TGS exchange to get an additional - ticket for the - client identified by in_creds->client, the server identified by - in_creds->server, with options options, expiration date specified in - in_creds->times.endtime (0 means as long as possible), session key type - specified in in_creds->keyblock.enctype (if non-zero) - - Any returned ticket and intermediate ticket-granting tickets are - stored in ccache. - - returns errors from encryption routines, system errors -*/ + * Attempts to use the credentials cache or TGS exchange to get an additional + * ticket for the client identified by in_creds->client, the server identified + * by in_creds->server, with options options, expiration date specified in + * in_creds->times.endtime (0 means as long as possible), session key type + * specified in in_creds->keyblock.enctype (if non-zero) + * + * Any returned ticket and intermediate ticket-granting tickets are stored in + * ccache. + * + * Returns errors from encryption routines, system errors. + */ #include "k5-int.h" #include "int-proto.h" diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c index 71d1e127f..b87eb07b7 100644 --- a/src/lib/krb5/krb/get_in_tkt.c +++ b/src/lib/krb5/krb/get_in_tkt.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/get_in_tkt.c */ /* - * lib/krb5/krb/get_in_tkt.c - * * Copyright 1990,1991, 2003, 2008 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. - * - * */ #include <string.h> diff --git a/src/lib/krb5/krb/gic_keytab.c b/src/lib/krb5/krb/gic_keytab.c index c4c6d3205..88de6a8fe 100644 --- a/src/lib/krb5/krb/gic_keytab.c +++ b/src/lib/krb5/krb/gic_keytab.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/gic_keytab.c */ /* - * lib/krb5/krb/gic_keytab.c - * * Copyright (C) 2002, 2003, 2008 by the Massachusetts Institute of Technology. * All rights reserved. * diff --git a/src/lib/krb5/krb/in_tkt_sky.c b/src/lib/krb5/krb/in_tkt_sky.c index f2888e5d4..bd8b7713a 100644 --- a/src/lib/krb5/krb/in_tkt_sky.c +++ b/src/lib/krb5/krb/in_tkt_sky.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/in_tkt_sky.c */ /* - * lib/krb5/krb/in_tkt_sky.c - * * Copyright 1990,1991, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,10 +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_get_in_tkt_with_skey() - * */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c index 4eae4d743..cd0685df3 100644 --- a/src/lib/krb5/krb/init_ctx.c +++ b/src/lib/krb5/krb/init_ctx.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/init_ctx.c */ /* - * lib/krb5/krb/init_ctx.c - * * Copyright 1994,1999,2000, 2002, 2003, 2007, 2008, 2009 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,10 +22,7 @@ * 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_contex() */ - /* * Copyright (C) 1998 by the FundsXpress, INC. * diff --git a/src/lib/krb5/krb/init_keyblock.c b/src/lib/krb5/krb/init_keyblock.c index 6fe663015..7e24cbdea 100644 --- a/src/lib/krb5/krb/init_keyblock.c +++ b/src/lib/krb5/krb/init_keyblock.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/init_keyblock.c - Set up an empty keyblock */ /* - * lib/krb5/krb/init_keyblock.c - * * Copyright (C) 2002 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,14 +22,8 @@ * 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 "k5-int.h" #include <assert.h> @@ -38,5 +31,5 @@ krb5_error_code KRB5_CALLCONV krb5_init_keyblock(krb5_context context, krb5_enctype enctype, size_t length, krb5_keyblock **out) { - return krb5int_c_init_keyblock (context, enctype, length, out); + return krb5int_c_init_keyblock(context, enctype, length, out); } diff --git a/src/lib/krb5/krb/int-proto.h b/src/lib/krb5/krb/int-proto.h index babfeb0a2..fe1461575 100644 --- a/src/lib/krb5/krb/int-proto.h +++ b/src/lib/krb5/krb/int-proto.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/int-proto.h - Prototypes for libkrb5 internal functions */ /* - * lib/krb5/krb/int-proto.h - * * Copyright 1990,1991 the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +22,8 @@ * 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. - * - * - * Function prototypes for Kerberos V5 library internal functions. */ - #ifndef KRB5_INT_FUNC_PROTO__ #define KRB5_INT_FUNC_PROTO__ diff --git a/src/lib/krb5/krb/kdc_rep_dc.c b/src/lib/krb5/krb/kdc_rep_dc.c index dfd3ba29f..0aedcb7a4 100644 --- a/src/lib/krb5/krb/kdc_rep_dc.c +++ b/src/lib/krb5/krb/kdc_rep_dc.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/kdc_rep_dc.c */ /* - * lib/krb5/krb/kdc_rep_dc.c - * * Copyright 1990 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_kdc_rep_decrypt_proc() */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/kerrs.c b/src/lib/krb5/krb/kerrs.c index 7525e29a1..b94fd82b7 100644 --- a/src/lib/krb5/krb/kerrs.c +++ b/src/lib/krb5/krb/kerrs.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/kerrs.c - Error message functions */ /* - * lib/krb5/krb/kerrs.c - * * Copyright 2006 Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +22,8 @@ * 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. - * - * error-message functions */ + #include <stdarg.h> #include "k5-int.h" diff --git a/src/lib/krb5/krb/kfree.c b/src/lib/krb5/krb/kfree.c index 476a513bb..31e786cd8 100644 --- a/src/lib/krb5/krb/kfree.c +++ b/src/lib/krb5/krb/kfree.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/kfree.c */ /* - * lib/krb5/free/f_addr.c - * * Copyright 1990-1998, 2009 by the Massachusetts Institute of Technology. * * Export of this software from the United States of America may @@ -22,9 +21,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_free_address() */ /* * Copyright (c) 2006-2008, Novell, Inc. diff --git a/src/lib/krb5/krb/libdef_parse.c b/src/lib/krb5/krb/libdef_parse.c index 7919a2de5..05b912dd0 100644 --- a/src/lib/krb5/krb/libdef_parse.c +++ b/src/lib/krb5/krb/libdef_parse.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/libdef_parse.c */ /* - * lib/krb5/krb/libdef_parse.c - * * Copyright 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. - * + */ + +/* * krb5int_libdefault_string() * krb5int_libdefault_boolean() * diff --git a/src/lib/krb5/krb/mk_error.c b/src/lib/krb5/krb/mk_error.c index 44fd3b4c2..d1acd0281 100644 --- a/src/lib/krb5/krb/mk_error.c +++ b/src/lib/krb5/krb/mk_error.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/mk_error.c */ /* - * lib/krb5/krb/mk_error.c - * * Copyright 1990,1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_mk_error() routine. */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/mk_priv.c b/src/lib/krb5/krb/mk_priv.c index dc781b7ab..6d87d05d6 100644 --- a/src/lib/krb5/krb/mk_priv.c +++ b/src/lib/krb5/krb/mk_priv.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/mk_priv.c */ /* - * lib/krb5/krb/mk_priv.c - * * Copyright 1990,1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_mk_priv() */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/mk_rep.c b/src/lib/krb5/krb/mk_rep.c index af024042b..0681a224f 100644 --- a/src/lib/krb5/krb/mk_rep.c +++ b/src/lib/krb5/krb/mk_rep.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/mk_rep.c */ /* - * lib/krb5/krb/mk_rep.c - * * Copyright 1990 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_mk_rep() */ /* * Copyright (c) 2006-2008, Novell, Inc. diff --git a/src/lib/krb5/krb/mk_req.c b/src/lib/krb5/krb/mk_req.c index ceb60cbf4..542ef6d4a 100644 --- a/src/lib/krb5/krb/mk_req.c +++ b/src/lib/krb5/krb/mk_req.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/mk_req.c */ /* - * lib/krb5/krb/mk_req.c - * * Copyright 1990,1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_mk_req() routine. */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/mk_req_ext.c b/src/lib/krb5/krb/mk_req_ext.c index 1979b8d63..1938cbe9f 100644 --- a/src/lib/krb5/krb/mk_req_ext.c +++ b/src/lib/krb5/krb/mk_req_ext.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/mk_req_ext.c */ /* - * lib/krb5/krb/mk_req_ext.c - * * Copyright 1990,1991 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. - * + */ + +/* * * krb5_mk_req_extended() */ diff --git a/src/lib/krb5/krb/mk_safe.c b/src/lib/krb5/krb/mk_safe.c index 1f17c6080..428a5e892 100644 --- a/src/lib/krb5/krb/mk_safe.c +++ b/src/lib/krb5/krb/mk_safe.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/mk_safe.c */ /* - * lib/krb5/krb/mk_safe.c - * * Copyright 1990,1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_mk_safe() */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/pac.c b/src/lib/krb5/krb/pac.c index 067bb17c6..84aecec84 100644 --- a/src/lib/krb5/krb/pac.c +++ b/src/lib/krb5/krb/pac.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/pac.c */ /* - * lib/krb5/krb/pac.c - * * Copyright 2008 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 "k5-int.h" diff --git a/src/lib/krb5/krb/pac_sign.c b/src/lib/krb5/krb/pac_sign.c index 7cee3a9ed..ae11a0c02 100644 --- a/src/lib/krb5/krb/pac_sign.c +++ b/src/lib/krb5/krb/pac_sign.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/pac_sign.c */ /* - * lib/krb5/krb/pac.c - * * Copyright 2008 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. - * - * krb5int_pac_sign() */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/parse.c b/src/lib/krb5/krb/parse.c index b78cc4311..14ac02d4b 100644 --- a/src/lib/krb5/krb/parse.c +++ b/src/lib/krb5/krb/parse.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/parse.c */ /* - * lib/krb5/krb/parse.c - * * Copyright 1990,1991,2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,8 +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. - * - * + */ + +/* * krb5_parse_name() routine. * * Rewritten by Theodore Ts'o to properly handle arbitrary quoted diff --git a/src/lib/krb5/krb/pkinit_apple_asn1.c b/src/lib/krb5/krb/pkinit_apple_asn1.c index 12b5215be..f968e05b7 100644 --- a/src/lib/krb5/krb/pkinit_apple_asn1.c +++ b/src/lib/krb5/krb/pkinit_apple_asn1.c @@ -21,11 +21,11 @@ * 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. - * */ /* - * pkinit_apple_asn1.c - ASN.1 encode/decode routines for PKINIT, Mac OS X version + * pkinit_apple_asn1.c - ASN.1 encode/decode routines for PKINIT, Mac OS X + * version * * Created 19 May 2004 by Doug Mitchell. */ diff --git a/src/lib/krb5/krb/pkinit_apple_cert_store.c b/src/lib/krb5/krb/pkinit_apple_cert_store.c index 2bcbd4458..4785b2f69 100644 --- a/src/lib/krb5/krb/pkinit_apple_cert_store.c +++ b/src/lib/krb5/krb/pkinit_apple_cert_store.c @@ -21,7 +21,6 @@ * 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. - * */ /* diff --git a/src/lib/krb5/krb/pkinit_apple_client.c b/src/lib/krb5/krb/pkinit_apple_client.c index b2b6cb990..6183d8b15 100644 --- a/src/lib/krb5/krb/pkinit_apple_client.c +++ b/src/lib/krb5/krb/pkinit_apple_client.c @@ -21,7 +21,6 @@ * 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. - * */ /* diff --git a/src/lib/krb5/krb/pkinit_apple_cms.c b/src/lib/krb5/krb/pkinit_apple_cms.c index f11b4ee64..e399ea5fb 100644 --- a/src/lib/krb5/krb/pkinit_apple_cms.c +++ b/src/lib/krb5/krb/pkinit_apple_cms.c @@ -21,7 +21,6 @@ * 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. - * */ /* diff --git a/src/lib/krb5/krb/plugin.c b/src/lib/krb5/krb/plugin.c index 0df393ad9..be909f144 100644 --- a/src/lib/krb5/krb/plugin.c +++ b/src/lib/krb5/krb/plugin.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/plugin.c - Plugin framework functions */ /* - * lib/krb5/krb/plugin.c - * * Copyright (C) 2010 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,9 +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. - * - * - * Plugin framework functions */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/pr_to_salt.c b/src/lib/krb5/krb/pr_to_salt.c index 505c56805..416c1efed 100644 --- a/src/lib/krb5/krb/pr_to_salt.c +++ b/src/lib/krb5/krb/pr_to_salt.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/pr_to_salt.c */ /* - * lib/krb5/krb/pr_to_salt.c - * * Copyright 1990 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_principal2salt() */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/princ_comp.c b/src/lib/krb5/krb/princ_comp.c index 3565f2c82..9d834878a 100644 --- a/src/lib/krb5/krb/princ_comp.c +++ b/src/lib/krb5/krb/princ_comp.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/princ_comp.c - Compare two principals for equality */ /* - * lib/krb5/krb/princ_comp.c - * * Copyright 1990,1991,2007 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,10 +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. - * - * - * compare two principals, returning a krb5_boolean true if equal, false if - * not. */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/rd_error.c b/src/lib/krb5/krb/rd_error.c index 39d9acdeb..dbb6798c0 100644 --- a/src/lib/krb5/krb/rd_error.c +++ b/src/lib/krb5/krb/rd_error.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/rd_error.c */ /* - * lib/krb5/krb/rd_error.c - * * Copyright 1990,1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,21 +22,16 @@ * 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_rd_error() routine */ #include "k5-int.h" /* - * Parses an error message from enc_errbuf and returns an allocated - * structure which contain the error message. - * - * Upon return dec_error will point to allocated storage which the - * caller should free when finished. + * Parse an error message from enc_errbuf and return an allocated structure + * containing the error message. Upon return, dec_error will point to + * allocated storage which the caller should free when finished. * - * returns system errors + * Returns system errors. */ krb5_error_code KRB5_CALLCONV diff --git a/src/lib/krb5/krb/rd_priv.c b/src/lib/krb5/krb/rd_priv.c index a6c79300c..64b191af8 100644 --- a/src/lib/krb5/krb/rd_priv.c +++ b/src/lib/krb5/krb/rd_priv.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/rd_priv.c */ /* - * lib/krb5/krb/rd_priv.c - * * Copyright 1990,1991,2007 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_rd_priv() */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/rd_rep.c b/src/lib/krb5/krb/rd_rep.c index 2fdb2a04a..1ace4ca1e 100644 --- a/src/lib/krb5/krb/rd_rep.c +++ b/src/lib/krb5/krb/rd_rep.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/rd_rep.c */ /* - * lib/krb5/krb/rd_rep.c - * * Copyright 1990,1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_rd_rep() */ /* * Copyright (c) 2006-2008, Novell, Inc. diff --git a/src/lib/krb5/krb/rd_req.c b/src/lib/krb5/krb/rd_req.c index 4e12e5b36..5ad77c106 100644 --- a/src/lib/krb5/krb/rd_req.c +++ b/src/lib/krb5/krb/rd_req.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/rd_req.c */ /* - * lib/krb5/krb/rd_req.c - * * Copyright 1990,1991, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_rd_req() */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/rd_req_dec.c b/src/lib/krb5/krb/rd_req_dec.c index 80d5cc50f..83c4ef714 100644 --- a/src/lib/krb5/krb/rd_req_dec.c +++ b/src/lib/krb5/krb/rd_req_dec.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/rd_req_dec.c */ /* - * lib/krb5/krb/rd_req_dec.c - * * Copyright (c) 1994 CyberSAFE Corporation. * Copyright 1990,1991,2007,2008 by the Massachusetts Institute of Technology. * All Rights Reserved. diff --git a/src/lib/krb5/krb/rd_safe.c b/src/lib/krb5/krb/rd_safe.c index 2f29d48c9..baeb281e3 100644 --- a/src/lib/krb5/krb/rd_safe.c +++ b/src/lib/krb5/krb/rd_safe.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/rd_safe.c - definition of krb5_rd_safe() */ /* - * lib/krb5/krb/rd_safe.c - definition of krb5_rd_safe() - * * Copyright 1990,1991,2007,2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_rd_safe() */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/recvauth.c b/src/lib/krb5/krb/recvauth.c index 90746ba5c..aa6e3785f 100644 --- a/src/lib/krb5/krb/recvauth.c +++ b/src/lib/krb5/krb/recvauth.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/recvauth.c */ /* - * lib/krb5/krb/recvauth.c - * * Copyright 1991 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. - * + */ + +/* * * convenience sendauth/recvauth functions */ diff --git a/src/lib/krb5/krb/s4u_creds.c b/src/lib/krb5/krb/s4u_creds.c index da6dd0c99..e79ab86c6 100644 --- a/src/lib/krb5/krb/s4u_creds.c +++ b/src/lib/krb5/krb/s4u_creds.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/s4u_creds.c */ /* - * lib/krb5/krb/s4u_creds.c - * * Copyright (C) 2009 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,9 +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 "k5-int.h" diff --git a/src/lib/krb5/krb/send_tgs.c b/src/lib/krb5/krb/send_tgs.c index 41ab4ec61..36acca5f1 100644 --- a/src/lib/krb5/krb/send_tgs.c +++ b/src/lib/krb5/krb/send_tgs.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/send_tgs.c */ /* - * lib/krb5/krb/send_tgs.c - * * Copyright 1990,1991,2009 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_send_tgs() */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/sendauth.c b/src/lib/krb5/krb/sendauth.c index 30b72b937..dc0c6e863 100644 --- a/src/lib/krb5/krb/sendauth.c +++ b/src/lib/krb5/krb/sendauth.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/sendauth.c */ /* - * lib/krb5/krb/sendauth.c - * * Copyright 1991, 2009 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +22,8 @@ * 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. - * - * - * convenience sendauth/recvauth functions */ - #include "k5-int.h" #include "com_err.h" #include "auth_con.h" diff --git a/src/lib/krb5/krb/ser_actx.c b/src/lib/krb5/krb/ser_actx.c index ccd1e2df7..4ac81128a 100644 --- a/src/lib/krb5/krb/ser_actx.c +++ b/src/lib/krb5/krb/ser_actx.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/ser_actx.c - Serialize krb5_auth_context structure */ /* - * lib/krb5/krb/ser_actx.c - * * Copyright 1995, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +22,8 @@ * 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. - * */ -/* - * ser_actx.c - Serialize krb5_auth_context structure. - */ #include "k5-int.h" #include "int-proto.h" #include "auth_con.h" diff --git a/src/lib/krb5/krb/ser_adata.c b/src/lib/krb5/krb/ser_adata.c index 77a76fdae..9f18f8efc 100644 --- a/src/lib/krb5/krb/ser_adata.c +++ b/src/lib/krb5/krb/ser_adata.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/ser_adata.c - Serialize krb5_authdata structure */ /* - * lib/krb5/krb/ser_adata.c - * * Copyright 1995, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +22,8 @@ * 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. - * */ -/* - * ser_adata.c - Serialize a krb5_authdata structure. - */ #include "k5-int.h" #include "int-proto.h" diff --git a/src/lib/krb5/krb/ser_addr.c b/src/lib/krb5/krb/ser_addr.c index e7b642130..46a8391ce 100644 --- a/src/lib/krb5/krb/ser_addr.c +++ b/src/lib/krb5/krb/ser_addr.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/ser_addr.c - Serialize krb5_address structure */ /* - * lib/krb5/krb/ser_addr.c - * * Copyright 1995, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +22,8 @@ * 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. - * */ -/* - * ser_addr.c - Serialize a krb5_address structure. - */ #include "k5-int.h" #include "int-proto.h" diff --git a/src/lib/krb5/krb/ser_auth.c b/src/lib/krb5/krb/ser_auth.c index 23b9b5745..861c97e28 100644 --- a/src/lib/krb5/krb/ser_auth.c +++ b/src/lib/krb5/krb/ser_auth.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/ser_auth.c - Serialize krb5_authenticator structure */ /* - * lib/krb5/krb/ser_auth.c - * * Copyright 1995, 2008 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. - * - */ - -/* - * ser_auth.c - Serialize krb5_authenticator structure. */ #ifndef LEAN_CLIENT diff --git a/src/lib/krb5/krb/ser_cksum.c b/src/lib/krb5/krb/ser_cksum.c index 4d194c7d0..5417f1c69 100644 --- a/src/lib/krb5/krb/ser_cksum.c +++ b/src/lib/krb5/krb/ser_cksum.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/ser_cksum.c - Serialize krb5_checksum structure */ /* - * lib/krb5/krb/ser_cksum.c - * * Copyright 1995, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +22,8 @@ * 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. - * */ -/* - * ser_cksum.c - Serialize a krb5_checksum structure. - */ #include "k5-int.h" #include "int-proto.h" diff --git a/src/lib/krb5/krb/ser_ctx.c b/src/lib/krb5/krb/ser_ctx.c index a925b6d4a..099611adb 100644 --- a/src/lib/krb5/krb/ser_ctx.c +++ b/src/lib/krb5/krb/ser_ctx.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/ser_ctx.c - Serialize krb5_context structure */ /* - * lib/krb5/krb/ser_ctx.c - * * Copyright 1995, 2007, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,13 +22,8 @@ * 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. - * */ -/* - * ser_ctx.c - Routines to deal with serializing the krb5_context and - * krb5_os_context structures. - */ #include "k5-int.h" #include "int-proto.h" diff --git a/src/lib/krb5/krb/ser_eblk.c b/src/lib/krb5/krb/ser_eblk.c index 894a43e77..e77e4aad7 100644 --- a/src/lib/krb5/krb/ser_eblk.c +++ b/src/lib/krb5/krb/ser_eblk.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/ser_eblk.c */ /* - * lib/krb5/krb/ser_eblk.c - * * Copyright 1995, 2008 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. - * */ #if 0 /* i don't believe this is used anywhere --marc */ diff --git a/src/lib/krb5/krb/ser_key.c b/src/lib/krb5/krb/ser_key.c index f441e986f..eb3be06f4 100644 --- a/src/lib/krb5/krb/ser_key.c +++ b/src/lib/krb5/krb/ser_key.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/ser_key.c - Serialize krb5_keyblock structure */ /* - * lib/krb5/krb/ser_key.c - * * Copyright 1995, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +22,8 @@ * 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. - * */ -/* - * ser_key.c - Serialize a krb5_keyblock structure. - */ #include "k5-int.h" #include "int-proto.h" diff --git a/src/lib/krb5/krb/ser_princ.c b/src/lib/krb5/krb/ser_princ.c index d93fbbe7a..862638e77 100644 --- a/src/lib/krb5/krb/ser_princ.c +++ b/src/lib/krb5/krb/ser_princ.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/ser_princ.c - Serialize krb5_principal structure */ /* - * lib/krb5/krb/ser_princ.c - * * Copyright 1995 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +22,8 @@ * 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. - * */ -/* - * ser_princ.c - Serialize a krb5_principal structure. - */ #include "k5-int.h" #include "int-proto.h" diff --git a/src/lib/krb5/krb/serialize.c b/src/lib/krb5/krb/serialize.c index 4e08aa93e..9ad2d22b6 100644 --- a/src/lib/krb5/krb/serialize.c +++ b/src/lib/krb5/krb/serialize.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/serialize.c - Base serialization routines */ /* - * lib/krb5/krb/serialize.c - * * Copyright 1995 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +22,8 @@ * 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. - * */ -/* - * Base routines to deal with serialization of Kerberos metadata. - */ #include "k5-int.h" /* diff --git a/src/lib/krb5/krb/set_realm.c b/src/lib/krb5/krb/set_realm.c index 94a476338..5a7f81a44 100644 --- a/src/lib/krb5/krb/set_realm.c +++ b/src/lib/krb5/krb/set_realm.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/set_realm.c */ /* - * lib/krb5/krb/set_realm.c - * * Copyright 1997 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/krb/srv_dec_tkt.c b/src/lib/krb5/krb/srv_dec_tkt.c index f266fa5e9..645bc7552 100644 --- a/src/lib/krb5/krb/srv_dec_tkt.c +++ b/src/lib/krb5/krb/srv_dec_tkt.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/srv_dec_tkt.c */ /* - * lib/krb5/krb/srv_dec_tkt.c - * * Copyright 2006, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,8 +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. - * - * + */ + +/* * Server decrypt ticket via keytab or keyblock. * * Different from krb5_rd_req_decoded. (krb5/src/lib/krb5/krb/rd_req_dec.c) diff --git a/src/lib/krb5/krb/srv_rcache.c b/src/lib/krb5/krb/srv_rcache.c index 6730748f3..d474fb61a 100644 --- a/src/lib/krb5/krb/srv_rcache.c +++ b/src/lib/krb5/krb/srv_rcache.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/srv_rcache.c - Acquire default replay cache for a server */ /* - * lib/krb5/krb/srv_rcache.c - * * Copyright 1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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. - * - * - * Allocate & prepare a default replay cache for a server. */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/str_conv.c b/src/lib/krb5/krb/str_conv.c index 6ed639245..21e7fd904 100644 --- a/src/lib/krb5/krb/str_conv.c +++ b/src/lib/krb5/krb/str_conv.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/str_conv.c - Convert between strings and krb5 data types */ /* - * lib/kadm/str_conv.c - * * Copyright 1995, 1999, 2007 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. - * - */ - -/* - * str_conv.c - Convert between strings and Kerberos internal data. */ /* diff --git a/src/lib/krb5/krb/strptime.c b/src/lib/krb5/krb/strptime.c index b1d5d6cc3..22813f564 100644 --- a/src/lib/krb5/krb/strptime.c +++ b/src/lib/krb5/krb/strptime.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-file-style: "bsd"; indent-tabs-mode: t -*- */ -/* $NetBSD: strptime.c,v 1.18 1999/04/29 02:58:30 tv Exp $ */ - -/*- +/* lib/krb5/krb/strptime.c */ +/* * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. * All rights reserved. * diff --git a/src/lib/krb5/krb/t_authdata.c b/src/lib/krb5/krb/t_authdata.c index ac1f7a7c2..6e4fb21c8 100644 --- a/src/lib/krb5/krb/t_authdata.c +++ b/src/lib/krb5/krb/t_authdata.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/t_authdata.c - Test authorization data search */ /* - * lib/krb5/krb/t_authdata.c - * * Copyright (C) 2009 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,10 +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. - * - * - * - * Test authorization data search */ #include <k5-int.h> diff --git a/src/lib/krb5/krb/t_deltat.c b/src/lib/krb5/krb/t_deltat.c index dcf14af67..8a50c6905 100644 --- a/src/lib/krb5/krb/t_deltat.c +++ b/src/lib/krb5/krb/t_deltat.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/t_deltat.c */ /* - * lib/krb5/krb/t_deltat.c - * * Copyright 1999 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 "k5-int.h" diff --git a/src/lib/krb5/krb/t_etypes.c b/src/lib/krb5/krb/t_etypes.c index 5de4ced0b..72dbb20aa 100644 --- a/src/lib/krb5/krb/t_etypes.c +++ b/src/lib/krb5/krb/t_etypes.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/t_etypes.c - test program for krb5int_parse_enctype_list */ /* - * t_etypes.c -- test program for krb5int_parse_enctype_list - * * Copyright 2009 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/krb/t_expire_warn.c b/src/lib/krb5/krb/t_expire_warn.c index 12cdec143..c6ff8242e 100644 --- a/src/lib/krb5/krb/t_expire_warn.c +++ b/src/lib/krb5/krb/t_expire_warn.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/t_expire_warn.c - Test harness for password expiry warnings */ /* - * lib/krb5/krb/t_expire_warn.c - * * Copyright (C) 2010 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,9 +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. - * - * - * Test harness for password expiration warnings. */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/t_princ.c b/src/lib/krb5/krb/t_princ.c index 6664a75d6..502c22a4e 100644 --- a/src/lib/krb5/krb/t_princ.c +++ b/src/lib/krb5/krb/t_princ.c @@ -29,7 +29,8 @@ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/t_ser.c b/src/lib/krb5/krb/t_ser.c index daad0c7d1..f2d5118d5 100644 --- a/src/lib/krb5/krb/t_ser.c +++ b/src/lib/krb5/krb/t_ser.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/t_ser.c - Test serialization */ /* - * lib/krb5/krb/t_ser.c - * * Copyright 1995 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +22,8 @@ * 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. - * */ -/* - * t_ser.c - Test serialization. - */ #include "k5-int.h" #include "com_err.h" #include "auth_con.h" diff --git a/src/lib/krb5/krb/tgtname.c b/src/lib/krb5/krb/tgtname.c index 416badd6e..1a02880c6 100644 --- a/src/lib/krb5/krb/tgtname.c +++ b/src/lib/krb5/krb/tgtname.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/tgtname.c */ /* - * lib/krb5/krb/tgtname.c - * * Copyright 1990 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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. - * - * - * krb5int_tgtname() */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/unparse.c b/src/lib/krb5/krb/unparse.c index 68f82d49d..0f1d1c07e 100644 --- a/src/lib/krb5/krb/unparse.c +++ b/src/lib/krb5/krb/unparse.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/unparse.c */ /* - * lib/krb5/krb/unparse.c - * * Copyright 1990, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,8 +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. - * - * + */ + +/* * krb5_unparse_name() routine * * Rewritten by Theodore Ts'o to properly unparse principal names diff --git a/src/lib/krb5/krb/val_renew.c b/src/lib/krb5/krb/val_renew.c index bc3b90c3e..ef37bdfed 100644 --- a/src/lib/krb5/krb/val_renew.c +++ b/src/lib/krb5/krb/val_renew.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/val_renew.c */ /* - * lib/krb5/krb/val_renew.c - * * Copyright (C) 2010 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,8 +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. - * - * + */ + +/* * Implements the following APIs: * * krb5_get_credentials_validate diff --git a/src/lib/krb5/krb/valid_times.c b/src/lib/krb5/krb/valid_times.c index ce99ff4da..d63122183 100644 --- a/src/lib/krb5/krb/valid_times.c +++ b/src/lib/krb5/krb/valid_times.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/valid_times.c */ /* - * lib/krb5/krb/valid_times.c - * * Copyright 1995 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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. - * - * - * krb5int_validate_times() */ #include "k5-int.h" diff --git a/src/lib/krb5/krb/walk_rtree.c b/src/lib/krb5/krb/walk_rtree.c index 8e19e68c2..6aba24f8a 100644 --- a/src/lib/krb5/krb/walk_rtree.c +++ b/src/lib/krb5/krb/walk_rtree.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/walk_rtree.c */ /* - * lib/krb5/krb/walk_rtree.c - * * Copyright 1990,1991,2008,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. - * + */ + +/* * krb5_walk_realm_tree() * krb5_free_realm_tree() * diff --git a/src/lib/krb5/os/accessor.c b/src/lib/krb5/os/accessor.c index a0cdce6b4..532cd38d0 100644 --- a/src/lib/krb5/os/accessor.c +++ b/src/lib/krb5/os/accessor.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/accessor.c */ /* - * lib/krb5/os/accessor.c - * * Copyright 1990, 2008 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 "k5-int.h" diff --git a/src/lib/krb5/os/an_to_ln.c b/src/lib/krb5/os/an_to_ln.c index 8572cc068..a5846c78b 100644 --- a/src/lib/krb5/os/an_to_ln.c +++ b/src/lib/krb5/os/an_to_ln.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/an_to_ln.c */ /* - * lib/krb5/os/an_to_ln.c - * * Copyright 1990,1991,2007,2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_aname_to_localname() */ /* diff --git a/src/lib/krb5/os/c_ustime.c b/src/lib/krb5/os/c_ustime.c index 1bfdac4af..3dabe801b 100644 --- a/src/lib/krb5/os/c_ustime.c +++ b/src/lib/krb5/os/c_ustime.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/c_ustime.c */ /* - * lib/crypto/os/c_ustime.c - * * Copyright 1990,1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_mstimeofday for BSD 4.3 */ #include "k5-int.h" diff --git a/src/lib/krb5/os/ccdefname.c b/src/lib/krb5/os/ccdefname.c index 0686e721a..c46013381 100644 --- a/src/lib/krb5/os/ccdefname.c +++ b/src/lib/krb5/os/ccdefname.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/ccdefname.c - Return default credential cache name */ /* - * lib/krb5/os/ccdefname.c - * * Copyright 1990, 2007 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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. - * - * - * Return default cred. cache name. */ #define NEED_WINDOWS diff --git a/src/lib/krb5/os/changepw.c b/src/lib/krb5/os/changepw.c index 6ebe8dbbb..5c383ecd4 100644 --- a/src/lib/krb5/os/changepw.c +++ b/src/lib/krb5/os/changepw.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/changepw.c */ /* - * lib/krb5/os/changepw.c - * * Copyright 1990,1999,2001,2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +22,13 @@ * 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_set_password - Implements set password per RFC 3244 * Added by Paul W. Nelson, Thursby Software Systems, Inc. - * Modified by Todd Stecher, Isilon Systems, to use krb1.4 socket infrastructure + * Modified by Todd Stecher, Isilon Systems, to use krb1.4 socket + * infrastructure */ #include "fake-addrinfo.h" diff --git a/src/lib/krb5/os/def_realm.c b/src/lib/krb5/os/def_realm.c index 878aa2906..f47e170a5 100644 --- a/src/lib/krb5/os/def_realm.c +++ b/src/lib/krb5/os/def_realm.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/def_realm.c */ /* - * lib/krb5/os/def_realm.c - * * Copyright 1990,1991,2009 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,8 +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. - * - * + */ + +/* * krb5_get_default_realm(), krb5_set_default_realm(), * krb5_free_default_realm() functions. */ diff --git a/src/lib/krb5/os/dnsglue.c b/src/lib/krb5/os/dnsglue.c index 4742c0a12..826e15952 100644 --- a/src/lib/krb5/os/dnsglue.c +++ b/src/lib/krb5/os/dnsglue.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/dnsglue.c */ /* - * lib/krb5/os/dnsglue.c - * * Copyright 2004, 2009 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,8 +22,8 @@ * 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 "autoconf.h" #ifdef KRB5_DNS_LOOKUP diff --git a/src/lib/krb5/os/dnsglue.h b/src/lib/krb5/os/dnsglue.h index d8298862a..e66de6ad8 100644 --- a/src/lib/krb5/os/dnsglue.h +++ b/src/lib/krb5/os/dnsglue.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/dnsglue.h */ /* - * lib/krb5/os/dnsglue.h - * * Copyright 2004 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. - * + */ + +/* * Glue layer for DNS resolver, to make parsing of replies easier * whether we are using BIND 4, 8, or 9. */ diff --git a/src/lib/krb5/os/dnssrv.c b/src/lib/krb5/os/dnssrv.c index 983f0be04..4332ac70d 100644 --- a/src/lib/krb5/os/dnssrv.c +++ b/src/lib/krb5/os/dnssrv.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/dnssrv.c - Perform DNS SRV queries */ /* - * lib/krb5/os/dnssrv.c - * * Copyright 1990,2000,2001,2002,2003 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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. - * - * - * do DNS SRV RR queries */ #include "autoconf.h" diff --git a/src/lib/krb5/os/free_krbhs.c b/src/lib/krb5/os/free_krbhs.c index ddbbc3bb7..58a6c438f 100644 --- a/src/lib/krb5/os/free_krbhs.c +++ b/src/lib/krb5/os/free_krbhs.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/free_krbhs.c */ /* - * lib/krb5/os/free_krbhs.c - * * Copyright 1990,1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,17 +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. - * - * - * krb5_free_krbhst() function */ #include "k5-int.h" -/* - Frees the storage taken by a host list returned by krb5_get_krbhst. -*/ - +/* Free the storage taken by a host list returned by krb5_get_krbhst. */ krb5_error_code krb5_free_krbhst(krb5_context context, char *const *hostlist) { diff --git a/src/lib/krb5/os/full_ipadr.c b/src/lib/krb5/os/full_ipadr.c index 213e4262b..0863caba5 100644 --- a/src/lib/krb5/os/full_ipadr.c +++ b/src/lib/krb5/os/full_ipadr.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/full_ipadr.c - Generate full address from IP addr and port */ /* - * lib/krb5/os/full_ipadr.c - * * Copyright 1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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. - * - * - * Take an IP addr & port and generate a full IP address. */ #include "k5-int.h" diff --git a/src/lib/krb5/os/gen_port.c b/src/lib/krb5/os/gen_port.c index a887408a7..f51d12f68 100644 --- a/src/lib/krb5/os/gen_port.c +++ b/src/lib/krb5/os/gen_port.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/gen_port.c - Generate full address from IP address and port */ /* - * lib/krb5/os/gen_port.c - * * Copyright 1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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. - * - * - * Take an IP addr & port and generate a full IP address. */ #include "k5-int.h" diff --git a/src/lib/krb5/os/gen_rname.c b/src/lib/krb5/os/gen_rname.c index 1d87c2bf0..9dae04355 100644 --- a/src/lib/krb5/os/gen_rname.c +++ b/src/lib/krb5/os/gen_rname.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/gen_rname.c */ /* - * lib/krb5/os/gen_rname.c - * * Copyright 1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +22,10 @@ * 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. - * - * - * take a port-style address and unique string, and return + */ + +/* + * Take a port-style address and unique string, and return * a replay cache tag string. */ diff --git a/src/lib/krb5/os/genaddrs.c b/src/lib/krb5/os/genaddrs.c index d9028e4fb..b31c0bca6 100644 --- a/src/lib/krb5/os/genaddrs.c +++ b/src/lib/krb5/os/genaddrs.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/genaddrs.c */ /* - * lib/krb5/os/genaddrs.c - * * Copyright 1995 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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. - * - * - * Take an IP addr & port and generate a full IP address. */ #include "k5-int.h" diff --git a/src/lib/krb5/os/get_krbhst.c b/src/lib/krb5/os/get_krbhst.c index fe287780c..7db973aa2 100644 --- a/src/lib/krb5/os/get_krbhst.c +++ b/src/lib/krb5/os/get_krbhst.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/get_krbhst.c */ /* - * lib/krb5/os/get_krbhst.c - * * Copyright 1990,1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_get_krbhst() function. */ #include "k5-int.h" diff --git a/src/lib/krb5/os/hostaddr.c b/src/lib/krb5/os/hostaddr.c index 2f4c387db..ccab1d0e4 100644 --- a/src/lib/krb5/os/hostaddr.c +++ b/src/lib/krb5/os/hostaddr.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/hostaddr.c - Return list of krb5 addresses for a hostname */ /* - * lib/krb5/os/hostaddr.c - * * Copyright 1990,1991,2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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 routine returns a list of krb5 addresses given a hostname. - * */ #include "k5-int.h" @@ -33,7 +29,8 @@ #include "fake-addrinfo.h" krb5_error_code -krb5_os_hostaddr(krb5_context context, const char *name, krb5_address ***ret_addrs) +krb5_os_hostaddr(krb5_context context, const char *name, + krb5_address ***ret_addrs) { krb5_error_code retval; krb5_address **addrs; diff --git a/src/lib/krb5/os/hst_realm.c b/src/lib/krb5/os/hst_realm.c index 168c1846a..33e13e1c5 100644 --- a/src/lib/krb5/os/hst_realm.c +++ b/src/lib/krb5/os/hst_realm.c @@ -1,9 +1,8 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/hst_realm.c */ /* - * lib/krb5/os/hst_realm.c - * - * Copyright 1990,1991,2002,2008,2009 by the Massachusetts Institute of Technology. - * All Rights Reserved. + * Copyright 1990,1991,2002,2008,2009 by the Massachusetts Institute of + * Technology. All Rights Reserved. * * Export of this software from the United States of America may * require a specific license from the United States Government. @@ -23,8 +22,13 @@ * 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. - * - * + */ +/* + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + +/* * krb5_get_host_realm() * krb5_get_fallback_host_realm() * krb5int_clean_hostname() @@ -432,11 +436,6 @@ krb5int_clean_hostname(krb5_context context, } /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* * Walk through the components of a domain. At each stage determine * if a KDC can be located for that domain. Return a realm * corresponding to the upper-cased domain name for which a KDC was diff --git a/src/lib/krb5/os/init_os_ctx.c b/src/lib/krb5/os/init_os_ctx.c index 7f2110f8e..c4eb17fc3 100644 --- a/src/lib/krb5/os/init_os_ctx.c +++ b/src/lib/krb5/os/init_os_ctx.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/init_os_ctx.c */ /* - * lib/krb5/os/init_ctx.c - * * Copyright 1994, 2007, 2008, 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. - * - * krb5_init_contex() */ #define NEED_WINDOWS diff --git a/src/lib/krb5/os/krbfileio.c b/src/lib/krb5/os/krbfileio.c index 99703aa35..6dce8ca9a 100644 --- a/src/lib/krb5/os/krbfileio.c +++ b/src/lib/krb5/os/krbfileio.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/krbfileio.c */ /* - * lib/krb5/os/krbfileio.c - * * Copyright (c) Hewlett-Packard Company 1991 * Released to the Massachusetts Institute of Technology for inclusion * in the Kerberos source code distribution. diff --git a/src/lib/krb5/os/ktdefname.c b/src/lib/krb5/os/ktdefname.c index ce28e30d1..afc344e4d 100644 --- a/src/lib/krb5/os/ktdefname.c +++ b/src/lib/krb5/os/ktdefname.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/ktdefname.c - Return default keytab name */ /* - * lib/krb5/os/ktdefname.c - * * Copyright 1990 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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. - * - * - * Return default keytab file name. */ #define NEED_WINDOWS diff --git a/src/lib/krb5/os/kuserok.c b/src/lib/krb5/os/kuserok.c index e1619f394..51471ae7c 100644 --- a/src/lib/krb5/os/kuserok.c +++ b/src/lib/krb5/os/kuserok.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/kuserok.c */ /* - * lib/krb5/os/kuserok.c - * * Copyright 1990,1993,2007 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_kuserok() */ #include "k5-int.h" diff --git a/src/lib/krb5/os/localaddr.c b/src/lib/krb5/os/localaddr.c index 61d01a97b..08f628a55 100644 --- a/src/lib/krb5/os/localaddr.c +++ b/src/lib/krb5/os/localaddr.c @@ -1,9 +1,8 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/localaddr.c */ /* - * lib/krb5/os/localaddr.c - * - * Copyright 1990,1991,2000,2001,2002,2004,2007,2008 by the Massachusetts Institute of Technology. - * All Rights Reserved. + * Copyright 1990,1991,2000,2001,2002,2004,2007,2008 by the Massachusetts + * Institute of Technology. All Rights Reserved. * * Export of this software from the United States of America may * require a specific license from the United States Government. @@ -23,8 +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. - * - * + */ + +/* * Return the protocol addresses supported by this host. * Exports from this file: * krb5int_foreach_localaddr (does callbacks) diff --git a/src/lib/krb5/os/locate_kdc.c b/src/lib/krb5/os/locate_kdc.c index b395375fc..4c5977ab0 100644 --- a/src/lib/krb5/os/locate_kdc.c +++ b/src/lib/krb5/os/locate_kdc.c @@ -1,9 +1,8 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/locate_kdc.c - Get addresses for realm KDCs and other servers */ /* - * lib/krb5/os/locate_kdc.c - * - * Copyright 1990,2000,2001,2002,2003,2004,2006,2008 Massachusetts Institute of Technology. - * All Rights Reserved. + * Copyright 1990,2000,2001,2002,2003,2004,2006,2008 Massachusetts Institute of + * Technology. All Rights Reserved. * * Export of this software from the United States of America may * require a specific license from the United States Government. @@ -23,9 +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. - * - * - * Get server hostnames or addresses for KDC. */ #include "fake-addrinfo.h" diff --git a/src/lib/krb5/os/lock_file.c b/src/lib/krb5/os/lock_file.c index 6565470c0..224e58fbf 100644 --- a/src/lib/krb5/os/lock_file.c +++ b/src/lib/krb5/os/lock_file.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/lock_file.c */ /* - * lib/krb5/os/lock_file.c - * * Copyright 1990, 1998 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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. - * - * - * libos: krb5_lock_file routine */ #include "k5-int.h" diff --git a/src/lib/krb5/os/mk_faddr.c b/src/lib/krb5/os/mk_faddr.c index 26fb99c84..7e125cfcf 100644 --- a/src/lib/krb5/os/mk_faddr.c +++ b/src/lib/krb5/os/mk_faddr.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/mk_faddr.c - Generate full address from IP addr and port */ /* - * lib/krb5/os/full_ipadr.c - * * Copyright 1995, 2009 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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. - * - * - * Take an IP addr & port and generate a full IP address. */ #include "k5-int.h" @@ -39,7 +35,8 @@ #endif krb5_error_code -krb5_make_fulladdr(krb5_context context, krb5_address *kaddr, krb5_address *kport, krb5_address *raddr) +krb5_make_fulladdr(krb5_context context, krb5_address *kaddr, + krb5_address *kport, krb5_address *raddr) { register krb5_octet * marshal; krb5_int32 tmp32; diff --git a/src/lib/krb5/os/net_read.c b/src/lib/krb5/os/net_read.c index fe84192d1..7e5e95412 100644 --- a/src/lib/krb5/os/net_read.c +++ b/src/lib/krb5/os/net_read.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/net_read.c */ /* - * lib/krb5/os/net_read.c - * * Copyright 1987, 1988, 1990 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 "k5-int.h" diff --git a/src/lib/krb5/os/net_write.c b/src/lib/krb5/os/net_write.c index d4bcc148f..929072653 100644 --- a/src/lib/krb5/os/net_write.c +++ b/src/lib/krb5/os/net_write.c @@ -1,9 +1,8 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/net_write.c */ /* - * lib/krb5/os/net_write.c - * - * Copyright 1987, 1988, 1990, 2009 by the Massachusetts Institute of Technology. - * All Rights Reserved. + * Copyright 1987, 1988, 1990, 2009 by the Massachusetts Institute of + * Technology. All Rights Reserved. * * Export of this software from the United States of America may * require a specific license from the United States Government. @@ -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 "k5-int.h" diff --git a/src/lib/krb5/os/os-proto.h b/src/lib/krb5/os/os-proto.h index 2fb353ea0..a86ad87cb 100644 --- a/src/lib/krb5/os/os-proto.h +++ b/src/lib/krb5/os/os-proto.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/os-proto.h */ /* - * lib/krb5/os/os-proto.h - * * Copyright 1990,1991,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. - * + */ + +/* * * LIBOS internal function prototypes. */ diff --git a/src/lib/krb5/os/osconfig.c b/src/lib/krb5/os/osconfig.c index d04e95ba7..93eafeda0 100644 --- a/src/lib/krb5/os/osconfig.c +++ b/src/lib/krb5/os/osconfig.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/osconfig.c */ /* - * lib/krb5/os/osconfig.c - * * Copyright 1990 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,8 +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. - * - * + */ + +/* * Definition of default configuration parameters. * * ***** WARNING ***** diff --git a/src/lib/krb5/os/port2ip.c b/src/lib/krb5/os/port2ip.c index d4184db11..905d60f19 100644 --- a/src/lib/krb5/os/port2ip.c +++ b/src/lib/krb5/os/port2ip.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/port2ip.c - Split full address into IP address and port */ /* - * lib/krb5/os/port2ip.c - * * Copyright 1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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. - * - * - * Take an ADDRPORT address and split into IP addr & port. */ #include "k5-int.h" diff --git a/src/lib/krb5/os/read_msg.c b/src/lib/krb5/os/read_msg.c index 815f7ad89..2da310d09 100644 --- a/src/lib/krb5/os/read_msg.c +++ b/src/lib/krb5/os/read_msg.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/read_msg.c */ /* - * lib/krb5/os/read_msg.c - * * Copyright 1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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. - * - * - * Write a message to the network */ #include "k5-int.h" diff --git a/src/lib/krb5/os/read_pwd.c b/src/lib/krb5/os/read_pwd.c index df93c6546..f26896d5f 100644 --- a/src/lib/krb5/os/read_pwd.c +++ b/src/lib/krb5/os/read_pwd.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/read_pwd.c */ /* - * lib/krb5/os/read_pwd.c - * * Copyright 1990,1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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. - * - * - * libos: krb5_read_password for BSD 4.3 */ #include "k5-int.h" diff --git a/src/lib/krb5/os/realm_dom.c b/src/lib/krb5/os/realm_dom.c index 8f25caf44..08e35d49a 100644 --- a/src/lib/krb5/os/realm_dom.c +++ b/src/lib/krb5/os/realm_dom.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/realm_dom.c */ /* - * lib/krb5/os/realm_dom.c - * * Copyright 1990,1991 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +22,8 @@ * 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_get_realm_domain() */ - /* * Determines the proper domain name for a realm. This is mainly so that * a krb4 principal can be converted properly into a krb5 principal. diff --git a/src/lib/krb5/os/realm_iter.c b/src/lib/krb5/os/realm_iter.c index cfc9e390e..2fb1f039e 100644 --- a/src/lib/krb5/os/realm_iter.c +++ b/src/lib/krb5/os/realm_iter.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/realm_iter.c */ /* - * lib/krb5/os/realm_init.c - * * Copyright 1998 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. - * - * krb5_realm_iterate() */ #include "k5-int.h" diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c index 5e059a59e..058b6d1ed 100644 --- a/src/lib/krb5/os/sendto_kdc.c +++ b/src/lib/krb5/os/sendto_kdc.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/sendto_kdc.c */ /* - * lib/krb5/os/sendto_kdc.c - * * Copyright 1990,1991,2001,2002,2004,2005,2007,2008 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. - * - * - * Send packet to KDC for realm; wait for response, retransmitting - * as necessary. */ +/* Send packet to KDC for realm; wait for response, retransmitting + * as necessary. */ + #include "fake-addrinfo.h" #include "k5-int.h" diff --git a/src/lib/krb5/os/sn2princ.c b/src/lib/krb5/os/sn2princ.c index 9645fef37..b5a2d2611 100644 --- a/src/lib/krb5/os/sn2princ.c +++ b/src/lib/krb5/os/sn2princ.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/sn2princ.c */ /* - * lib/krb5/os/sn2princ.c - * * Copyright 1991,2002 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. - * - * - * Convert a hostname and service name to a principal in the "standard" - * form. */ +/* Convert a hostname and service name to a principal in the "standard" + * form. */ + #include "k5-int.h" #include "os-proto.h" #include "fake-addrinfo.h" diff --git a/src/lib/krb5/os/t_kuserok.c b/src/lib/krb5/os/t_kuserok.c index a16c4f596..eabbfc75e 100644 --- a/src/lib/krb5/os/t_kuserok.c +++ b/src/lib/krb5/os/t_kuserok.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/t_kuserok.c - Test harness for krb5_kuserok */ /* - * lib/krb5/os/t_kuserok.c - * * Copyright (C) 2010 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,9 +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. - * - * - * Simple test harness for krb5_kuserok. */ #include <krb5.h> diff --git a/src/lib/krb5/os/thread_safe.c b/src/lib/krb5/os/thread_safe.c index acd88ce85..5ac7341ce 100644 --- a/src/lib/krb5/os/thread_safe.c +++ b/src/lib/krb5/os/thread_safe.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/thread_safe.c */ /* - * lib/krb5/os/thread_safec - * * Copyright 2005 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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_is_thread_safe() function. */ #include "k5-int.h" diff --git a/src/lib/krb5/os/timeofday.c b/src/lib/krb5/os/timeofday.c index 7c4534e42..b22d92a1a 100644 --- a/src/lib/krb5/os/timeofday.c +++ b/src/lib/krb5/os/timeofday.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/timeofday.c */ /* - * lib/krb5/os/timeofday.c - * * Copyright 1990, 2007 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +22,8 @@ * 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. - * - * - * libos: krb5_timeofday function for BSD 4.3 */ - #include "k5-int.h" #include <time.h> diff --git a/src/lib/krb5/os/toffset.c b/src/lib/krb5/os/toffset.c index a9faec537..456193a41 100644 --- a/src/lib/krb5/os/toffset.c +++ b/src/lib/krb5/os/toffset.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/toffset.c - Manipulate time offset fields in os context */ /* - * lib/krb5/os/toffset.c - * * Copyright 1995, 2007 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. - * - * These routines manipulates the time offset fields in the os context. */ #include "k5-int.h" diff --git a/src/lib/krb5/os/trace.c b/src/lib/krb5/os/trace.c index 6624363f3..83df52eb7 100644 --- a/src/lib/krb5/os/trace.c +++ b/src/lib/krb5/os/trace.c @@ -1,7 +1,6 @@ /* -*- mode: c; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/trace.c - k5trace implementation */ /* - * lib/krb5/krb/trace.c - * * Copyright 2009 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,11 +22,10 @@ * 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. - * - * k5trace implementation */ -/* k5trace is defined in k5-int.h as a macro or static inline function, +/* + * k5trace is defined in k5-int.h as a macro or static inline function, * and is called like so: * * void k5trace(krb5_context context, const char *fmt, ...) diff --git a/src/lib/krb5/os/unlck_file.c b/src/lib/krb5/os/unlck_file.c index 37233a337..7d69fc78f 100644 --- a/src/lib/krb5/os/unlck_file.c +++ b/src/lib/krb5/os/unlck_file.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/unlck_file.c */ /* - * lib/krb5/os/unlck_file.c - * * Copyright 1990 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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. - * - * - * libos: krb5_lock_file routine */ #include "k5-int.h" diff --git a/src/lib/krb5/os/ustime.c b/src/lib/krb5/os/ustime.c index 34c2fa089..be94a8218 100644 --- a/src/lib/krb5/os/ustime.c +++ b/src/lib/krb5/os/ustime.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/ustime.c */ /* - * lib/krb5/os/ustime.c - * * Copyright 1990,1991,2007 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. - * + */ + +/* * krb5_crypto_us_timeofday() does all of the real work; however, we * handle the time offset adjustment here, since this is context * specific, and the crypto version of this call doesn't have access diff --git a/src/lib/krb5/os/write_msg.c b/src/lib/krb5/os/write_msg.c index 6a57b1e0c..b745f3fad 100644 --- a/src/lib/krb5/os/write_msg.c +++ b/src/lib/krb5/os/write_msg.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/os/write_msg.c - convenience sendauh/recvauth functions */ /* - * lib/krb5/os/write_msg.c - * * Copyright 1991, 2009 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,22 +22,22 @@ * 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. - * - * - * convenience sendauth/recvauth functions */ #include "k5-int.h" #include <errno.h> #include "os-proto.h" -/* Try to write a series of messages with as few write(v) system calls - as possible, to avoid Nagle/DelayedAck problems. Cheating here a - little -- I know the only cases we have at the moment will send one - or two messages in a call. Sending more will work, but not as - efficiently. */ +/* + * Try to write a series of messages with as few write(v) system calls + * as possible, to avoid Nagle/DelayedAck problems. Cheating here a + * little -- I know the only cases we have at the moment will send one + * or two messages in a call. Sending more will work, but not as + * efficiently. + */ krb5_error_code -krb5int_write_messages(krb5_context context, krb5_pointer fdp, krb5_data *outbuf, int nbufs) +krb5int_write_messages(krb5_context context, krb5_pointer fdp, + krb5_data *outbuf, int nbufs) { int fd = *( (int *) fdp); diff --git a/src/lib/krb5/rcache/rc-int.h b/src/lib/krb5/rcache/rc-int.h index 5ed39e6fd..72a9483c0 100644 --- a/src/lib/krb5/rcache/rc-int.h +++ b/src/lib/krb5/rcache/rc-int.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/rcache/rc-int.h */ /* - * lib/krb5/keytab/rc-int.h - * * Copyright 2004 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. - * - * - * This file contains constant and function declarations used in the - * file-based replay cache routines. */ +/* This file contains constant and function declarations used in the + * file-based replay cache routines. */ + #ifndef __KRB5_RCACHE_INT_H__ #define __KRB5_RCACHE_INT_H__ diff --git a/src/lib/krb5/rcache/rc_base.c b/src/lib/krb5/rcache/rc_base.c index 7a5a09a1c..509727154 100644 --- a/src/lib/krb5/rcache/rc_base.c +++ b/src/lib/krb5/rcache/rc_base.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/rcache/rc_base.c */ /* - * lib/krb5/rcache/rc_base.c - * * This file of the Kerberos V5 software is derived from public-domain code * contributed by Daniel J. Bernstein, <brnstnd@acf10.nyu.edu>. * diff --git a/src/lib/krb5/rcache/rc_base.h b/src/lib/krb5/rcache/rc_base.h index 1e0f83a02..0530b90f8 100644 --- a/src/lib/krb5/rcache/rc_base.h +++ b/src/lib/krb5/rcache/rc_base.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/rcache/rc_base.h */ /* - * lib/krb5/rcache/rc_base.h - * * This file of the Kerberos V5 software is derived from public-domain code * contributed by Daniel J. Bernstein, <brnstnd@acf10.nyu.edu>. * diff --git a/src/lib/krb5/rcache/rc_conv.c b/src/lib/krb5/rcache/rc_conv.c index aa4b56a16..d8a064d18 100644 --- a/src/lib/krb5/rcache/rc_conv.c +++ b/src/lib/krb5/rcache/rc_conv.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/rcache/rc_conv.c */ /* - * lib/krb5/rcache/rc_conv.c - * * This file of the Kerberos V5 software is derived from public-domain code * contributed by Daniel J. Bernstein, <brnstnd@acf10.nyu.edu>. * diff --git a/src/lib/krb5/rcache/rc_dfl.c b/src/lib/krb5/rcache/rc_dfl.c index f19f1cb81..cc42f461f 100644 --- a/src/lib/krb5/rcache/rc_dfl.c +++ b/src/lib/krb5/rcache/rc_dfl.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/rcache/rc_dfl.c */ /* - * lib/krb5/rcache/rc_dfl.c - * * This file of the Kerberos V5 software is derived from public-domain code * contributed by Daniel J. Bernstein, <brnstnd@acf10.nyu.edu>. * diff --git a/src/lib/krb5/rcache/rc_dfl.h b/src/lib/krb5/rcache/rc_dfl.h index 3bc8bd861..ad036a207 100644 --- a/src/lib/krb5/rcache/rc_dfl.h +++ b/src/lib/krb5/rcache/rc_dfl.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/rcache/rc_dfl.h */ /* - * lib/krb5/rcache/rc_dfl.h - * * This file of the Kerberos V5 software is derived from public-domain code * contributed by Daniel J. Bernstein, <brnstnd@acf10.nyu.edu>. * diff --git a/src/lib/krb5/rcache/rc_io.c b/src/lib/krb5/rcache/rc_io.c index 872b5fdff..7df5848c8 100644 --- a/src/lib/krb5/rcache/rc_io.c +++ b/src/lib/krb5/rcache/rc_io.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/rcache/rc_io.c */ /* - * lib/krb5/rcache/rc_io.c - * * This file of the Kerberos V5 software is derived from public-domain code * contributed by Daniel J. Bernstein, <brnstnd@acf10.nyu.edu>. * diff --git a/src/lib/krb5/rcache/rc_io.h b/src/lib/krb5/rcache/rc_io.h index e774ef9fd..f5ab23903 100644 --- a/src/lib/krb5/rcache/rc_io.h +++ b/src/lib/krb5/rcache/rc_io.h @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/rcache/rc_io.h */ /* - * lib/krb5/rcache/rc_io.h - * * This file of the Kerberos V5 software is derived from public-domain code * contributed by Daniel J. Bernstein, <brnstnd@acf10.nyu.edu>. * diff --git a/src/lib/krb5/rcache/rc_none.c b/src/lib/krb5/rcache/rc_none.c index 77ca83705..e30aed09f 100644 --- a/src/lib/krb5/rcache/rc_none.c +++ b/src/lib/krb5/rcache/rc_none.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/rcache/rc_none.c */ /* - * lib/krb5/rcache/rc_none.c - * * Copyright 2004 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. - * + */ + +/* * * replay cache no-op implementation */ diff --git a/src/lib/krb5/rcache/rcdef.c b/src/lib/krb5/rcache/rcdef.c index c4657b333..01d166bec 100644 --- a/src/lib/krb5/rcache/rcdef.c +++ b/src/lib/krb5/rcache/rcdef.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/rcache/rcdef.c - Default replay cache operations vector */ /* - * lib/krb5/rcache/rcdef.c - * * Copyright 1990 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,9 +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. - * - * - * replay cache default operations vector. */ #include "k5-int.h" diff --git a/src/lib/krb5/rcache/rcfns.c b/src/lib/krb5/rcache/rcfns.c index 52dec4982..b12864ab5 100644 --- a/src/lib/krb5/rcache/rcfns.c +++ b/src/lib/krb5/rcache/rcfns.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/rcache/rcfns.c */ /* - * lib/krb5/rcache/rcfns.c - * * Copyright 2001 by the Massachusetts Institute of Technology. * All Rights Reserved. * diff --git a/src/lib/krb5/rcache/ser_rc.c b/src/lib/krb5/rcache/ser_rc.c index 04f6066c5..49750bdcd 100644 --- a/src/lib/krb5/rcache/ser_rc.c +++ b/src/lib/krb5/rcache/ser_rc.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/rcache/ser_rc.c - Serialize replay cache context */ /* - * lib/krb5/rcache/ser_rc.c - * * Copyright 1995 by the Massachusetts Institute of Technology. * All Rights Reserved. * @@ -23,12 +22,8 @@ * 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. - * */ -/* - * ser_rcdfl.c - Serialize replay cache context. - */ #include "k5-int.h" #include "rc-int.h" diff --git a/src/lib/krb5/rcache/t_replay.c b/src/lib/krb5/rcache/t_replay.c index c38a4a630..0e108bf4e 100644 --- a/src/lib/krb5/rcache/t_replay.c +++ b/src/lib/krb5/rcache/t_replay.c @@ -1,7 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/rcache/t_replay.c - Test harness for replay cache */ /* - * test/threads/t_replay.c - * * Copyright (C) 2009 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -23,9 +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. - * - * t_replay.c: Command-line interfaces to aid testing of replay cache - * */ #include <stdio.h> diff --git a/src/lib/krb5/unicode/ucdata/ucdata.c b/src/lib/krb5/unicode/ucdata/ucdata.c index 1e46744b6..17473adb5 100644 --- a/src/lib/krb5/unicode/ucdata/ucdata.c +++ b/src/lib/krb5/unicode/ucdata/ucdata.c @@ -1,6 +1,4 @@ -/* $OpenLDAP: pkg/ldap/libraries/liblunicode/ucdata/ucdata.c,v 1.36 2008/01/07 23:20:05 kurt Exp $ */ -/* This work is part of OpenLDAP Software <http://www.openldap.org/>. - * +/* * Copyright 1998-2008 The OpenLDAP Foundation. * All rights reserved. * @@ -32,7 +30,12 @@ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: ucdata.c,v 1.4 2001/01/02 18:46:20 mleisher Exp $" */ + +/* + * This work is part of OpenLDAP Software <http://www.openldap.org/>. + * $OpenLDAP: pkg/ldap/libraries/liblunicode/ucdata/ucdata.c,v 1.36 2008/01/07 23:20:05 kurt Exp $ + * $Id: ucdata.c,v 1.4 2001/01/02 18:46:20 mleisher Exp $" + */ #include "k5-int.h" #include "k5-utf8.h" diff --git a/src/lib/krb5/unicode/ucdata/ucdata.h b/src/lib/krb5/unicode/ucdata/ucdata.h index 00ece35ad..3d37c9346 100644 --- a/src/lib/krb5/unicode/ucdata/ucdata.h +++ b/src/lib/krb5/unicode/ucdata/ucdata.h @@ -1,6 +1,4 @@ -/* $OpenLDAP: pkg/ldap/libraries/liblunicode/ucdata/ucdata.h,v 1.21 2008/01/07 23:20:05 kurt Exp $ */ -/* This work is part of OpenLDAP Software <http://www.openldap.org/>. - * +/* * Copyright 1998-2008 The OpenLDAP Foundation. * All rights reserved. * @@ -32,7 +30,12 @@ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: ucdata.h,v 1.6 2001/01/02 18:46:20 mleisher Exp $ */ + +/* + * This work is part of OpenLDAP Software <http://www.openldap.org/>. + * $OpenLDAP: pkg/ldap/libraries/liblunicode/ucdata/ucdata.h,v 1.21 2008/01/07 23:20:05 kurt Exp $ + * $Id: ucdata.h,v 1.6 2001/01/02 18:46:20 mleisher Exp $ + */ #ifndef _h_ucdata #define _h_ucdata diff --git a/src/lib/krb5/unicode/ucdata/ucgendat.c b/src/lib/krb5/unicode/ucdata/ucgendat.c index a6d38fbb9..74ed51444 100644 --- a/src/lib/krb5/unicode/ucdata/ucgendat.c +++ b/src/lib/krb5/unicode/ucdata/ucgendat.c @@ -1,6 +1,4 @@ -/* $OpenLDAP: pkg/ldap/libraries/liblunicode/ucdata/ucgendat.c,v 1.43 2008/01/07 23:20:05 kurt Exp $ */ -/* This work is part of OpenLDAP Software <http://www.openldap.org/>. - * +/* * Copyright 1998-2008 The OpenLDAP Foundation. * All rights reserved. * @@ -32,7 +30,12 @@ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: ucgendat.c,v 1.4 2001/01/02 18:46:20 mleisher Exp $" */ + +/* + * This work is part of OpenLDAP Software <http://www.openldap.org/>. + * $OpenLDAP: pkg/ldap/libraries/liblunicode/ucdata/ucgendat.c,v 1.43 2008/01/07 23:20:05 kurt Exp $ + * $Id: ucgendat.c,v 1.4 2001/01/02 18:46:20 mleisher Exp $" + */ #include "k5-int.h" #include "k5-utf8.h" diff --git a/src/lib/krb5/unicode/ucdata/ucpgba.c b/src/lib/krb5/unicode/ucdata/ucpgba.c index 6161611b0..a5b258cc2 100644 --- a/src/lib/krb5/unicode/ucdata/ucpgba.c +++ b/src/lib/krb5/unicode/ucdata/ucpgba.c @@ -1,6 +1,4 @@ -/* $OpenLDAP: pkg/ldap/libraries/liblunicode/ucdata/ucpgba.c,v 1.9 2008/01/07 23:20:05 kurt Exp $ */ -/* This work is part of OpenLDAP Software <http://www.openldap.org/>. - * +/* * Copyright 1998-2008 The OpenLDAP Foundation. * All rights reserved. * @@ -32,7 +30,12 @@ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: ucpgba.c,v 1.5 2001/01/02 18:46:20 mleisher Exp $ */ + +/* + * This work is part of OpenLDAP Software <http://www.openldap.org/>. + * $OpenLDAP: pkg/ldap/libraries/liblunicode/ucdata/ucpgba.c,v 1.9 2008/01/07 23:20:05 kurt Exp $ + * $Id: ucpgba.c,v 1.5 2001/01/02 18:46:20 mleisher Exp $ + */ #include "k5-int.h" #include "k5-utf8.h" diff --git a/src/lib/krb5/unicode/ucdata/ucpgba.h b/src/lib/krb5/unicode/ucdata/ucpgba.h index 0761e1d48..ebd40d313 100644 --- a/src/lib/krb5/unicode/ucdata/ucpgba.h +++ b/src/lib/krb5/unicode/ucdata/ucpgba.h @@ -1,6 +1,4 @@ -/* $OpenLDAP: pkg/ldap/libraries/liblunicode/ucdata/ucpgba.h,v 1.10 2008/01/07 23:20:05 kurt Exp $ */ -/* This work is part of OpenLDAP Software <http://www.openldap.org/>. - * +/* * Copyright 1998-2008 The OpenLDAP Foundation. * All rights reserved. * @@ -32,7 +30,12 @@ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: ucpgba.h,v 1.4 1999/11/19 15:24:30 mleisher Exp $ */ + +/* + * This work is part of OpenLDAP Software <http://www.openldap.org/>. + * $OpenLDAP: pkg/ldap/libraries/liblunicode/ucdata/ucpgba.h,v 1.10 2008/01/07 23:20:05 kurt Exp $ + * $Id: ucpgba.h,v 1.4 1999/11/19 15:24:30 mleisher Exp $ + */ #ifndef _h_ucpgba #define _h_ucpgba diff --git a/src/lib/krb5/unicode/ucstr.c b/src/lib/krb5/unicode/ucstr.c index b77dfb859..e75797b0b 100644 --- a/src/lib/krb5/unicode/ucstr.c +++ b/src/lib/krb5/unicode/ucstr.c @@ -1,10 +1,4 @@ /* - * $OpenLDAP: pkg/ldap/libraries/liblunicode/ucstr.c,v 1.40 2008/03/04 - * 06:24:05 hyc Exp $ - */ -/* - * This work is part of OpenLDAP Software <http://www.openldap.org/>. - * * Copyright 1998-2008 The OpenLDAP Foundation. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -16,6 +10,11 @@ * <http://www.OpenLDAP.org/license.html>. */ +/* + * This work is part of OpenLDAP Software <http://www.openldap.org/>. + * $OpenLDAP: pkg/ldap/libraries/liblunicode/ucstr.c,v 1.40 2008/03/04 06:24:05 hyc Exp $ + */ + #include "k5-int.h" #include "k5-utf8.h" #include "k5-unicode.h" diff --git a/src/lib/krb5/unicode/ure/ure.c b/src/lib/krb5/unicode/ure/ure.c index 4fd11666c..91ef7c95b 100644 --- a/src/lib/krb5/unicode/ure/ure.c +++ b/src/lib/krb5/unicode/ure/ure.c @@ -1,6 +1,4 @@ -/* $OpenLDAP: pkg/ldap/libraries/liblunicode/ure/ure.c,v 1.19 2008/01/07 23:20:05 kurt Exp $ */ -/* This work is part of OpenLDAP Software <http://www.openldap.org/>. - * +/* * Copyright 1998-2008 The OpenLDAP Foundation. * All rights reserved. * @@ -33,7 +31,12 @@ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: ure.c,v 1.2 1999/09/21 15:47:43 mleisher Exp $" */ + +/* + * This work is part of OpenLDAP Software <http://www.openldap.org/>. + * $OpenLDAP: pkg/ldap/libraries/liblunicode/ure/ure.c,v 1.19 2008/01/07 23:20:05 kurt Exp $ + * $Id: ure.c,v 1.2 1999/09/21 15:47:43 mleisher Exp $" + */ #include <k5-int.h> diff --git a/src/lib/krb5/unicode/ure/ure.h b/src/lib/krb5/unicode/ure/ure.h index e5b338706..b83c97ed9 100644 --- a/src/lib/krb5/unicode/ure/ure.h +++ b/src/lib/krb5/unicode/ure/ure.h @@ -1,6 +1,4 @@ -/* $OpenLDAP: pkg/ldap/libraries/liblunicode/ure/ure.h,v 1.15 2008/01/07 23:20:05 kurt Exp $ */ -/* This work is part of OpenLDAP Software <http://www.openldap.org/>. - * +/* * Copyright 1998-2008 The OpenLDAP Foundation. * All rights reserved. * @@ -33,7 +31,12 @@ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: ure.h,v 1.2 1999/09/21 15:47:44 mleisher Exp $ */ + +/* + * This work is part of OpenLDAP Software <http://www.openldap.org/>. + * $OpenLDAP: pkg/ldap/libraries/liblunicode/ure/ure.h,v 1.15 2008/01/07 23:20:05 kurt Exp $ + * $Id: ure.h,v 1.2 1999/09/21 15:47:44 mleisher Exp $ + */ #ifndef _h_ure #define _h_ure diff --git a/src/lib/krb5/unicode/ure/urestubs.c b/src/lib/krb5/unicode/ure/urestubs.c index 470d05cc4..52cde5a8a 100644 --- a/src/lib/krb5/unicode/ure/urestubs.c +++ b/src/lib/krb5/unicode/ure/urestubs.c @@ -1,6 +1,4 @@ -/* $OpenLDAP: pkg/ldap/libraries/liblunicode/ure/urestubs.c,v 1.16 2008/01/07 23:20:05 kurt Exp $ */ -/* This work is part of OpenLDAP Software <http://www.openldap.org/>. - * +/* * Copyright 1998-2008 The OpenLDAP Foundation. * All rights reserved. * @@ -34,7 +32,12 @@ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: urestubs.c,v 1.2 1999/09/21 15:47:44 mleisher Exp $" */ + +/* + * This work is part of OpenLDAP Software <http://www.openldap.org/>. + * $OpenLDAP: pkg/ldap/libraries/liblunicode/ure/urestubs.c,v 1.16 2008/01/07 23:20:05 kurt Exp $ + * $Id: urestubs.c,v 1.2 1999/09/21 15:47:44 mleisher Exp $" + */ #include "k5-int.h" diff --git a/src/lib/krb5/unicode/utbm/utbm.c b/src/lib/krb5/unicode/utbm/utbm.c index ffc84afbc..ec862d7b1 100644 --- a/src/lib/krb5/unicode/utbm/utbm.c +++ b/src/lib/krb5/unicode/utbm/utbm.c @@ -1,6 +1,4 @@ -/* $OpenLDAP: pkg/ldap/libraries/liblunicode/utbm/utbm.c,v 1.9 2008/01/07 23:20:05 kurt Exp $ */ -/* This work is part of OpenLDAP Software <http://www.openldap.org/>. - * +/* * Copyright 1998-2008 The OpenLDAP Foundation. * All rights reserved. * @@ -33,7 +31,12 @@ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: utbm.c,v 1.1 1999/09/21 15:45:17 mleisher Exp $ */ + +/* + * This work is part of OpenLDAP Software <http://www.openldap.org/>. + * $OpenLDAP: pkg/ldap/libraries/liblunicode/utbm/utbm.c,v 1.9 2008/01/07 23:20:05 kurt Exp $ + * $Id: utbm.c,v 1.1 1999/09/21 15:45:17 mleisher Exp $ + */ /* * Assumptions: diff --git a/src/lib/krb5/unicode/utbm/utbm.h b/src/lib/krb5/unicode/utbm/utbm.h index 26adee9c8..2c90a01ea 100644 --- a/src/lib/krb5/unicode/utbm/utbm.h +++ b/src/lib/krb5/unicode/utbm/utbm.h @@ -1,6 +1,4 @@ -/* $OpenLDAP: pkg/ldap/libraries/liblunicode/utbm/utbm.h,v 1.10 2008/01/07 23:20:05 kurt Exp $ */ -/* This work is part of OpenLDAP Software <http://www.openldap.org/>. - * +/* * Copyright 1998-2008 The OpenLDAP Foundation. * All rights reserved. * @@ -33,7 +31,12 @@ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: utbm.h,v 1.1 1999/09/21 15:45:18 mleisher Exp $ */ + +/* + * This work is part of OpenLDAP Software <http://www.openldap.org/>. + * $OpenLDAP: pkg/ldap/libraries/liblunicode/utbm/utbm.h,v 1.10 2008/01/07 23:20:05 kurt Exp $ + * $Id: utbm.h,v 1.1 1999/09/21 15:45:18 mleisher Exp $ + */ #ifndef _h_utbm #define _h_utbm diff --git a/src/lib/krb5/unicode/utbm/utbmstub.c b/src/lib/krb5/unicode/utbm/utbmstub.c index 51fa67351..059401d64 100644 --- a/src/lib/krb5/unicode/utbm/utbmstub.c +++ b/src/lib/krb5/unicode/utbm/utbmstub.c @@ -1,6 +1,4 @@ -/* $OpenLDAP: pkg/ldap/libraries/liblunicode/utbm/utbmstub.c,v 1.8 2008/01/07 23:20:05 kurt Exp $ */ -/* This work is part of OpenLDAP Software <http://www.openldap.org/>. - * +/* * Copyright 1998-2008 The OpenLDAP Foundation. * All rights reserved. * @@ -33,7 +31,12 @@ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: utbmstub.c,v 1.1 1999/09/21 15:45:18 mleisher Exp $ */ + +/* + * This work is part of OpenLDAP Software <http://www.openldap.org/>. + * $OpenLDAP: pkg/ldap/libraries/liblunicode/utbm/utbmstub.c,v 1.8 2008/01/07 23:20:05 kurt Exp $ + * $Id: utbmstub.c,v 1.1 1999/09/21 15:45:18 mleisher Exp $ + */ #include "utbm.h" diff --git a/src/lib/rpc/auth_gss.c b/src/lib/rpc/auth_gss.c index 1d6837ef0..6e6117915 100644 --- a/src/lib/rpc/auth_gss.c +++ b/src/lib/rpc/auth_gss.c @@ -1,8 +1,5 @@ +/* lib/rpc/auth_gss.c */ /* - auth_gss.c - - RPCSEC_GSS client routines. - Copyright (c) 2000 The Regents of the University of Michigan. All rights reserved. @@ -37,6 +34,8 @@ Id: auth_gss.c,v 1.35 2002/10/15 21:25:25 kwc Exp */ +/* RPCSEC_GSS client routines. */ + #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/src/lib/rpc/authgss_prot.c b/src/lib/rpc/authgss_prot.c index 31a8ddab3..01f16ea55 100644 --- a/src/lib/rpc/authgss_prot.c +++ b/src/lib/rpc/authgss_prot.c @@ -1,6 +1,5 @@ +/* lib/rpc/authgss_prot.c */ /* - authgss_prot.c - Copyright (c) 2000 The Regents of the University of Michigan. All rights reserved. diff --git a/src/lib/rpc/bindresvport.c b/src/lib/rpc/bindresvport.c index 3de675638..6755f4db2 100644 --- a/src/lib/rpc/bindresvport.c +++ b/src/lib/rpc/bindresvport.c @@ -1,6 +1,4 @@ -#if !defined(lint) && defined(SCCSIDS) -static char sccsid[] = "@(#)bindresvport.c 2.2 88/07/29 4.0 RPCSRC 1.8 88/02/08 SMI"; -#endif +/* lib/rpc/bindresvport.c */ /* * Copyright (c) 2010, Oracle America, Inc. * diff --git a/src/lib/rpc/getrpcent.c b/src/lib/rpc/getrpcent.c index bd71d9ce8..604fa85d4 100644 --- a/src/lib/rpc/getrpcent.c +++ b/src/lib/rpc/getrpcent.c @@ -1,8 +1,4 @@ -/* @(#)getrpcent.c 2.2 88/07/29 4.0 RPCSRC */ -#if !defined(lint) && defined(SCCSIDS) -static char sccsid[] = "@(#)getrpcent.c 1.9 87/08/11 Copyr 1984 Sun Micro"; -#endif - +/* lib/rpc/getrpcent.c */ /* * Copyright (c) 2010, Oracle America, Inc. * diff --git a/src/lib/rpc/getrpcport.c b/src/lib/rpc/getrpcport.c index 45f64e005..8247bb39d 100644 --- a/src/lib/rpc/getrpcport.c +++ b/src/lib/rpc/getrpcport.c @@ -1,7 +1,4 @@ -/* @(#)getrpcport.c 2.1 88/07/29 4.0 RPCSRC */ -#if !defined(lint) && defined(SCCSIDS) -static char sccsid[] = "@(#)getrpcport.c 1.3 87/08/11 SMI"; -#endif +/* lib/rpc/getrpcport.c */ /* * Copyright (c) 2010, Oracle America, Inc. * diff --git a/src/lib/rpc/gssrpcint.h b/src/lib/rpc/gssrpcint.h index 8110596aa..1d1bd7ed1 100644 --- a/src/lib/rpc/gssrpcint.h +++ b/src/lib/rpc/gssrpcint.h @@ -1,6 +1,5 @@ +/* lib/rpc/gssrpcint.h */ /* - * lib/rpc/gssrpcint.h - * * Copyright (C) 2008 by the Massachusetts Institute of Technology. * All rights reserved. * @@ -22,9 +21,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. - * - * - * <<< Description >>> */ #ifndef __GSSRPCINT_H__ diff --git a/src/lib/rpc/svc_auth.c b/src/lib/rpc/svc_auth.c index 702bdf9be..5fedef7d7 100644 --- a/src/lib/rpc/svc_auth.c +++ b/src/lib/rpc/svc_auth.c @@ -1,6 +1,4 @@ -#if !defined(lint) && defined(SCCSIDS) -static char sccsid[] = "@(#)svc_auth.c 2.1 88/08/07 4.0 RPCSRC; from 1.19 87/08/11 Copyr 1984 Sun Micro"; -#endif +/* lib/rpc/svc_auth.c */ /* * Copyright (c) 2010, Oracle America, Inc. * diff --git a/src/lib/rpc/svc_auth_gss.c b/src/lib/rpc/svc_auth_gss.c index cac57027b..c3d52dc89 100644 --- a/src/lib/rpc/svc_auth_gss.c +++ b/src/lib/rpc/svc_auth_gss.c @@ -1,6 +1,5 @@ +/* lib/rpc/svc_auth_gss.c */ /* - svc_auth_gss.c - Copyright (c) 2000 The Regents of the University of Michigan. All rights reserved. diff --git a/src/lib/rpc/svc_auth_none.c b/src/lib/rpc/svc_auth_none.c index ab9942e8b..cba230d92 100644 --- a/src/lib/rpc/svc_auth_none.c +++ b/src/lib/rpc/svc_auth_none.c @@ -1,6 +1,5 @@ +/* lib/rpc/svc_auth_none.c */ /* - svc_auth_none.c - Copyright (c) 2000 The Regents of the University of Michigan. All rights reserved. diff --git a/src/lib/rpc/svc_run.c b/src/lib/rpc/svc_run.c index 9e4acd819..32b8517ee 100644 --- a/src/lib/rpc/svc_run.c +++ b/src/lib/rpc/svc_run.c @@ -1,8 +1,4 @@ -/* @(#)svc_run.c 2.1 88/07/29 4.0 RPCSRC */ -#if !defined(lint) && defined(SCCSIDS) -static char sccsid[] = "@(#)svc_run.c 1.1 87/10/13 Copyr 1984 Sun Micro"; -#endif - +/* lib/rpc/svc_run.c */ /* * Copyright (c) 2010, Oracle America, Inc. * diff --git a/src/lib/rpc/xdr_alloc.c b/src/lib/rpc/xdr_alloc.c index 6d5e4c833..8c58cffca 100644 --- a/src/lib/rpc/xdr_alloc.c +++ b/src/lib/rpc/xdr_alloc.c @@ -1,4 +1,4 @@ -/* @(#)xdr_mem.c 2.1 88/07/29 4.0 RPCSRC */ +/* lib/rpc/xdr_alloc.c */ /* * Copyright (c) 2010, Oracle America, Inc. * @@ -31,13 +31,8 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if !defined(lint) && defined(SCCSIDS) -static char sccsid[] = "@(#)xdr_mem.c 1.19 87/08/11 Copyr 1984 Sun Micro"; -#endif - /* * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved. - * */ #include <gssrpc/types.h> |