use new macro for assigning encryption system pointers

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

diff --git a/src/lib/krb5/krb/decrypt_tk.c b/src/lib/krb5/krb/decrypt_tk.c
index a6903c6595e9e7ed240b1be58a941d9eccc3e062..dac0600a51b3139d2ba2bd63ee40872329314488 100644 (file)
--- a/src/lib/krb5/krb/decrypt_tk.c
+++ b/src/lib/krb5/krb/decrypt_tk.c
@@ -46,7 +46,7 @@ register krb5_ticket *ticket;
 
     /* put together an eblock for this encryption */
 
-    eblock.crypto_entry = krb5_csarray[ticket->enc_part.etype]->system;
+    krb5_use_cstype(&eblock, ticket->enc_part.etype);
 
     scratch.length = ticket->enc_part.ciphertext.length;
     if (!(scratch.data = malloc(ticket->enc_part.ciphertext.length)))

diff --git a/src/lib/krb5/krb/encrypt_tk.c b/src/lib/krb5/krb/encrypt_tk.c
index 74f18e324dedd9fbb82a8963235302c7d377803f..d6f00fb4ea08d619a7ae2ec2a2fe73a81b403746 100644 (file)
--- a/src/lib/krb5/krb/encrypt_tk.c
+++ b/src/lib/krb5/krb/encrypt_tk.c
@@ -59,7 +59,7 @@ krb5_free_data(scratch); }
 
     /* put together an eblock for this encryption */
 
-    eblock.crypto_entry = krb5_csarray[dec_ticket->enc_part.etype]->system;
+    krb5_use_cstype(&eblock, dec_ticket->enc_part.etype);
     dec_ticket->enc_part.ciphertext.length =
        krb5_encrypt_size(scratch->length,
                          eblock.crypto_entry);

diff --git a/src/lib/krb5/krb/kdc_rep_dc.c b/src/lib/krb5/krb/kdc_rep_dc.c
index 0ae1cd1c7fb99bb5616bd5e87c9e4b5cfcfa4d51..efbc58e2f877c698f8da362873d4169c10333134 100644 (file)
--- a/src/lib/krb5/krb/kdc_rep_dc.c
+++ b/src/lib/krb5/krb/kdc_rep_dc.c
@@ -52,7 +52,7 @@ OLDDECLARG(krb5_kdc_rep *, dec_rep)
 
     /* put together an eblock for this encryption */
 
-    eblock.crypto_entry = krb5_csarray[dec_rep->enc_part.etype]->system;
+    krb5_use_cstype(&eblock, dec_rep->enc_part.etype);
 
     /* do any necessary key pre-processing */
     if (retval = krb5_process_key(&eblock, key)) {

diff --git a/src/lib/krb5/krb/mk_priv.c b/src/lib/krb5/krb/mk_priv.c
index 420f208d5f1de8cc0525dba290a396a0aa3d4a9a..5a89400b76598e30b3b70eee2f35732a58e768c0 100644 (file)
--- a/src/lib/krb5/krb/mk_priv.c
+++ b/src/lib/krb5/krb/mk_priv.c
@@ -89,7 +89,7 @@ OLDDECLARG(krb5_data *, outbuf)
 
     /* put together an eblock for this encryption */
 
-    eblock.crypto_entry = krb5_csarray[etype]->system;
+    krb5_use_cstype(&eblock, etype);
     privmsg.enc_part.ciphertext.length = krb5_encrypt_size(scratch->length,
                                                eblock.crypto_entry);
     /* add padding area, and zero it */

diff --git a/src/lib/krb5/krb/mk_rep.c b/src/lib/krb5/krb/mk_rep.c
index 926da2d05282b2dbc5a9993db787e3bef9cd6729..1174b20ac41723c5a62018223b688cb89067f76f 100644 (file)
--- a/src/lib/krb5/krb/mk_rep.c
+++ b/src/lib/krb5/krb/mk_rep.c
@@ -67,7 +67,7 @@ krb5_free_data(scratch); }
 
     /* put together an eblock for this encryption */
 
-    eblock.crypto_entry = krb5_csarray[etype]->system;
+    krb5_use_cstype(&eblock, etype);
     reply.enc_part.etype = etype;
     reply.enc_part.kvno = 0;           /* XXX user set? */
 

diff --git a/src/lib/krb5/krb/mk_req_ext.c b/src/lib/krb5/krb/mk_req_ext.c
index 22972b247b597b1c9daca1ceb0eebe35afbb75b3..1041fdcc20cdd1d7f4e2899eedc9f05d924b425f 100644 (file)
--- a/src/lib/krb5/krb/mk_req_ext.c
+++ b/src/lib/krb5/krb/mk_req_ext.c
@@ -132,7 +132,7 @@ krb5_free_data(scratch); }
 
     /* put together an eblock for this encryption */
 
-    eblock.crypto_entry = krb5_csarray[etype]->system;
+    krb5_use_cstype(&eblock, etype);
     request.authenticator.etype = etype;
     request.authenticator.kvno = 0; /* XXX user set? */
     request.authenticator.ciphertext.length =

diff --git a/src/lib/krb5/krb/rd_priv.c b/src/lib/krb5/krb/rd_priv.c
index 94b8d82d6297f1ef20cd69e841702fb276578e72..8cc22dfe1aaf94ed4517b7ea8a733b290f2e1c8c 100644 (file)
--- a/src/lib/krb5/krb/rd_priv.c
+++ b/src/lib/krb5/krb/rd_priv.c
@@ -83,7 +83,7 @@ OLDDECLARG(krb5_data *, outbuf)
                           
     /* put together an eblock for this decryption */
 
-    eblock.crypto_entry = krb5_csarray[privmsg->enc_part.etype]->system;
+    krb5_use_cstype(&eblock, privmsg->enc_part.etype);
     scratch.length = privmsg->enc_part.ciphertext.length;
     
     if (!(scratch.data = malloc(scratch.length))) {

diff --git a/src/lib/krb5/krb/rd_rep.c b/src/lib/krb5/krb/rd_rep.c
index 419b3439e1b3abb3642ca20abc70f24d5d18c6d2..148835fce2332042aef5a21bb40a8b6b715235d3 100644 (file)
--- a/src/lib/krb5/krb/rd_rep.c
+++ b/src/lib/krb5/krb/rd_rep.c
@@ -60,7 +60,7 @@ krb5_ap_rep_enc_part *repl;
        krb5_free_ap_rep(reply);
        return KRB5_PROG_ETYPE_NOSUPP;
     }
-    eblock.crypto_entry = krb5_csarray[reply->enc_part.etype]->system;
+    krb5_use_cstype(&eblock, reply->enc_part.etype);
 
     scratch.length = reply->enc_part.ciphertext.length;
     if (!(scratch.data = malloc(scratch.length))) {

diff --git a/src/lib/krb5/krb/rd_req_dec.c b/src/lib/krb5/krb/rd_req_dec.c
index 40f1a9a24e7fc96f922cb709355db21bacb68458..e04f4112b207014d22d97abe8cfc186d43a4e6b2 100644 (file)
--- a/src/lib/krb5/krb/rd_req_dec.c
+++ b/src/lib/krb5/krb/rd_req_dec.c
@@ -199,7 +199,7 @@ krb5_authenticator **authpp;
     if (!valid_etype(request->authenticator.etype))
        return KRB5_PROG_ETYPE_NOSUPP;
 
-    eblock.crypto_entry = krb5_csarray[request->authenticator.etype]->system;
+    krb5_use_cstype(&eblock, request->authenticator.etype);
 
     scratch.length = request->authenticator.ciphertext.length;
     if (!(scratch.data = malloc(scratch.length)))