oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

heimdal: Make _krb5_pac_get_kdc_checksum_info() into a global function

Browse Source 
This lets us call it from Samba.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>

[abartlet@samba.org Similar to Samba commit 3bdce12789af1e7a7aba56691f184625a432410d
 but also fixed for caller in Heimdal windc plugin tests]
This commit is contained in:
Joseph Sutton
2021-10-08 15:43:41 +13:00
committed by Luke Howard
parent 2f21cf9933
commit 814e58fda8
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/krb5/libkrb5-exports.def.in
View File

@@ -499,6 +499,7 @@ EXPORTS
krb5_pac_add_buffer
krb5_pac_free
krb5_pac_get_buffer
krb5_pac_get_kdc_checksum_info
krb5_pac_get_types
krb5_pac_init
krb5_pac_parse
@@ -822,7 +823,6 @@ EXPORTS
_krb5_pac_sign
_krb5_kdc_pac_sign_ticket
_krb5_kdc_pac_ticket_parse
_krb5_pac_get_kdc_checksum_info
_kdc_tkt_insert_pac
_kdc_tkt_add_if_relevant_ad
_krb5_parse_moduli

8
lib/krb5/pac.c
View File

@@ -1294,10 +1294,10 @@ out:
}
KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
_krb5_pac_get_kdc_checksum_info(krb5_context context,
krb5_pac pac,
krb5_cksumtype *cstype,
uint16_t *rodc_id)
krb5_pac_get_kdc_checksum_info(krb5_context context,
krb5_pac pac,
krb5_cksumtype *cstype,
uint16_t *rodc_id)
{
krb5_error_code ret;
krb5_storage *sp = NULL;

8
lib/krb5/test_pac.c
View File

@@ -823,9 +823,9 @@ check_ticket_signature(krb5_context context,
if (ret)
t_err(context, tkt->name, "krb5_pac_verify ticket-sig", ret);
ret = _krb5_pac_get_kdc_checksum_info(context, pac, &cstype, &rodc_id);
ret = krb5_pac_get_kdc_checksum_info(context, pac, &cstype, &rodc_id);
if (ret)
t_err(context, tkt->name, "_krb5_pac_get_kdc_checksum_info", ret);
t_err(context, tkt->name, "krb5_pac_get_kdc_checksum_info", ret);
heim_assert(cstype == CKSUMTYPE_HMAC_MD5, "Wrong checksum type");
heim_assert(rodc_id == tkt->rodc_id, "Wrong RODCIdentifier");
@@ -874,9 +874,9 @@ check_ticket_signature(krb5_context context,
if (ret)
t_err(context, tkt->name, "krb5_pac_verify ticket-sig 2", ret);
ret = _krb5_pac_get_kdc_checksum_info(context, pac, &cstype, &rodc_id);
ret = krb5_pac_get_kdc_checksum_info(context, pac, &cstype, &rodc_id);
if (ret)
t_err(context, tkt->name, "_krb5_pac_get_kdc_checksum_info 2", ret);
t_err(context, tkt->name, "krb5_pac_get_kdc_checksum_info 2", ret);
heim_assert(cstype == CKSUMTYPE_HMAC_MD5, "Wrong checksum type 2");
heim_assert(rodc_id == tkt->rodc_id, "Wrong RODCIdentifier 2");

2
lib/krb5/version-script.map
View File

@@ -492,6 +492,7 @@ HEIMDAL_KRB5_2.0 {
krb5_pac_add_buffer;
krb5_pac_free;
krb5_pac_get_buffer;
krb5_pac_get_kdc_checksum_info;
krb5_pac_get_types;
krb5_pac_init;
krb5_pac_parse;
@@ -814,7 +815,6 @@ HEIMDAL_KRB5_2.0 {
_krb5_pac_sign;
_krb5_kdc_pac_sign_ticket;
_krb5_kdc_pac_ticket_parse;
_krb5_pac_get_kdc_checksum_info;
_kdc_tkt_insert_pac;
_kdc_tkt_add_if_relevant_ad;
_krb5_parse_moduli;

2
tests/plugin/windc.c
View File

@@ -64,7 +64,7 @@ pac_verify(void *ctx, krb5_context context,
return ret;
krb5_data_free(&data);
ret = _krb5_pac_get_kdc_checksum_info(context, *pac, &cstype, &rodc_id);
ret = krb5_pac_get_kdc_checksum_info(context, *pac, &cstype, &rodc_id);
if (ret)
return ret;