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

kdc: make common astgs_request_t elements public API

Browse Source
This commit is contained in:
Luke Howard
2021-12-23 19:31:15 +11:00
committed by Nico Williams
parent 2e8b172f38
commit e3a5169862
2 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
kdc/kdc.h
View File

@@ -46,6 +46,10 @@
#include <kx509_asn1.h> #include <kx509_asn1.h>
#include <gssapi/gssapi.h> #include <gssapi/gssapi.h>
#define heim_pcontext krb5_context
#define heim_pconfig krb5_kdc_configuration *
#include <heimbase-svc.h>
enum krb5_kdc_trpolicy { enum krb5_kdc_trpolicy {
TRPOLICY_ALWAYS_CHECK, TRPOLICY_ALWAYS_CHECK,
TRPOLICY_ALLOW_PER_PRINCIPAL, TRPOLICY_ALLOW_PER_PRINCIPAL,
@@ -124,6 +128,34 @@ typedef struct krb5_kdc_configuration {
const char *app; const char *app;
} krb5_kdc_configuration; } krb5_kdc_configuration;
#define ASTGS_REQUEST_DESC_COMMON_ELEMENTS \
HEIM_SVC_REQUEST_DESC_COMMON_ELEMENTS; \
\
KDC_REQ req; \
\
KDC_REP rep; \
EncTicketPart et; \
EncKDCRepPart ek; \
\
/* princ requested by client (AS) or canon princ (TGT) */ \
krb5_principal client_princ; \
hdb_entry_ex *client; \
HDB *clientdb; \
\
krb5_principal server_princ; \
hdb_entry_ex *server; \
\
krb5_keyblock reply_key; \
\
krb5_pac pac; \
uint64_t pac_attributes;
#ifndef __KDC_LOCL_H__
struct astgs_request_desc {
ASTGS_REQUEST_DESC_COMMON_ELEMENTS
};
#endif
typedef struct kdc_request_desc *kdc_request_t; typedef struct kdc_request_desc *kdc_request_t;
typedef struct astgs_request_desc *astgs_request_t; typedef struct astgs_request_desc *astgs_request_t;
typedef struct kx509_req_context_desc *kx509_req_context; typedef struct kx509_req_context_desc *kx509_req_context;
@@ -138,4 +170,7 @@ struct krb5_kdc_service {
#include <kdc-protos.h> #include <kdc-protos.h>
#undef heim_pcontext
#undef heim_pconfig
#endif #endif

22
kdc/kdc_locl.h
View File

@@ -67,28 +67,6 @@ struct kdc_request_desc {
struct as_request_pa_state; struct as_request_pa_state;
struct kdc_patypes; struct kdc_patypes;
#define ASTGS_REQUEST_DESC_COMMON_ELEMENTS \
HEIM_SVC_REQUEST_DESC_COMMON_ELEMENTS; \
\
KDC_REQ req; \
\
KDC_REP rep; \
EncTicketPart et; \
EncKDCRepPart ek; \
\
/* princ requested by client (AS) or canon princ (TGT) */ \
krb5_principal client_princ; \
hdb_entry_ex *client; \
HDB *clientdb; \
\
krb5_principal server_princ; \
hdb_entry_ex *server; \
\
krb5_keyblock reply_key; \
\
krb5_pac pac; \
uint64_t pac_attributes;
struct astgs_request_desc { struct astgs_request_desc {
ASTGS_REQUEST_DESC_COMMON_ELEMENTS; ASTGS_REQUEST_DESC_COMMON_ELEMENTS;