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

replace gss_krb5_getsomekey with gss_krb5_get_localkey and

Browse Source 
gss_krb5_get_remotekey


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10100 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2001-06-18 02:53:52 +00:00
parent 5a6138360e
commit 4449713b87
4 changed files with 82 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/gssapi/krb5/unwrap.c
View File

@@ -36,18 +36,18 @@
RCSID("$Id$"); RCSID("$Id$");
OM_uint32 OM_uint32
gss_krb5_getsomekey(const gss_ctx_id_t context_handle, gss_krb5_get_remotekey(const gss_ctx_id_t context_handle,
krb5_keyblock **key) krb5_keyblock **key)
{ {
/* XXX this is ugly, and probably incorrect... */
krb5_keyblock *skey; krb5_keyblock *skey;
krb5_auth_con_getlocalsubkey(gssapi_krb5_context,
context_handle->auth_context, krb5_auth_con_getremotesubkey(gssapi_krb5_context,
&skey); context_handle->auth_context,
&skey);
if(skey == NULL) if(skey == NULL)
krb5_auth_con_getremotesubkey(gssapi_krb5_context, krb5_auth_con_getlocalsubkey(gssapi_krb5_context,
context_handle->auth_context, context_handle->auth_context,
&skey); &skey);
if(skey == NULL) if(skey == NULL)
krb5_auth_con_getkey(gssapi_krb5_context, krb5_auth_con_getkey(gssapi_krb5_context,
context_handle->auth_context, context_handle->auth_context,
@@ -176,7 +176,7 @@ unwrap_des
return GSS_S_BAD_MIC; return GSS_S_BAD_MIC;
} }
krb5_auth_setremoteseqnumber (gssapi_krb5_context, krb5_auth_con_setremoteseqnumber (gssapi_krb5_context,
context_handle->auth_context, context_handle->auth_context,
++seq_number); ++seq_number);
@@ -327,7 +327,7 @@ unwrap_des3
return GSS_S_BAD_MIC; return GSS_S_BAD_MIC;
} }
krb5_auth_setremoteseqnumber (gssapi_krb5_context, krb5_auth_con_setremoteseqnumber (gssapi_krb5_context,
context_handle->auth_context, context_handle->auth_context,
++seq_number); ++seq_number);
@@ -386,7 +386,7 @@ OM_uint32 gss_unwrap
OM_uint32 ret; OM_uint32 ret;
krb5_keytype keytype; krb5_keytype keytype;
ret = gss_krb5_getsomekey(context_handle, &key); ret = gss_krb5_get_remotekey(context_handle, &key);
if (ret) { if (ret) {
gssapi_krb5_set_error_string (); gssapi_krb5_set_error_string ();
*minor_status = ret; *minor_status = ret;

35
lib/gssapi/krb5/wrap.c
View File

@@ -35,6 +35,29 @@
RCSID("$Id$"); RCSID("$Id$");
OM_uint32
gss_krb5_get_localkey(const gss_ctx_id_t context_handle,
krb5_keyblock **key)
{
krb5_keyblock *skey;
krb5_auth_con_getlocalsubkey(gssapi_krb5_context,
context_handle->auth_context,
&skey);
if(skey == NULL)
krb5_auth_con_getremotesubkey(gssapi_krb5_context,
context_handle->auth_context,
&skey);
if(skey == NULL)
krb5_auth_con_getkey(gssapi_krb5_context,
context_handle->auth_context,
&skey);
if(skey == NULL)
return GSS_S_FAILURE;
*key = skey;
return 0;
}
static OM_uint32 static OM_uint32
sub_wrap_size ( sub_wrap_size (
OM_uint32 req_output_size, OM_uint32 req_output_size,
@@ -65,7 +88,7 @@ gss_wrap_size_limit (
OM_uint32 ret; OM_uint32 ret;
krb5_keytype keytype; krb5_keytype keytype;
ret = gss_krb5_getsomekey(context_handle, &key); ret = gss_krb5_get_localkey(context_handle, &key);
if (ret) { if (ret) {
gssapi_krb5_set_error_string (); gssapi_krb5_set_error_string ();
*minor_status = ret; *minor_status = ret;
@@ -162,7 +185,7 @@ wrap_des
memcpy (p - 8, hash, 8); memcpy (p - 8, hash, 8);
/* sequence number */ /* sequence number */
krb5_auth_getlocalseqnumber (gssapi_krb5_context, krb5_auth_con_getlocalseqnumber (gssapi_krb5_context,
context_handle->auth_context, context_handle->auth_context,
&seq_number); &seq_number);
@@ -179,7 +202,7 @@ wrap_des
des_cbc_encrypt ((void *)p, (void *)p, 8, des_cbc_encrypt ((void *)p, (void *)p, 8,
schedule, (des_cblock *)(p + 8), DES_ENCRYPT); schedule, (des_cblock *)(p + 8), DES_ENCRYPT);
krb5_auth_setlocalseqnumber (gssapi_krb5_context, krb5_auth_con_setlocalseqnumber (gssapi_krb5_context,
context_handle->auth_context, context_handle->auth_context,
++seq_number); ++seq_number);
@@ -294,7 +317,7 @@ wrap_des3
free_Checksum (&cksum); free_Checksum (&cksum);
/* sequence number */ /* sequence number */
krb5_auth_getlocalseqnumber (gssapi_krb5_context, krb5_auth_con_getlocalseqnumber (gssapi_krb5_context,
context_handle->auth_context, context_handle->auth_context,
&seq_number); &seq_number);
@@ -338,7 +361,7 @@ wrap_des3
memcpy (p, encdata.data, encdata.length); memcpy (p, encdata.data, encdata.length);
krb5_data_free (&encdata); krb5_data_free (&encdata);
krb5_auth_setlocalseqnumber (gssapi_krb5_context, krb5_auth_con_setlocalseqnumber (gssapi_krb5_context,
context_handle->auth_context, context_handle->auth_context,
++seq_number); ++seq_number);
@@ -389,7 +412,7 @@ OM_uint32 gss_wrap
OM_uint32 ret; OM_uint32 ret;
krb5_keytype keytype; krb5_keytype keytype;
ret = gss_krb5_getsomekey(context_handle, &key); ret = gss_krb5_get_localkey(context_handle, &key);
if (ret) { if (ret) {
gssapi_krb5_set_error_string (); gssapi_krb5_set_error_string ();
*minor_status = ret; *minor_status = ret;

24
lib/gssapi/unwrap.c
View File

@@ -36,18 +36,18 @@
RCSID("$Id$"); RCSID("$Id$");
OM_uint32 OM_uint32
gss_krb5_getsomekey(const gss_ctx_id_t context_handle, gss_krb5_get_remotekey(const gss_ctx_id_t context_handle,
krb5_keyblock **key) krb5_keyblock **key)
{ {
/* XXX this is ugly, and probably incorrect... */
krb5_keyblock *skey; krb5_keyblock *skey;
krb5_auth_con_getlocalsubkey(gssapi_krb5_context,
context_handle->auth_context, krb5_auth_con_getremotesubkey(gssapi_krb5_context,
&skey); context_handle->auth_context,
&skey);
if(skey == NULL) if(skey == NULL)
krb5_auth_con_getremotesubkey(gssapi_krb5_context, krb5_auth_con_getlocalsubkey(gssapi_krb5_context,
context_handle->auth_context, context_handle->auth_context,
&skey); &skey);
if(skey == NULL) if(skey == NULL)
krb5_auth_con_getkey(gssapi_krb5_context, krb5_auth_con_getkey(gssapi_krb5_context,
context_handle->auth_context, context_handle->auth_context,
@@ -176,7 +176,7 @@ unwrap_des
return GSS_S_BAD_MIC; return GSS_S_BAD_MIC;
} }
krb5_auth_setremoteseqnumber (gssapi_krb5_context, krb5_auth_con_setremoteseqnumber (gssapi_krb5_context,
context_handle->auth_context, context_handle->auth_context,
++seq_number); ++seq_number);
@@ -327,7 +327,7 @@ unwrap_des3
return GSS_S_BAD_MIC; return GSS_S_BAD_MIC;
} }
krb5_auth_setremoteseqnumber (gssapi_krb5_context, krb5_auth_con_setremoteseqnumber (gssapi_krb5_context,
context_handle->auth_context, context_handle->auth_context,
++seq_number); ++seq_number);
@@ -386,7 +386,7 @@ OM_uint32 gss_unwrap
OM_uint32 ret; OM_uint32 ret;
krb5_keytype keytype; krb5_keytype keytype;
ret = gss_krb5_getsomekey(context_handle, &key); ret = gss_krb5_get_remotekey(context_handle, &key);
if (ret) { if (ret) {
gssapi_krb5_set_error_string (); gssapi_krb5_set_error_string ();
*minor_status = ret; *minor_status = ret;

35
lib/gssapi/wrap.c
View File

@@ -35,6 +35,29 @@
RCSID("$Id$"); RCSID("$Id$");
OM_uint32
gss_krb5_get_localkey(const gss_ctx_id_t context_handle,
krb5_keyblock **key)
{
krb5_keyblock *skey;
krb5_auth_con_getlocalsubkey(gssapi_krb5_context,
context_handle->auth_context,
&skey);
if(skey == NULL)
krb5_auth_con_getremotesubkey(gssapi_krb5_context,
context_handle->auth_context,
&skey);
if(skey == NULL)
krb5_auth_con_getkey(gssapi_krb5_context,
context_handle->auth_context,
&skey);
if(skey == NULL)
return GSS_S_FAILURE;
*key = skey;
return 0;
}
static OM_uint32 static OM_uint32
sub_wrap_size ( sub_wrap_size (
OM_uint32 req_output_size, OM_uint32 req_output_size,
@@ -65,7 +88,7 @@ gss_wrap_size_limit (
OM_uint32 ret; OM_uint32 ret;
krb5_keytype keytype; krb5_keytype keytype;
ret = gss_krb5_getsomekey(context_handle, &key); ret = gss_krb5_get_localkey(context_handle, &key);
if (ret) { if (ret) {
gssapi_krb5_set_error_string (); gssapi_krb5_set_error_string ();
*minor_status = ret; *minor_status = ret;
@@ -162,7 +185,7 @@ wrap_des
memcpy (p - 8, hash, 8); memcpy (p - 8, hash, 8);
/* sequence number */ /* sequence number */
krb5_auth_getlocalseqnumber (gssapi_krb5_context, krb5_auth_con_getlocalseqnumber (gssapi_krb5_context,
context_handle->auth_context, context_handle->auth_context,
&seq_number); &seq_number);
@@ -179,7 +202,7 @@ wrap_des
des_cbc_encrypt ((void *)p, (void *)p, 8, des_cbc_encrypt ((void *)p, (void *)p, 8,
schedule, (des_cblock *)(p + 8), DES_ENCRYPT); schedule, (des_cblock *)(p + 8), DES_ENCRYPT);
krb5_auth_setlocalseqnumber (gssapi_krb5_context, krb5_auth_con_setlocalseqnumber (gssapi_krb5_context,
context_handle->auth_context, context_handle->auth_context,
++seq_number); ++seq_number);
@@ -294,7 +317,7 @@ wrap_des3
free_Checksum (&cksum); free_Checksum (&cksum);
/* sequence number */ /* sequence number */
krb5_auth_getlocalseqnumber (gssapi_krb5_context, krb5_auth_con_getlocalseqnumber (gssapi_krb5_context,
context_handle->auth_context, context_handle->auth_context,
&seq_number); &seq_number);
@@ -338,7 +361,7 @@ wrap_des3
memcpy (p, encdata.data, encdata.length); memcpy (p, encdata.data, encdata.length);
krb5_data_free (&encdata); krb5_data_free (&encdata);
krb5_auth_setlocalseqnumber (gssapi_krb5_context, krb5_auth_con_setlocalseqnumber (gssapi_krb5_context,
context_handle->auth_context, context_handle->auth_context,
++seq_number); ++seq_number);
@@ -389,7 +412,7 @@ OM_uint32 gss_wrap
OM_uint32 ret; OM_uint32 ret;
krb5_keytype keytype; krb5_keytype keytype;
ret = gss_krb5_getsomekey(context_handle, &key); ret = gss_krb5_get_localkey(context_handle, &key);
if (ret) { if (ret) {
gssapi_krb5_set_error_string (); gssapi_krb5_set_error_string ();
*minor_status = ret; *minor_status = ret;