convert to use valid_etype macro

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

diff --git a/src/lib/krb5/krb/decode_kdc.c b/src/lib/krb5/krb/decode_kdc.c
index b9fedde4c59e419bf397e8fef1711865d49e48cb..7a7aaad2388a15b82b324b846f715133fa3d5285 100644 (file)
--- a/src/lib/krb5/krb/decode_kdc.c
+++ b/src/lib/krb5/krb/decode_kdc.c
@@ -79,9 +79,7 @@ krb5_kdc_rep **dec_rep;
        return(ENOMEM);
     }
 
-    if (local_dec_rep->etype > max_cryptosystem ||
-       local_dec_rep->etype < 0 ||
-       !csarray[local_dec_rep->etype])
+    if (!valid_etype(local_dec_rep->etype))
        return KRB5KDC_ERR_ETYPE_NOSUPP;
 
     /* put together an eblock for this encryption */

diff --git a/src/lib/krb5/krb/decrypt_tk.c b/src/lib/krb5/krb/decrypt_tk.c
index aae30a0959416ac39019fb5bc0727c4b59471e73..1801c552bfc26aa26cfb55b56eee3134ffc943eb 100644 (file)
--- a/src/lib/krb5/krb/decrypt_tk.c
+++ b/src/lib/krb5/krb/decrypt_tk.c
@@ -49,9 +49,7 @@ register krb5_ticket *ticket;
     krb5_data scratch;
     krb5_error_code retval;
 
-    if (ticket->etype > max_cryptosystem ||
-       ticket->etype < 0 ||
-       !csarray[ticket->etype])
+    if (!valid_etype(ticket->etype))
        return KRB5KDC_ERR_ETYPE_NOSUPP;
 
     /* put together an eblock for this encryption */

diff --git a/src/lib/krb5/krb/encode_kdc.c b/src/lib/krb5/krb/encode_kdc.c
index b9e5b758d24b42cbbaecbd31590989c3de988251..62546db2090056852265a3449028b39634a4d315 100644 (file)
--- a/src/lib/krb5/krb/encode_kdc.c
+++ b/src/lib/krb5/krb/encode_kdc.c
@@ -26,6 +26,7 @@ static char rcsid_encode_kdc_c [] =
 
 /* 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,
@@ -51,6 +52,9 @@ krb5_data **enc_rep;
     krb5_encrypt_block eblock;
     krb5_error_code retval;
 
+    if (!valid_etype(dec_rep->etype))
+       return KRB5KDC_ERR_ETYPE_NOSUPP;
+
     switch (type) {
     case KRB5_AS_REP:
     case KRB5_TGS_REP:

diff --git a/src/lib/krb5/krb/encrypt_tk.c b/src/lib/krb5/krb/encrypt_tk.c
index faf39371400bd709aaa3804eb1a79e20ccb37610..a2b141ccb7adad8e1f391ef7e818219bb281dddc 100644 (file)
--- a/src/lib/krb5/krb/encrypt_tk.c
+++ b/src/lib/krb5/krb/encrypt_tk.c
@@ -51,9 +51,7 @@ register krb5_ticket *dec_ticket;
 
     /* encrypt the encrypted part */
 
-    if (dec_ticket->etype > max_cryptosystem ||
-       dec_ticket->etype < 0 ||
-       !csarray[dec_ticket->etype])
+    if (!valid_etype(dec_ticket->etype))
        return KRB5KDC_ERR_ETYPE_NOSUPP;
 
     /*  start by encoding the to-be-encrypted part. */