[25739] in CVS-changelog-for-Kerberos-V5
svn rev #25229: trunk/src/ include/ kdc/ lib/krb5/krb/ lib/krb5/os/
daemon@ATHENA.MIT.EDU (ghudson@mit.edu)
Sat Sep 24 08:19:17 2011
Date: Sat, 24 Sep 2011 08:19:15 -0400
From: ghudson@mit.edu
Message-Id: <201109241219.p8OCJFeA024694@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
http://src.mit.edu/fisheye/changelog/krb5/?cs=25229
Commit By: ghudson
Log Message:
Don't use accessor in encrypted challenge.
Now that the encrypted challenge code is linked into libkrb5 and the
KDC, it's unnecessary to use the accessor there.
Changed Files:
U trunk/src/include/k5-int.h
U trunk/src/kdc/kdc_preauth_ec.c
U trunk/src/lib/krb5/krb/preauth_ec.c
U trunk/src/lib/krb5/os/accessor.c
Modified: trunk/src/include/k5-int.h
===================================================================
--- trunk/src/include/k5-int.h 2011-09-23 14:49:13 UTC (rev 25228)
+++ trunk/src/include/k5-int.h 2011-09-24 12:19:14 UTC (rev 25229)
@@ -2127,7 +2127,7 @@
/* To keep happy libraries which are (for now) accessing internal stuff */
/* Make sure to increment by one when changing the struct */
-#define KRB5INT_ACCESS_STRUCT_VERSION 17
+#define KRB5INT_ACCESS_STRUCT_VERSION 18
#ifndef ANAME_SZ
struct ktext; /* from krb.h, for krb524 support */
@@ -2163,17 +2163,6 @@
(*asn1_ldap_decode_sequence_of_keys)(krb5_data *in,
ldap_seqof_key_data **);
- /* Used for encrypted challenge fast factor*/
- krb5_error_code (*encode_enc_data)(const krb5_enc_data *, krb5_data **);
- krb5_error_code (*decode_enc_data)(const krb5_data *, krb5_enc_data **);
- void (KRB5_CALLCONV *free_enc_data)(krb5_context, krb5_enc_data *);
- krb5_error_code (*encode_enc_ts)(const krb5_pa_enc_ts *, krb5_data **);
- krb5_error_code (*decode_enc_ts)(const krb5_data *, krb5_pa_enc_ts **);
- void (KRB5_CALLCONV *free_enc_ts)(krb5_context, krb5_pa_enc_ts *);
- krb5_error_code
- (*encrypt_helper)(krb5_context, const krb5_keyblock *, krb5_keyusage,
- const krb5_data *, krb5_enc_data *);
-
/*
* pkinit asn.1 encode/decode functions
*/
Modified: trunk/src/kdc/kdc_preauth_ec.c
===================================================================
--- trunk/src/kdc/kdc_preauth_ec.c 2011-09-23 14:49:13 UTC (rev 25228)
+++ trunk/src/kdc/kdc_preauth_ec.c 2011-09-24 12:19:14 UTC (rev 25229)
@@ -68,7 +68,6 @@
krb5_data scratch, plain;
krb5_keyblock *armor_key = NULL;
krb5_pa_enc_ts *ts = NULL;
- krb5int_access kaccess;
krb5_keyblock *client_keys = NULL;
krb5_data *client_data = NULL;
krb5_keyblock *challenge_key = NULL;
@@ -76,8 +75,6 @@
int i = 0;
plain.data = NULL;
- if (krb5int_accessor(&kaccess, KRB5INT_ACCESS_VERSION) != 0)
- return 0;
retval = fast_kdc_get_armor_key(context, get_entry_proc, request, client, &armor_key);
if (retval == 0 &&armor_key == NULL) {
@@ -87,7 +84,7 @@
scratch.data = (char *) data->contents;
scratch.length = data->length;
if (retval == 0)
- retval = kaccess.decode_enc_data(&scratch, &enc);
+ retval = decode_krb5_enc_data(&scratch, &enc);
if (retval == 0) {
plain.data = malloc(enc->ciphertext.length);
plain.length = enc->ciphertext.length;
@@ -129,7 +126,7 @@
}
if (retval == 0)
- retval = kaccess.decode_enc_ts(&plain, &ts);
+ retval = decode_krb5_pa_enc_ts(&plain, &ts);
if (retval == 0)
retval = krb5_timeofday(context, &now);
if (retval == 0) {
@@ -159,9 +156,9 @@
if (plain.data)
free(plain.data);
if (enc)
- kaccess.free_enc_data(context, enc);
+ krb5_free_enc_data(context, enc);
if (ts)
- kaccess.free_enc_ts(context, ts);
+ krb5_free_pa_enc_ts(context, ts);
return retval;
}
@@ -182,23 +179,20 @@
krb5_enc_data enc;
krb5_data *encoded = NULL;
krb5_pa_data *pa = NULL;
- krb5int_access kaccess;
- if (krb5int_accessor(&kaccess, KRB5INT_ACCESS_VERSION) != 0)
- return 0;
if (challenge_key == NULL)
return 0;
enc.ciphertext.data = NULL; /* In case of error pass through */
retval = krb5_us_timeofday(context, &ts.patimestamp, &ts.pausec);
if (retval == 0)
- retval = kaccess.encode_enc_ts(&ts, &plain);
+ retval = encode_krb5_pa_enc_ts(&ts, &plain);
if (retval == 0)
- retval = kaccess.encrypt_helper(context, challenge_key,
- KRB5_KEYUSAGE_ENC_CHALLENGE_KDC,
- plain, &enc);
+ retval = krb5_encrypt_helper(context, challenge_key,
+ KRB5_KEYUSAGE_ENC_CHALLENGE_KDC,
+ plain, &enc);
if (retval == 0)
- retval = kaccess.encode_enc_data(&enc, &encoded);
+ retval = encode_krb5_enc_data(&enc, &encoded);
if (retval == 0) {
pa = calloc(1, sizeof(krb5_pa_data));
if (pa == NULL)
Modified: trunk/src/lib/krb5/krb/preauth_ec.c
===================================================================
--- trunk/src/lib/krb5/krb/preauth_ec.c 2011-09-23 14:49:13 UTC (rev 25228)
+++ trunk/src/lib/krb5/krb/preauth_ec.c 2011-09-24 12:19:14 UTC (rev 25229)
@@ -56,10 +56,7 @@
krb5_enctype enctype = 0;
krb5_keyblock *challenge_key = NULL, *armor_key = NULL;
krb5_data *etype_data = NULL;
- krb5int_access kaccess;
- if (krb5int_accessor(&kaccess, KRB5INT_ACCESS_VERSION) != 0)
- return 0;
retval = fast_get_armor_key(context, get_data_proc, rock, &armor_key);
if (retval || armor_key == NULL)
return 0;
@@ -82,7 +79,7 @@
as_key, "challengelongterm",
&challenge_key);
if (retval == 0)
- retval =kaccess.decode_enc_data(&scratch, &enc);
+ retval = decode_krb5_enc_data(&scratch, &enc);
scratch.data = NULL;
if (retval == 0) {
scratch.data = malloc(enc->ciphertext.length);
@@ -104,7 +101,7 @@
if (retval == 0)
fast_set_kdc_verified(context, get_data_proc, rock);
if (enc)
- kaccess.free_enc_data(context, enc);
+ krb5_free_enc_data(context, enc);
} else if (retval == 0) { /*No padata; we send*/
krb5_enc_data enc;
krb5_pa_data *pa = NULL;
@@ -114,21 +111,21 @@
enc.ciphertext.data = NULL;
retval = krb5_us_timeofday(context, &ts.patimestamp, &ts.pausec);
if (retval == 0)
- retval = kaccess.encode_enc_ts(&ts, &encoded_ts);
+ retval = encode_krb5_pa_enc_ts(&ts, &encoded_ts);
if (retval == 0)
retval = krb5_c_fx_cf2_simple(context,
armor_key, "clientchallengearmor",
as_key, "challengelongterm",
&challenge_key);
if (retval == 0)
- retval = kaccess.encrypt_helper(context, challenge_key,
- KRB5_KEYUSAGE_ENC_CHALLENGE_CLIENT,
- encoded_ts, &enc);
+ retval = krb5_encrypt_helper(context, challenge_key,
+ KRB5_KEYUSAGE_ENC_CHALLENGE_CLIENT,
+ encoded_ts, &enc);
if (encoded_ts)
krb5_free_data(context, encoded_ts);
encoded_ts = NULL;
if (retval == 0) {
- retval = kaccess.encode_enc_data(&enc, &encoded_ts);
+ retval = encode_krb5_enc_data(&enc, &encoded_ts);
krb5_free_data_contents(context, &enc.ciphertext);
}
if (retval == 0) {
Modified: trunk/src/lib/krb5/os/accessor.c
===================================================================
--- trunk/src/lib/krb5/os/accessor.c 2011-09-23 14:49:13 UTC (rev 25228)
+++ trunk/src/lib/krb5/os/accessor.c 2011-09-24 12:19:14 UTC (rev 25229)
@@ -113,13 +113,6 @@
S (encode_krb5_sam_response_2, encode_krb5_sam_response_2),
S (encode_krb5_enc_sam_response_enc_2, encode_krb5_enc_sam_response_enc_2),
- S (encode_enc_ts, encode_krb5_pa_enc_ts),
- S (decode_enc_ts, decode_krb5_pa_enc_ts),
- S (encode_enc_data, encode_krb5_enc_data),
- S(decode_enc_data, decode_krb5_enc_data),
- S(free_enc_ts, krb5_free_pa_enc_ts),
- S(free_enc_data, krb5_free_enc_data),
- S(encrypt_helper, krb5_encrypt_helper),
#if DESIGNATED_INITIALIZERS
};
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
