svn rev #24874: trunk/src/lib/gssapi/krb5/
ghudson@MIT.EDU
ghudson at MIT.EDU
Mon Apr 11 18:23:47 EDT 2011
http://src.mit.edu/fisheye/changelog/krb5/?cs=24874
Commit By: ghudson
Log Message:
Shuffle around some gss-krb5 entry points to eliminate four mostly
content-free source files and better separate IOV stuff from non-IOV
stuff.
Changed Files:
U trunk/src/lib/gssapi/krb5/Makefile.in
U trunk/src/lib/gssapi/krb5/k5seal.c
U trunk/src/lib/gssapi/krb5/k5sealiov.c
U trunk/src/lib/gssapi/krb5/k5unseal.c
U trunk/src/lib/gssapi/krb5/k5unsealiov.c
D trunk/src/lib/gssapi/krb5/seal.c
D trunk/src/lib/gssapi/krb5/sign.c
D trunk/src/lib/gssapi/krb5/unseal.c
D trunk/src/lib/gssapi/krb5/verify.c
Modified: trunk/src/lib/gssapi/krb5/Makefile.in
===================================================================
--- trunk/src/lib/gssapi/krb5/Makefile.in 2011-04-11 09:01:30 UTC (rev 24873)
+++ trunk/src/lib/gssapi/krb5/Makefile.in 2011-04-11 22:23:47 UTC (rev 24874)
@@ -74,19 +74,15 @@
$(srcdir)/rel_oid.c \
$(srcdir)/rel_name.c \
$(srcdir)/s4u_gss_glue.c \
- $(srcdir)/seal.c \
$(srcdir)/set_allowable_enctypes.c \
$(srcdir)/ser_sctx.c \
$(srcdir)/set_ccache.c \
- $(srcdir)/sign.c \
$(srcdir)/store_cred.c \
- $(srcdir)/unseal.c \
$(srcdir)/util_cksum.c \
$(srcdir)/util_crypt.c \
$(srcdir)/util_seed.c \
$(srcdir)/util_seqnum.c \
$(srcdir)/val_cred.c \
- $(srcdir)/verify.c \
$(srcdir)/wrap_size_limit.c
@@ -128,19 +124,15 @@
$(OUTPRE)rel_oid.$(OBJEXT) \
$(OUTPRE)rel_name.$(OBJEXT) \
$(OUTPRE)s4u_gss_glue.$(OBJEXT) \
- $(OUTPRE)seal.$(OBJEXT) \
$(OUTPRE)set_allowable_enctypes.$(OBJEXT) \
$(OUTPRE)ser_sctx.$(OBJEXT) \
$(OUTPRE)set_ccache.$(OBJEXT) \
- $(OUTPRE)sign.$(OBJEXT) \
$(OUTPRE)store_cred.$(OBJEXT) \
- $(OUTPRE)unseal.$(OBJEXT) \
$(OUTPRE)util_cksum.$(OBJEXT) \
$(OUTPRE)util_crypt.$(OBJEXT) \
$(OUTPRE)util_seed.$(OBJEXT) \
$(OUTPRE)util_seqnum.$(OBJEXT) \
$(OUTPRE)val_cred.$(OBJEXT) \
- $(OUTPRE)verify.$(OBJEXT) \
$(OUTPRE)wrap_size_limit.$(OBJEXT) \
$(OUTPRE)gssapi_err_krb5.$(OBJEXT)
@@ -185,19 +177,15 @@
rel_oid.o \
rel_name.o \
s4u_gss_glue.o \
- seal.o \
set_allowable_enctypes.o \
ser_sctx.o \
set_ccache.o \
- sign.o \
store_cred.o \
- unseal.o \
util_cksum.o \
util_crypt.o \
util_seed.o \
util_seqnum.o \
val_cred.o \
- verify.o \
wrap_size_limit.o \
gssapi_err_krb5.o
Modified: trunk/src/lib/gssapi/krb5/k5seal.c
===================================================================
--- trunk/src/lib/gssapi/krb5/k5seal.c 2011-04-11 09:01:30 UTC (rev 24873)
+++ trunk/src/lib/gssapi/krb5/k5seal.c 2011-04-11 22:23:47 UTC (rev 24874)
@@ -392,3 +392,34 @@
*minor_status = 0;
return(GSS_S_COMPLETE);
}
+
+OM_uint32
+krb5_gss_wrap(minor_status, context_handle, conf_req_flag,
+ qop_req, input_message_buffer, conf_state,
+ output_message_buffer)
+ OM_uint32 *minor_status;
+ gss_ctx_id_t context_handle;
+ int conf_req_flag;
+ gss_qop_t qop_req;
+ gss_buffer_t input_message_buffer;
+ int *conf_state;
+ gss_buffer_t output_message_buffer;
+{
+ return(kg_seal(minor_status, context_handle, conf_req_flag,
+ qop_req, input_message_buffer, conf_state,
+ output_message_buffer, KG_TOK_WRAP_MSG));
+}
+
+OM_uint32
+krb5_gss_get_mic(minor_status, context_handle, qop_req,
+ message_buffer, message_token)
+ OM_uint32 *minor_status;
+ gss_ctx_id_t context_handle;
+ gss_qop_t qop_req;
+ gss_buffer_t message_buffer;
+ gss_buffer_t message_token;
+{
+ return(kg_seal(minor_status, context_handle, 0,
+ qop_req, message_buffer, NULL,
+ message_token, KG_TOK_MIC_MSG));
+}
Modified: trunk/src/lib/gssapi/krb5/k5sealiov.c
===================================================================
--- trunk/src/lib/gssapi/krb5/k5sealiov.c 2011-04-11 09:01:30 UTC (rev 24873)
+++ trunk/src/lib/gssapi/krb5/k5sealiov.c 2011-04-11 22:23:47 UTC (rev 24874)
@@ -499,3 +499,71 @@
return GSS_S_COMPLETE;
}
+
+OM_uint32
+krb5_gss_wrap_iov(OM_uint32 *minor_status,
+ gss_ctx_id_t context_handle,
+ int conf_req_flag,
+ gss_qop_t qop_req,
+ int *conf_state,
+ gss_iov_buffer_desc *iov,
+ int iov_count)
+{
+ OM_uint32 major_status;
+
+ major_status = kg_seal_iov(minor_status, context_handle, conf_req_flag,
+ qop_req, conf_state,
+ iov, iov_count, KG_TOK_WRAP_MSG);
+
+ return major_status;
+}
+
+OM_uint32
+krb5_gss_wrap_iov_length(OM_uint32 *minor_status,
+ gss_ctx_id_t context_handle,
+ int conf_req_flag,
+ gss_qop_t qop_req,
+ int *conf_state,
+ gss_iov_buffer_desc *iov,
+ int iov_count)
+{
+ OM_uint32 major_status;
+
+ major_status = kg_seal_iov_length(minor_status, context_handle, conf_req_flag,
+ qop_req, conf_state, iov, iov_count);
+ return major_status;
+}
+
+#if 0
+OM_uint32
+krb5_gss_get_mic_iov(OM_uint32 *minor_status,
+ gss_ctx_id_t context_handle,
+ gss_qop_t qop_req,
+ gss_iov_buffer_desc *iov,
+ int iov_count)
+{
+ OM_uint32 major_status;
+
+ major_status = kg_seal_iov(minor_status, context_handle, FALSE,
+ qop_req, NULL,
+ iov, iov_count, KG_TOK_MIC_MSG);
+
+ return major_status;
+}
+
+OM_uint32
+krb5_gss_get_mic_iov_length(OM_uint32 *minor_status,
+ gss_ctx_id_t context_handle,
+ int conf_req_flag,
+ gss_qop_t qop_req,
+ int *conf_state,
+ gss_iov_buffer_desc *iov,
+ int iov_count)
+{
+ OM_uint32 major_status;
+
+ major_status = kg_seal_iov_length(minor_status, context_handle, conf_req_flag,
+ qop_req, conf_state, iov, iov_count);
+ return major_status;
+}
+#endif
Modified: trunk/src/lib/gssapi/krb5/k5unseal.c
===================================================================
--- trunk/src/lib/gssapi/krb5/k5unseal.c 2011-04-11 09:01:30 UTC (rev 24873)
+++ trunk/src/lib/gssapi/krb5/k5unseal.c 2011-04-11 22:23:47 UTC (rev 24874)
@@ -550,3 +550,40 @@
return ret;
}
+
+OM_uint32
+krb5_gss_unwrap(minor_status, context_handle,
+ input_message_buffer, output_message_buffer,
+ conf_state, qop_state)
+ OM_uint32 *minor_status;
+ gss_ctx_id_t context_handle;
+ gss_buffer_t input_message_buffer;
+ gss_buffer_t output_message_buffer;
+ int *conf_state;
+ gss_qop_t *qop_state;
+{
+ OM_uint32 rstat;
+
+ rstat = kg_unseal(minor_status, context_handle,
+ input_message_buffer, output_message_buffer,
+ conf_state, qop_state, KG_TOK_WRAP_MSG);
+ return(rstat);
+}
+
+OM_uint32
+krb5_gss_verify_mic(minor_status, context_handle,
+ message_buffer, token_buffer,
+ qop_state)
+ OM_uint32 *minor_status;
+ gss_ctx_id_t context_handle;
+ gss_buffer_t message_buffer;
+ gss_buffer_t token_buffer;
+ gss_qop_t *qop_state;
+{
+ OM_uint32 rstat;
+
+ rstat = kg_unseal(minor_status, context_handle,
+ token_buffer, message_buffer,
+ NULL, qop_state, KG_TOK_MIC_MSG);
+ return(rstat);
+}
Modified: trunk/src/lib/gssapi/krb5/k5unsealiov.c
===================================================================
--- trunk/src/lib/gssapi/krb5/k5unsealiov.c 2011-04-11 09:01:30 UTC (rev 24873)
+++ trunk/src/lib/gssapi/krb5/k5unsealiov.c 2011-04-11 22:23:47 UTC (rev 24874)
@@ -648,3 +648,38 @@
return code;
}
+
+OM_uint32
+krb5_gss_unwrap_iov(OM_uint32 *minor_status,
+ gss_ctx_id_t context_handle,
+ int *conf_state,
+ gss_qop_t *qop_state,
+ gss_iov_buffer_desc *iov,
+ int iov_count)
+{
+ OM_uint32 major_status;
+
+ major_status = kg_unseal_iov(minor_status, context_handle,
+ conf_state, qop_state,
+ iov, iov_count, KG_TOK_WRAP_MSG);
+
+ return major_status;
+}
+
+#if 0
+OM_uint32
+krb5_gss_verify_mic_iov(OM_uint32 *minor_status,
+ gss_ctx_id_t context_handle,
+ gss_qop_t *qop_state,
+ gss_iov_buffer_desc *iov,
+ int iov_count)
+{
+ OM_uint32 major_status;
+
+ major_status = kg_unseal_iov(minor_status, context_handle,
+ NULL, qop_state,
+ iov, iov_count, KG_TOK_WRAP_MSG);
+
+ return major_status;
+}
+#endif
More information about the cvs-krb5
mailing list