svn rev #25620: trunk/src/ include/ lib/krb5/asn.1/ lib/krb5/os/ plugins/preauth/pkinit/ ...
ghudson@MIT.EDU
ghudson at MIT.EDU
Sat Jan 7 12:26:13 EST 2012
http://src.mit.edu/fisheye/changelog/krb5/?cs=25620
Commit By: ghudson
Log Message:
Remove some unneeded accessor fields
Changed Files:
U trunk/src/include/k5-int.h
U trunk/src/lib/krb5/asn.1/asn1_k_encode.c
U trunk/src/lib/krb5/os/accessor.c
U trunk/src/plugins/preauth/pkinit/pkinit_accessor.c
U trunk/src/plugins/preauth/pkinit/pkinit_accessor.h
U trunk/src/tests/asn.1/krb5_encode_test.c
Modified: trunk/src/include/k5-int.h
===================================================================
--- trunk/src/include/k5-int.h 2012-01-07 16:50:06 UTC (rev 25619)
+++ trunk/src/include/k5-int.h 2012-01-07 17:26:13 UTC (rev 25620)
@@ -1548,9 +1548,6 @@
encode_krb5_authdata(krb5_authdata *const *rep, krb5_data **code);
krb5_error_code
-encode_krb5_authdata_elt(const krb5_authdata *rep, krb5_data **code);
-
-krb5_error_code
encode_krb5_padata_sequence(krb5_pa_data *const *rep, krb5_data **code);
krb5_error_code
@@ -1959,19 +1956,9 @@
/* 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 19
+#define KRB5INT_ACCESS_STRUCT_VERSION 20
-#ifndef ANAME_SZ
-struct ktext; /* from krb.h, for krb524 support */
-#endif
typedef struct _krb5int_access {
- /* crypto stuff */
- krb5_error_code (*arcfour_gsscrypt)(const krb5_keyblock *keyblock,
- krb5_keyusage usage,
- const krb5_data *kd_data,
- krb5_crypto_iov *data,
- size_t num_data);
-
krb5_error_code (*auth_con_get_subkey_enctype)(krb5_context,
krb5_auth_context,
krb5_enctype *);
@@ -2086,27 +2073,12 @@
***);
krb5_error_code
- (*decode_krb5_as_req)(const krb5_data *output, krb5_kdc_req **rep);
-
- krb5_error_code
(*encode_krb5_kdc_req_body)(const krb5_kdc_req *rep, krb5_data **code);
void
(KRB5_CALLCONV *free_kdc_req)(krb5_context, krb5_kdc_req * );
void
(*set_prompt_types)(krb5_context, krb5_prompt_type *);
-
- krb5_error_code
- (*encode_krb5_authdata_elt)(const krb5_authdata *rep, krb5_data **code);
-
- /* Exported for testing only! */
- krb5_error_code
- (*encode_krb5_sam_response_2)(const krb5_sam_response_2 *rep,
- krb5_data **code);
- krb5_error_code
- (*encode_krb5_enc_sam_response_enc_2)(const
- krb5_enc_sam_response_enc_2 *rep,
- krb5_data **code);
} krb5int_access;
#define KRB5INT_ACCESS_VERSION \
Modified: trunk/src/lib/krb5/asn.1/asn1_k_encode.c
===================================================================
--- trunk/src/lib/krb5/asn.1/asn1_k_encode.c 2012-01-07 16:50:06 UTC (rev 25619)
+++ trunk/src/lib/krb5/asn.1/asn1_k_encode.c 2012-01-07 17:26:13 UTC (rev 25620)
@@ -1253,7 +1253,6 @@
MAKE_FULL_ENCODER(encode_krb5_enc_cred_part, enc_cred_part);
MAKE_FULL_ENCODER(encode_krb5_error, krb5_error);
MAKE_FULL_ENCODER(encode_krb5_authdata, auth_data);
-MAKE_FULL_ENCODER(encode_krb5_authdata_elt, authdata_elt);
MAKE_FULL_ENCODER(encode_krb5_etype_info, etype_info);
MAKE_FULL_ENCODER(encode_krb5_etype_info2, etype_info2);
MAKE_FULL_ENCODER(encode_krb5_enc_data, encrypted_data);
Modified: trunk/src/lib/krb5/os/accessor.c
===================================================================
--- trunk/src/lib/krb5/os/accessor.c 2012-01-07 16:50:06 UTC (rev 25619)
+++ trunk/src/lib/krb5/os/accessor.c 2012-01-07 17:26:13 UTC (rev 25620)
@@ -50,12 +50,10 @@
#define S(FIELD, VAL) internals_temp.FIELD = VAL
krb5int_access internals_temp;
#endif
- S (arcfour_gsscrypt, krb5int_arcfour_gsscrypt),
S (auth_con_get_subkey_enctype, krb5_auth_con_get_subkey_enctype),
S (clean_hostname, krb5int_clean_hostname),
- S (mandatory_cksumtype, krb5int_c_mandatory_cksumtype),
#ifndef LEAN_CLIENT
#define SC(FIELD, VAL) S(FIELD, VAL)
#else /* disable */
@@ -102,16 +100,11 @@
SC (decode_krb5_reply_key_pack_draft9, decode_krb5_reply_key_pack_draft9),
SC (decode_krb5_td_trusted_certifiers, decode_krb5_td_trusted_certifiers),
SC (decode_krb5_td_dh_parameters, decode_krb5_td_dh_parameters),
- SC (decode_krb5_as_req, decode_krb5_as_req),
SC (encode_krb5_kdc_req_body, encode_krb5_kdc_req_body),
SC (free_kdc_req, krb5_free_kdc_req),
SC (set_prompt_types, krb5int_set_prompt_types),
- SC (encode_krb5_authdata_elt, encode_krb5_authdata_elt),
#undef SC
- 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),
-
#if DESIGNATED_INITIALIZERS
};
#else
Modified: trunk/src/plugins/preauth/pkinit/pkinit_accessor.c
===================================================================
--- trunk/src/plugins/preauth/pkinit/pkinit_accessor.c 2012-01-07 16:50:06 UTC (rev 25619)
+++ trunk/src/plugins/preauth/pkinit/pkinit_accessor.c 2012-01-07 17:26:13 UTC (rev 25620)
@@ -71,9 +71,6 @@
krb5_external_principal_identifier ***);
krb5_error_code
-(*k5int_decode_krb5_as_req)(const krb5_data *output, krb5_kdc_req **rep);
-
-krb5_error_code
(*k5int_encode_krb5_kdc_req_body)(const krb5_kdc_req *rep, krb5_data **code);
void KRB5_CALLCONV
@@ -82,11 +79,7 @@
void
(*k5int_set_prompt_types)(krb5_context, krb5_prompt_type *);
-krb5_error_code
-(*k5int_encode_krb5_authdata_elt)(const krb5_authdata *rep, krb5_data **code);
-
-
/*
* Grab internal function pointers from the krb5int_accessor
* structure and make them available
@@ -118,10 +111,8 @@
/* special cases... */
k5int_decode_krb5_principal_name = k5int.decode_krb5_principal_name;
- k5int_decode_krb5_as_req = k5int.decode_krb5_as_req;
k5int_encode_krb5_kdc_req_body = k5int.encode_krb5_kdc_req_body;
k5int_krb5_free_kdc_req = k5int.free_kdc_req;
k5int_set_prompt_types = k5int.set_prompt_types;
- k5int_encode_krb5_authdata_elt = k5int.encode_krb5_authdata_elt;
return 0;
}
Modified: trunk/src/plugins/preauth/pkinit/pkinit_accessor.h
===================================================================
--- trunk/src/plugins/preauth/pkinit/pkinit_accessor.h 2012-01-07 16:50:06 UTC (rev 25619)
+++ trunk/src/plugins/preauth/pkinit/pkinit_accessor.h 2012-01-07 17:26:13 UTC (rev 25620)
@@ -68,15 +68,11 @@
extern krb5_error_code (*k5int_decode_krb5_td_trusted_certifiers)
(const krb5_data *, krb5_external_principal_identifier ***);
-extern krb5_error_code (*k5int_decode_krb5_as_req)
- (const krb5_data *output, krb5_kdc_req **rep);
extern krb5_error_code (*k5int_encode_krb5_kdc_req_body)
(const krb5_kdc_req *rep, krb5_data **code);
extern void KRB5_CALLCONV (*k5int_krb5_free_kdc_req)
(krb5_context, krb5_kdc_req * );
extern void (*k5int_set_prompt_types)
(krb5_context, krb5_prompt_type *);
-extern krb5_error_code (*k5int_encode_krb5_authdata_elt)
- (const krb5_authdata *rep, krb5_data **code);
#endif /* _PKINIT_ACCESSOR_H */
Modified: trunk/src/tests/asn.1/krb5_encode_test.c
===================================================================
--- trunk/src/tests/asn.1/krb5_encode_test.c 2012-01-07 16:50:06 UTC (rev 25619)
+++ trunk/src/tests/asn.1/krb5_encode_test.c 2012-01-07 17:26:13 UTC (rev 25620)
@@ -625,7 +625,7 @@
krb5_sam_response_2 sam_ch2;
ktest_make_sample_sam_response_2(&sam_ch2);
encode_run(sam_ch2,krb5_sam_response_2,"sam_response_2","",
- acc.encode_krb5_sam_response_2);
+ encode_krb5_sam_response_2);
ktest_empty_sam_response_2(&sam_ch2);
}
/****************************************************************/
@@ -635,7 +635,7 @@
ktest_make_sample_enc_sam_response_enc_2(&sam_ch2);
encode_run(sam_ch2,krb5_enc_sam_response_enc_2,
"enc_sam_response_enc_2","",
- acc.encode_krb5_enc_sam_response_enc_2);
+ encode_krb5_enc_sam_response_enc_2);
ktest_empty_enc_sam_response_enc_2(&sam_ch2);
}
/****************************************************************/
More information about the cvs-krb5
mailing list