unify the extern stuff into an include file

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

4 files changed, 5 insertions, 22 deletions

diff --git a/src/lib/krb5/krb/decode_kdc.c b/src/lib/krb5/krb/decode_kdc.c
index 7a7aaad23..6281e86be 100644
--- a/src/lib/krb5/krb/decode_kdc.c
+++ b/src/lib/krb5/krb/decode_kdc.c
@@ -26,10 +26,6 @@ static char rcsid_decode_kdc_c[] =
 
 #include <krb5/ext-proto.h>
 
-/* array of pointers into encryption systems */
-extern krb5_cs_table_entry *csarray[];
-extern int max_cryptosystem;
-
 /*
  Takes a KDC_REP message and decrypts encrypted part using etype and
  *key, putting result in *rep.
@@ -79,12 +75,12 @@ krb5_kdc_rep **dec_rep;
 	return(ENOMEM);
     }
 
-    if (!valid_etype(local_dec_rep->etype))
+    if (!valid_etype(etype))
 	return KRB5KDC_ERR_ETYPE_NOSUPP;
 
     /* put together an eblock for this encryption */
 
-    eblock.crypto_entry = csarray[local_dec_rep->etype]->system;
+    eblock.crypto_entry = krb5_csarray[etype]->system;
 
     /* do any necessary key pre-processing */
     if (retval = (*eblock.crypto_entry->process_key)(&eblock, key)) {
diff --git a/src/lib/krb5/krb/decrypt_tk.c b/src/lib/krb5/krb/decrypt_tk.c
index 1801c552b..bd5a48602 100644
--- a/src/lib/krb5/krb/decrypt_tk.c
+++ b/src/lib/krb5/krb/decrypt_tk.c
@@ -25,11 +25,6 @@ static char rcsid_decrypt_tk_c[] =
 
 #include <krb5/ext-proto.h>
 
-
-/* array of pointers into encryption systems */
-extern krb5_cs_table_entry *csarray[];
-extern int max_cryptosystem;
-
 /*
  Takes encrypted dec_ticket->enc_part, encrypts with dec_ticket->etype
  using *srv_key, and places result in dec_ticket->enc_part2.
@@ -54,7 +49,7 @@ register krb5_ticket *ticket;
 
     /* put together an eblock for this encryption */
 
-    eblock.crypto_entry = csarray[ticket->etype]->system;
+    eblock.crypto_entry = krb5_csarray[ticket->etype]->system;
 
     scratch.length = ticket->enc_part.length;
     if (!(scratch.data = malloc(ticket->enc_part.length)))
diff --git a/src/lib/krb5/krb/encode_kdc.c b/src/lib/krb5/krb/encode_kdc.c
index 62546db20..f04b7045d 100644
--- a/src/lib/krb5/krb/encode_kdc.c
+++ b/src/lib/krb5/krb/encode_kdc.c
@@ -24,10 +24,6 @@ static char rcsid_encode_kdc_c [] =
 
 #include <krb5/ext-proto.h>
 
-/* array of pointers into encryption systems */
-extern krb5_cs_table_entry *csarray[];
-extern int max_cryptosystem;		/* max entry in array */
-
 /*
  Takes KDC rep parts in *rep and *encpart, and formats it into *enc_rep,
  using message type type and encryption key client_key and encryption type
@@ -71,7 +67,7 @@ krb5_data **enc_rep;
 
     /* put together an eblock for this encryption */
 
-    eblock.crypto_entry = csarray[dec_rep->etype]->system;
+    eblock.crypto_entry = krb5_csarray[dec_rep->etype]->system;
     dec_rep->enc_part.length = krb5_encrypt_size(scratch->length,
 					      eblock.crypto_entry);
     if (!(dec_rep->enc_part.data = malloc(dec_rep->enc_part.length))) {
diff --git a/src/lib/krb5/krb/encrypt_tk.c b/src/lib/krb5/krb/encrypt_tk.c
index a2b141ccb..e37d4ea43 100644
--- a/src/lib/krb5/krb/encrypt_tk.c
+++ b/src/lib/krb5/krb/encrypt_tk.c
@@ -25,10 +25,6 @@ static char rcsid_encrypt_tk_c[] =
 
 #include <krb5/ext-proto.h>
 
-/* array of pointers into encryption systems */
-extern krb5_cs_table_entry *csarray[];
-extern int max_cryptosystem;		/* max entry in array */
-
 /*
  Takes unencrypted dec_ticket & dec_tkt_part, encrypts with dec_ticket->etype
  using *srv_key, and places result in dec_ticket->enc_part.
@@ -63,7 +59,7 @@ register krb5_ticket *dec_ticket;
 
     /* put together an eblock for this encryption */
 
-    eblock.crypto_entry = csarray[dec_ticket->etype]->system;
+    eblock.crypto_entry = krb5_csarray[dec_ticket->etype]->system;
     dec_ticket->enc_part.length = krb5_encrypt_size(scratch->length,
 						     eblock.crypto_entry);
     if (!(dec_ticket->enc_part.data = malloc(dec_ticket->enc_part.length))) {