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

changes for modified auth_context

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4156 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-12-07 15:43:18 +00:00
parent 776f33fe87
commit 259d89264a
13 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gssapi/get_mic.c
View File

@@ -89,7 +89,7 @@ OM_uint32 gss_get_mic
memcpy (&key, context_handle->auth_context->key.keyvalue.data, memcpy (&key, context_handle->auth_context->key.keyvalue.data,
sizeof(key)); sizeof(key));
#endif #endif
memcpy (&key, context_handle->auth_context->local_subkey.keyvalue.data, memcpy (&key, context_handle->auth_context->local_subkey->keyvalue.data,
sizeof(key)); sizeof(key));
des_set_key (&key, schedule); des_set_key (&key, schedule);
des_cbc_cksum ((des_cblock *)hash, des_cbc_cksum ((des_cblock *)hash,

2
lib/gssapi/krb5/get_mic.c
View File

@@ -89,7 +89,7 @@ OM_uint32 gss_get_mic
memcpy (&key, context_handle->auth_context->key.keyvalue.data, memcpy (&key, context_handle->auth_context->key.keyvalue.data,
sizeof(key)); sizeof(key));
#endif #endif
memcpy (&key, context_handle->auth_context->local_subkey.keyvalue.data, memcpy (&key, context_handle->auth_context->local_subkey->keyvalue.data,
sizeof(key)); sizeof(key));
des_set_key (&key, schedule); des_set_key (&key, schedule);
des_cbc_cksum ((des_cblock *)hash, des_cbc_cksum ((des_cblock *)hash,

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

@@ -88,7 +88,7 @@ OM_uint32 gss_unwrap
memcpy (&key, context_handle->auth_context->key.keyvalue.data, memcpy (&key, context_handle->auth_context->key.keyvalue.data,
sizeof(key)); sizeof(key));
#endif #endif
memcpy (&key, context_handle->auth_context->remote_subkey.keyvalue.data, memcpy (&key, context_handle->auth_context->remote_subkey->keyvalue.data,
sizeof(key)); sizeof(key));
for (i = 0; i < sizeof(key); ++i) for (i = 0; i < sizeof(key); ++i)
key[i] ^= 0xf0; key[i] ^= 0xf0;
@@ -123,7 +123,7 @@ OM_uint32 gss_unwrap
memcpy (&key, context_handle->auth_context->key.keyvalue.data, memcpy (&key, context_handle->auth_context->key.keyvalue.data,
sizeof(key)); sizeof(key));
#endif #endif
memcpy (&key, context_handle->auth_context->remote_subkey.keyvalue.data, memcpy (&key, context_handle->auth_context->remote_subkey->keyvalue.data,
sizeof(key)); sizeof(key));
des_set_key (&key, schedule); des_set_key (&key, schedule);
des_cbc_cksum ((des_cblock *)hash, des_cbc_cksum ((des_cblock *)hash,

2
lib/gssapi/krb5/verify_mic.c
View File

@@ -84,7 +84,7 @@ OM_uint32 gss_verify_mic
memcpy (&key, context_handle->auth_context->key.keyvalue.data, memcpy (&key, context_handle->auth_context->key.keyvalue.data,
sizeof(key)); sizeof(key));
#endif #endif
memcpy (&key, context_handle->auth_context->remote_subkey.keyvalue.data, memcpy (&key, context_handle->auth_context->remote_subkey->keyvalue.data,
sizeof(key)); sizeof(key));
des_set_key (&key, schedule); des_set_key (&key, schedule);

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

@@ -122,7 +122,7 @@ OM_uint32 gss_wrap
memcpy (&key, context_handle->auth_context->key.keyvalue.data, memcpy (&key, context_handle->auth_context->key.keyvalue.data,
sizeof(key)); sizeof(key));
#endif #endif
memcpy (&key, context_handle->auth_context->local_subkey.keyvalue.data, memcpy (&key, context_handle->auth_context->local_subkey->keyvalue.data,
sizeof(key)); sizeof(key));
des_set_key (&key, schedule); des_set_key (&key, schedule);
des_cbc_cksum ((des_cblock *)hash, des_cbc_cksum ((des_cblock *)hash,
@@ -159,7 +159,7 @@ OM_uint32 gss_wrap
memcpy (&key, context_handle->auth_context->key.keyvalue.data, memcpy (&key, context_handle->auth_context->key.keyvalue.data,
sizeof(key)); sizeof(key));
#endif #endif
memcpy (&key, context_handle->auth_context->local_subkey.keyvalue.data, memcpy (&key, context_handle->auth_context->local_subkey->keyvalue.data,
sizeof(key)); sizeof(key));
for (i = 0; i < sizeof(key); ++i) for (i = 0; i < sizeof(key); ++i)
key[i] ^= 0xf0; key[i] ^= 0xf0;

4
lib/gssapi/unwrap.c
View File

@@ -88,7 +88,7 @@ OM_uint32 gss_unwrap
memcpy (&key, context_handle->auth_context->key.keyvalue.data, memcpy (&key, context_handle->auth_context->key.keyvalue.data,
sizeof(key)); sizeof(key));
#endif #endif
memcpy (&key, context_handle->auth_context->remote_subkey.keyvalue.data, memcpy (&key, context_handle->auth_context->remote_subkey->keyvalue.data,
sizeof(key)); sizeof(key));
for (i = 0; i < sizeof(key); ++i) for (i = 0; i < sizeof(key); ++i)
key[i] ^= 0xf0; key[i] ^= 0xf0;
@@ -123,7 +123,7 @@ OM_uint32 gss_unwrap
memcpy (&key, context_handle->auth_context->key.keyvalue.data, memcpy (&key, context_handle->auth_context->key.keyvalue.data,
sizeof(key)); sizeof(key));
#endif #endif
memcpy (&key, context_handle->auth_context->remote_subkey.keyvalue.data, memcpy (&key, context_handle->auth_context->remote_subkey->keyvalue.data,
sizeof(key)); sizeof(key));
des_set_key (&key, schedule); des_set_key (&key, schedule);
des_cbc_cksum ((des_cblock *)hash, des_cbc_cksum ((des_cblock *)hash,

2
lib/gssapi/verify_mic.c
View File

@@ -84,7 +84,7 @@ OM_uint32 gss_verify_mic
memcpy (&key, context_handle->auth_context->key.keyvalue.data, memcpy (&key, context_handle->auth_context->key.keyvalue.data,
sizeof(key)); sizeof(key));
#endif #endif
memcpy (&key, context_handle->auth_context->remote_subkey.keyvalue.data, memcpy (&key, context_handle->auth_context->remote_subkey->keyvalue.data,
sizeof(key)); sizeof(key));
des_set_key (&key, schedule); des_set_key (&key, schedule);

4
lib/gssapi/wrap.c
View File

@@ -122,7 +122,7 @@ OM_uint32 gss_wrap
memcpy (&key, context_handle->auth_context->key.keyvalue.data, memcpy (&key, context_handle->auth_context->key.keyvalue.data,
sizeof(key)); sizeof(key));
#endif #endif
memcpy (&key, context_handle->auth_context->local_subkey.keyvalue.data, memcpy (&key, context_handle->auth_context->local_subkey->keyvalue.data,
sizeof(key)); sizeof(key));
des_set_key (&key, schedule); des_set_key (&key, schedule);
des_cbc_cksum ((des_cblock *)hash, des_cbc_cksum ((des_cblock *)hash,
@@ -159,7 +159,7 @@ OM_uint32 gss_wrap
memcpy (&key, context_handle->auth_context->key.keyvalue.data, memcpy (&key, context_handle->auth_context->key.keyvalue.data,
sizeof(key)); sizeof(key));
#endif #endif
memcpy (&key, context_handle->auth_context->local_subkey.keyvalue.data, memcpy (&key, context_handle->auth_context->local_subkey->keyvalue.data,
sizeof(key)); sizeof(key));
for (i = 0; i < sizeof(key); ++i) for (i = 0; i < sizeof(key); ++i)
key[i] ^= 0xf0; key[i] ^= 0xf0;

4
lib/krb5/get_for_creds.c
View File

@@ -101,7 +101,7 @@ krb5_get_forwarded_creds (krb5_context context,
enctype = auth_context->enctype; enctype = auth_context->enctype;
else { else {
ret = krb5_keytype_to_etype (context, ret = krb5_keytype_to_etype (context,
auth_context->local_subkey.keytype, auth_context->local_subkey->keytype,
&enctype); &enctype);
if (ret) if (ret)
return ret; return ret;
@@ -228,7 +228,7 @@ krb5_get_forwarded_creds (krb5_context context,
len, len,
enctype, enctype,
0, 0,
&auth_context->local_subkey, auth_context->local_subkey,
&cred.enc_part); &cred.enc_part);
if (ret) { if (ret) {
free_KRB_CRED(&cred); free_KRB_CRED(&cred);

8
lib/krb5/mk_priv.c
View File

@@ -61,10 +61,10 @@ krb5_mk_priv(krb5_context context,
/* XXX - Is this right? */ /* XXX - Is this right? */
if (auth_context->local_subkey.keytype) if (auth_context->local_subkey->keytype)
key = &auth_context->local_subkey; key = auth_context->local_subkey;
else if (auth_context->remote_subkey.keytype) else if (auth_context->remote_subkey->keytype)
key = &auth_context->remote_subkey; key = auth_context->remote_subkey;
else else
key = auth_context->keyblock; key = auth_context->keyblock;

2
lib/krb5/rd_cred.c
View File

@@ -72,7 +72,7 @@ krb5_rd_cred (krb5_context context,
cred.enc_part.cipher.data, cred.enc_part.cipher.data,
cred.enc_part.cipher.length, cred.enc_part.cipher.length,
cred.enc_part.etype, cred.enc_part.etype,
&auth_context->remote_subkey, auth_context->remote_subkey,
&enc_krb_cred_part_data); &enc_krb_cred_part_data);
if (ret) if (ret)
goto out; goto out;

8
lib/krb5/rd_priv.c
View File

@@ -68,10 +68,10 @@ krb5_rd_priv(krb5_context context,
/* XXX - Is this right? */ /* XXX - Is this right? */
if (auth_context->local_subkey.keytype) if (auth_context->local_subkey->keytype)
key = &auth_context->local_subkey; key = auth_context->local_subkey;
else if (auth_context->remote_subkey.keytype) else if (auth_context->remote_subkey->keytype)
key = &auth_context->remote_subkey; key = auth_context->remote_subkey;
else else
key = auth_context->keyblock; key = auth_context->keyblock;

5
lib/krb5/rd_req.c
View File

@@ -238,8 +238,9 @@ krb5_verify_ap_req(krb5_context context,
/* And where should it be stored? */ /* And where should it be stored? */
if (ac->authenticator->subkey) { if (ac->authenticator->subkey) {
copy_EncryptionKey (ac->authenticator->subkey, krb5_copy_keyblock(context,
&ac->remote_subkey); ac->authenticator->subkey,
&ac->remote_subkey);
} }
if (ap_req_options) { if (ap_req_options) {