diff options
| -rw-r--r-- | proxy/Makefile.am | 1 | ||||
| -rw-r--r-- | proxy/src/client/gpm_get_mic.c | 96 | ||||
| -rw-r--r-- | proxy/src/client/gssapi_gpm.h | 8 |
3 files changed, 104 insertions, 1 deletions
diff --git a/proxy/Makefile.am b/proxy/Makefile.am index 6367189..e67bc80 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -91,6 +91,7 @@ GP_MECHGLUE_OBJ = \ src/client/gpm_import_and_canon_name.c \ src/client/gpm_init_sec_context.c \ src/client/gpm_inquire_context.c \ + src/client/gpm_get_mic.c \ src/client/gpm_common.c dist_noinst_HEADERS = \ diff --git a/proxy/src/client/gpm_get_mic.c b/proxy/src/client/gpm_get_mic.c new file mode 100644 index 0000000..9c0d4f8 --- /dev/null +++ b/proxy/src/client/gpm_get_mic.c @@ -0,0 +1,96 @@ +/* + GSS-PROXY + + Copyright (C) 2011 Red Hat, Inc. + Copyright (C) 2011 Simo Sorce <simo.sorce@redhat.com> + Copyright (C) 2012 Guenther Deschner <guenther.deschner@redhat.com> + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. +*/ + +#include "gssapi_gpm.h" +#include "src/gp_conv.h" + +OM_uint32 gpm_get_mic(OM_uint32 *minor_status, + gssx_ctx *context_handle, + gss_qop_t qop_req, + gss_buffer_t message_buffer, + gss_buffer_t message_token) +{ + union gp_rpc_arg uarg; + union gp_rpc_res ures; + gssx_arg_get_mic *arg = &uarg.get_mic; + gssx_res_get_mic *res = &ures.get_mic; + uint32_t ret_min = 0; + uint32_t ret_maj = 0; + int ret = 0; + + memset(&uarg, 0, sizeof(union gp_rpc_arg)); + memset(&ures, 0, sizeof(union gp_rpc_res)); + + if (!context_handle) { + return GSS_S_CALL_INACCESSIBLE_READ; + } + + /* format request */ + /* NOTE: the final free will also release the old context */ + arg->context_handle = *context_handle; + arg->qop_req = qop_req; + gp_conv_buffer_to_gssx(message_buffer, &arg->message_buffer); + + /* execute proxy request */ + ret = gpm_make_call(GSSX_GET_MIC, &uarg, &ures); + if (ret) { + ret_maj = GSS_S_FAILURE; + ret_min = ret; + goto done; + } + + /* Check and save error status */ + if (res->status.major_status) { + gpm_save_status(&res->status); + ret_min = res->status.minor_status; + ret_maj = res->status.major_status; + goto done; + } + + ret = gp_copy_gssx_to_buffer(&res->token_buffer, message_token); + if (ret) { + ret_maj = GSS_S_FAILURE; + ret_min = ret; + goto done; + } + +done: + /* Steal the new context if available. + * NOTE: We do not want it to be freed by xdr_free, so copy the contents + * and cear up the structure to be freed so contents are not freed. */ + if (res->context_handle) { + *context_handle = *res->context_handle; + memset(res->context_handle, 0, sizeof(gssx_ctx)); + } else { + /* prevent the contexthandle from being destroyed in case of server + * error. */ + memset(&arg->context_handle, 0, sizeof(gssx_ctx)); + } + + gpm_free_xdrs(GSSX_GET_MIC, &uarg, &ures); + *minor_status = ret_min; + return ret_maj; +} diff --git a/proxy/src/client/gssapi_gpm.h b/proxy/src/client/gssapi_gpm.h index 8451f5f..f67d5ea 100644 --- a/proxy/src/client/gssapi_gpm.h +++ b/proxy/src/client/gssapi_gpm.h @@ -176,7 +176,6 @@ OM_uint32 gpm_init_sec_context(OM_uint32 *minor_status, gss_buffer_t output_token, OM_uint32 *ret_flags, OM_uint32 *time_rec); - OM_uint32 gpm_inquire_context(OM_uint32 *minor_status, gssx_ctx *context_handle, gssx_name **src_name, @@ -186,4 +185,11 @@ OM_uint32 gpm_inquire_context(OM_uint32 *minor_status, OM_uint32 *ctx_flags, int *locally_initiated, int *open); + +OM_uint32 gpm_get_mic(OM_uint32 *minor_status, + gssx_ctx *context_handle, + gss_qop_t qop_req, + gss_buffer_t message_buffer, + gss_buffer_t message_token); + #endif /* _GSSAPI_GPM_H_ */ |