fix copyrights; add RCS strings to those needing them

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

diff --git a/src/lib/crypto/des/cbc_cksum.c b/src/lib/crypto/des/cbc_cksum.c
index 39988441a0f1319965513194f8f115a6725d17bc..a7ce6c2290e236a34515982a6c2fdcc256b1e65f 100644 (file)
--- a/src/lib/crypto/des/cbc_cksum.c
+++ b/src/lib/crypto/des/cbc_cksum.c
@@ -4,6 +4,7 @@
  *
  * Copyright 1985, 1986, 1987, 1988, 1990 by the Massachusetts Institute
  * of Technology.
+ * All Rights Reserved.
  *
  * Under U.S. law, this software may not be exported outside the US
  * without license from the U.S. Commerce department.
@@ -20,7 +21,6 @@ static char rcsid_cbc_cksum_c[] =
 "$Id$";
 #endif /* !lint & !SABER */
 
-#include <krb5/copyright.h>
 
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>

diff --git a/src/lib/crypto/des/cksum.c b/src/lib/crypto/des/cksum.c
index ae24a917ad95d5dabf3df18854ed3280628a6714..382df1f19f29444d45ff2f0b306ef891edd3c9f7 100644 (file)
--- a/src/lib/crypto/des/cksum.c
+++ b/src/lib/crypto/des/cksum.c
@@ -4,6 +4,7 @@
  *
  * Copyright 1985, 1986, 1987, 1988, 1990 by the Massachusetts Institute
  * of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -25,7 +26,6 @@ static char rcsid_cksum_c[] =
 "$Id$";
 #endif /* !lint & !SABER */
 
-#include <krb5/copyright.h>
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>
 

diff --git a/src/lib/crypto/des/cs_entry.c b/src/lib/crypto/des/cs_entry.c
index 985d3f03422dd8812adcf2ebb24a59ca6e7f378a..0c6f6f39b5eb03ea50d4866b80ecc033156aec8f 100644 (file)
--- a/src/lib/crypto/des/cs_entry.c
+++ b/src/lib/crypto/des/cs_entry.c
@@ -2,7 +2,8 @@
  * $Source$
  * $Author$
  *
- * Copyright 1990 by the Massachusetts Institute of Technology.
+ * Copyright 1990,1991 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -15,7 +16,6 @@ static char rcsid_cs_entry_c[] =
 "$Id$";
 #endif /* !lint & !SABER */
 
-#include <krb5/copyright.h>
 
 #include <krb5/krb5.h>
 #include <krb5/crc-32.h>

diff --git a/src/lib/crypto/des/des.c b/src/lib/crypto/des/des.c
index ff8b3b9b4ad4603d8baf4d3210fef169d85aa3d7..2c7853a24b55a838c053004014091a8c8275ac4e 100644 (file)
--- a/src/lib/crypto/des/des.c
+++ b/src/lib/crypto/des/des.c
@@ -4,6 +4,7 @@
  *
  * Copyright 1985, 1986, 1987, 1988, 1990 by the Massachusetts Institute
  * of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -39,7 +40,6 @@ static char rcsid_des_c[] =
 "$Id$";
 #endif /* !lint & !SABER */
 
-#include <krb5/copyright.h>
 
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>

diff --git a/src/lib/crypto/des/enc_dec.c b/src/lib/crypto/des/enc_dec.c
index 8238c84631cf6757b1ed81110f74ba0ea588fef7..516732cc2ca9a87ad6357b7a99114c620a23f4c4 100644 (file)
--- a/src/lib/crypto/des/enc_dec.c
+++ b/src/lib/crypto/des/enc_dec.c
@@ -4,6 +4,7 @@
  *
  * Copyright 1985, 1986, 1987, 1988, 1990 by the Massachusetts Institute
  * of Technology.
+ * All Rights Reserved.
  *
  * These routines perform encryption and decryption using the DES
  * private key algorithm, or else a subset of it -- fewer inner loops.
@@ -26,7 +27,6 @@ static char rcsid_enc_dec_c[] =
 "$Id$";
 #endif /* !lint & !SABER */
 
-#include <krb5/copyright.h>
 
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>

diff --git a/src/lib/crypto/des/finish_key.c b/src/lib/crypto/des/finish_key.c
index 52982311b09670d04ed884c844b3e83d1ebd4d8e..297f042227882840e2ca147b6bedd23eaf2649dd 100644 (file)
--- a/src/lib/crypto/des/finish_key.c
+++ b/src/lib/crypto/des/finish_key.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -14,7 +15,6 @@ static char rcsid_finish_key_c[] =
 "$Id$";
 #endif /* !lint & !SABER */
 
-#include <krb5/copyright.h>
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>
 

diff --git a/src/lib/crypto/des/init_rkey.c b/src/lib/crypto/des/init_rkey.c
index dabc8b00cadbef64decbf6a1d1bb59ace7746373..732265bc3fbb4ba231396e54248248be2c1c628d 100644 (file)
--- a/src/lib/crypto/des/init_rkey.c
+++ b/src/lib/crypto/des/init_rkey.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -14,7 +15,6 @@ static char rcsid_init_rkey_c[] =
 "$Id$";
 #endif /* !lint & !SABER */
 
-#include <krb5/copyright.h>
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>
 

diff --git a/src/lib/crypto/des/key_parity.c b/src/lib/crypto/des/key_parity.c
index 9cfff290241578f461da72da043a8432161b045e..3890d4adfd641928146662aa920390fb5f521e5e 100644 (file)
--- a/src/lib/crypto/des/key_parity.c
+++ b/src/lib/crypto/des/key_parity.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1989, 1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -22,7 +23,6 @@ static char rcsid_key_parity_c[] =
 "$Id$";
 #endif /* !lint & !SABER */
 
-#include <krb5/copyright.h>
 #include <krb5/krb5.h>
 #include "des_int.h"
 

diff --git a/src/lib/crypto/des/key_sched.c b/src/lib/crypto/des/key_sched.c
index 30e239f7a5a3fb29130c0f409b1ce76f2ee834ec..a77e5059652e377a27047b2ba4b9f46ef6c7360c 100644 (file)
--- a/src/lib/crypto/des/key_sched.c
+++ b/src/lib/crypto/des/key_sched.c
@@ -4,6 +4,7 @@
  *
  * Copyright 1985, 1986, 1987, 1988, 1990 by the Massachusetts Institute
  * of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -35,7 +36,6 @@ static char rcsid_key_sched_c[] =
 "$Id$";
 #endif /* !lint & !SABER */
 
-#include <krb5/copyright.h>
 #include <stdio.h>
 
 #include <krb5/krb5.h>

diff --git a/src/lib/crypto/des/krb_glue.c b/src/lib/crypto/des/krb_glue.c
index 23373b9dbbfa6b8630631deaf6f658b77bec5cb6..3396d96ae00008c1d6bd72e84fb94da9f84722af 100644 (file)
--- a/src/lib/crypto/des/krb_glue.c
+++ b/src/lib/crypto/des/krb_glue.c
@@ -4,6 +4,7 @@
  *
  * Copyright 1985, 1986, 1987, 1988, 1990 by the Massachusetts Institute
  * of Technology.
+ * All Rights Reserved.
  *
  * These routines perform encryption and decryption using the DES
  * private key algorithm, or else a subset of it -- fewer inner loops.
@@ -32,7 +33,6 @@ static char rcsid_enc_dec_c[] =
 "$Id$";
 #endif /* !lint & !SABER */
 
-#include <krb5/copyright.h>
 
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>

diff --git a/src/lib/crypto/des/make_e.c b/src/lib/crypto/des/make_e.c
index b2afd0a69658c0d8c4f3c4b3f7dc233f779cddc6..d912967cb1d54a22da1bc9ca30e3efb8eb5d8e51 100644 (file)
--- a/src/lib/crypto/des/make_e.c
+++ b/src/lib/crypto/des/make_e.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1987, 1988, 1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -11,7 +12,11 @@
  * operations of the DES.
  */
 
-#include <krb5/copyright.h>
+#if !defined(lint) && !defined(SABER)
+static char rcsid_make_e_c[] =
+"$Id$";
+#endif /* !lint & !SABER */
+
 #include <krb5/krb5.h>
 #include <stdio.h>
 #include "des_int.h"

diff --git a/src/lib/crypto/des/make_fp.c b/src/lib/crypto/des/make_fp.c
index 49e7659d494a4165f22cf14739903294859872e5..a478906956cc0e518a624f76fb05dc65be2288a8 100644 (file)
--- a/src/lib/crypto/des/make_fp.c
+++ b/src/lib/crypto/des/make_fp.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1988, 1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -11,7 +12,11 @@
  * implementing the final permutation of the DES.
  */
 
-#include <krb5/copyright.h>
+#if !defined(lint) && !defined(SABER)
+static char rcsid_make_fp_c[] =
+"$Id$";
+#endif /* !lint & !SABER */
+
 #include <krb5/krb5.h>
 #include <stdio.h>
 #include <krb5/ext-proto.h>

diff --git a/src/lib/crypto/des/make_ip.c b/src/lib/crypto/des/make_ip.c
index feb02f71fc4dfcfac4096455251df0f4a64d45be..6114f9dbec3ed2ae53e197eaf7d785b3fdda6b54 100644 (file)
--- a/src/lib/crypto/des/make_ip.c
+++ b/src/lib/crypto/des/make_ip.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1987, 1988,1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -11,7 +12,11 @@
  * permutation of the DES.
  */
 
-#include <krb5/copyright.h>
+#if !defined(lint) && !defined(SABER)
+static char rcsid_make_ip_c[] =
+"$Id$";
+#endif /* !lint & !SABER */
+
 #include <krb5/krb5.h>
 #include <stdio.h>
 #include "des_int.h"

diff --git a/src/lib/crypto/des/make_kp.c b/src/lib/crypto/des/make_kp.c
index e7745599b46b2708e36dbe386dfcbcadd568910a..3cbd3f3018f335a1c090255289348adb260d2112 100644 (file)
--- a/src/lib/crypto/des/make_kp.c
+++ b/src/lib/crypto/des/make_kp.c
@@ -4,6 +4,7 @@
  * $Locker$
  *
  * Copyright 1988,1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -16,14 +17,13 @@
  * subscripts starting at 0.
  */
 
-#include <krb5/copyright.h>
 #include <krb5/krb5.h>
 #include <stdio.h>
 #include "des_int.h"
 
 #ifndef lint
 static char rcsid_make_kp[]=
-    "$Id$";
+"$Id$";
 #endif /* lint */
 
 char *progname;

diff --git a/src/lib/crypto/des/make_odd.c b/src/lib/crypto/des/make_odd.c
index 84653ea50c94c387520aebe44e9a962d6cad5146..1c3f4deb9a5e24e6be11fc34cc7bac5b1e60e0dc 100644 (file)
--- a/src/lib/crypto/des/make_odd.c
+++ b/src/lib/crypto/des/make_odd.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1988,1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see
  * the file <krb5/copyright.h>.
@@ -10,7 +11,11 @@
  * This routine generates an odd-parity table for use in key generation.
  */
 
-#include <krb5/copyright.h>
+#if !defined(lint) && !defined(SABER)
+static char rcsid_make_odd_c[] =
+"$Id$";
+#endif /* !lint & !SABER */
+
 #include <stdio.h>
 
 void gen(stream)

diff --git a/src/lib/crypto/des/make_p.c b/src/lib/crypto/des/make_p.c
index 4f2cc9bf88ce8816e2f87b44d7d0c9b6b1fb5641..0a83fd182cd15a6a15782eae7458656d8556a416 100644 (file)
--- a/src/lib/crypto/des/make_p.c
+++ b/src/lib/crypto/des/make_p.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1985, 1988,1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please
  * see the file <krb5/copyright.h>.
@@ -10,7 +11,11 @@
  * This routine generates the P permutation code for the DES.
  */
 
-#include <krb5/copyright.h>
+#if !defined(lint) && !defined(SABER)
+static char rcsid_make_p_c[] =
+"$Id$";
+#endif /* !lint & !SABER */
+
 #include <krb5/krb5.h>
 #include <stdio.h>
 #include "des_int.h"

diff --git a/src/lib/crypto/des/make_pt.c b/src/lib/crypto/des/make_pt.c
index 27fd5af262266f212cdb03845189aeedc101a9dd..9bdc885f79672ac471115ab1a391ab0b19f9594f 100644 (file)
--- a/src/lib/crypto/des/make_pt.c
+++ b/src/lib/crypto/des/make_pt.c
@@ -3,13 +3,18 @@
  * $Author$
  *
  * Copyright 1985, 1988, 1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
  *
  */
 
-#include <krb5/copyright.h>
+#if !defined(lint) && !defined(SABER)
+static char rcsid_make_pt_c[] =
+"$Id$";
+#endif /* !lint & !SABER */
+
 #include <krb5/krb5.h>
 #include <stdio.h>
 #include "des_int.h"

diff --git a/src/lib/crypto/des/make_s.c b/src/lib/crypto/des/make_s.c
index 342b4c873d27cb08e55ee47c42b8a2cc0c447dcf..7b41f87cd1a820b23a2ff2a5afc74142447bf728 100644 (file)
--- a/src/lib/crypto/des/make_s.c
+++ b/src/lib/crypto/des/make_s.c
@@ -3,12 +3,18 @@
  * $Author$
  *
  * Copyright 1985, 1988, 1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please
  * see the file <krb5/copyright.h>.
  */
 
-#include <krb5/copyright.h>
+#if !defined(lint) && !defined(SABER)
+static char rcsid_make_s_c[] =
+"$Id$";
+#endif /* !lint & !SABER */
+
+
 #include <krb5/krb5.h>
 #include <stdio.h>
 #include "des_int.h"

diff --git a/src/lib/crypto/des/make_st.c b/src/lib/crypto/des/make_st.c
index 144f20f0dec4921be230cadcd2af71bebbc671bd..37db177ebc220826faf967ae2489f38830831418 100644 (file)
--- a/src/lib/crypto/des/make_st.c
+++ b/src/lib/crypto/des/make_st.c
@@ -3,12 +3,17 @@
  * $Author$
  *
  * Copyright 1985, 1988, 1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please
  * see the file <krb5/copyright.h>.
  */
 
-#include <krb5/copyright.h>
+#if !defined(lint) && !defined(SABER)
+static char rcsid_make_st_c[] =
+"$Id$";
+#endif /* !lint & !SABER */
+
 #include <krb5/krb5.h>
 #include <stdio.h>
 #include "des_int.h"

diff --git a/src/lib/crypto/des/misc.c b/src/lib/crypto/des/misc.c
index ecca804d6f66a71a79f84c24da7f931668026c50..2d224937a95fb0fce584509e4ca880455998573d 100644 (file)
--- a/src/lib/crypto/des/misc.c
+++ b/src/lib/crypto/des/misc.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1988, 1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -13,7 +14,11 @@
  * generating the intermediate source files.
  */
 
-#include <krb5/copyright.h>
+#if !defined(lint) && !defined(SABER)
+static char rcsid_misc_c[] =
+"$Id$";
+#endif /* !lint & !SABER */
+
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>
 #include <stdio.h>

diff --git a/src/lib/crypto/des/new_rn_key.c b/src/lib/crypto/des/new_rn_key.c
index e0fd7b9af414fedeb5cfea371417274e5242d7ae..117c24e675ecbb2e40dc4b84334d7aca7b2538f7 100644 (file)
--- a/src/lib/crypto/des/new_rn_key.c
+++ b/src/lib/crypto/des/new_rn_key.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1988,1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -21,7 +22,6 @@ static char rcsid_new_rn_key_c[] =
 "$Id$";
 #endif /* !lint & !SABER */
 
-#include <krb5/copyright.h>
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>
 #include <krb5/libos-proto.h>

diff --git a/src/lib/crypto/des/process_ky.c b/src/lib/crypto/des/process_ky.c
index 0445acbfdcf499116c717e6aa76770b7ca04fd78..f8b41d049d676a959f20a3b1a4ad2d8305da6edb 100644 (file)
--- a/src/lib/crypto/des/process_ky.c
+++ b/src/lib/crypto/des/process_ky.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -14,7 +15,6 @@ static char rcsid_process_ky_c[] =
 "$Id$";
 #endif /* !lint & !SABER */
 
-#include <krb5/copyright.h>
 
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>

diff --git a/src/lib/crypto/des/verify.c b/src/lib/crypto/des/verify.c
index 0f68493d02a7f7959cc40194466ca250b82d3ac1..827108b0ee9df4f99dcd984842a7ece28eb93a4c 100644 (file)
--- a/src/lib/crypto/des/verify.c
+++ b/src/lib/crypto/des/verify.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1988, 1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -19,7 +20,6 @@ static char rcsid_verify_c[] =
 "$Id$";
 #endif /*lint*/
 
-#include <krb5/copyright.h>
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>
 #include <krb5/mit-des.h>

diff --git a/src/lib/crypto/des/weak_key.c b/src/lib/crypto/des/weak_key.c
index 6643b2d7a33af936a8f62d96f9cfa42f3d65f654..3ac743f3370f158d1c7558ff09919632794cd2c3 100644 (file)
--- a/src/lib/crypto/des/weak_key.c
+++ b/src/lib/crypto/des/weak_key.c
@@ -2,7 +2,8 @@
  * $Source$
  * $Author$
  *
- * Copyright 1989 by the Massachusetts Institute of Technology.
+ * Copyright 1989,1990 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -20,7 +21,6 @@ static char rcsid_weak_key_c[] =
 "$Id$";
 #endif /* !lint & !SABER */
 
-#include <krb5/copyright.h>
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>
 #include "des_int.h"