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

(init_auth): only generate one subkey

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11657 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-02-21 03:05:37 +00:00
parent 9d338944d0
commit 797b1db76b
2 changed files with 20 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/gssapi/init_sec_context.c
View File

@@ -117,15 +117,6 @@ do_delegation (krb5_auth_context ac,
memset (&creds, 0, sizeof(creds)); memset (&creds, 0, sizeof(creds));
krb5_data_zero (fwd_data); krb5_data_zero (fwd_data);
kret = krb5_generate_subkey (gssapi_krb5_context, &cred->session, &subkey);
if (kret)
goto out;
kret = krb5_auth_con_setlocalsubkey(gssapi_krb5_context, ac, subkey);
krb5_free_keyblock (gssapi_krb5_context, subkey);
if (kret)
goto out;
kret = krb5_cc_get_principal(gssapi_krb5_context, ccache, &creds.client); kret = krb5_cc_get_principal(gssapi_krb5_context, ccache, &creds.client);
if (kret) if (kret)
goto out; goto out;
@@ -322,6 +313,16 @@ init_auth
(*context_handle)->auth_context, (*context_handle)->auth_context,
&cred->session); &cred->session);
kret = krb5_auth_con_generatelocalsubkey(gssapi_krb5_context,
(*context_handle)->auth_context,
&cred->session);
if(kret) {
gssapi_krb5_set_error_string ();
*minor_status = kret;
ret = GSS_S_FAILURE;
goto failure;
}
flags = 0; flags = 0;
ap_options = 0; ap_options = 0;
if (req_flags & GSS_C_DELEG_FLAG) if (req_flags & GSS_C_DELEG_FLAG)
@@ -372,16 +373,6 @@ init_auth
} }
#endif #endif
kret = krb5_auth_con_generatelocalsubkey(gssapi_krb5_context,
(*context_handle)->auth_context,
&cred->session);
if(kret) {
gssapi_krb5_set_error_string ();
*minor_status = kret;
ret = GSS_S_FAILURE;
goto failure;
}
kret = krb5_build_authenticator (gssapi_krb5_context, kret = krb5_build_authenticator (gssapi_krb5_context,
(*context_handle)->auth_context, (*context_handle)->auth_context,
enctype, enctype,

29
lib/gssapi/krb5/init_sec_context.c
View File

@@ -117,15 +117,6 @@ do_delegation (krb5_auth_context ac,
memset (&creds, 0, sizeof(creds)); memset (&creds, 0, sizeof(creds));
krb5_data_zero (fwd_data); krb5_data_zero (fwd_data);
kret = krb5_generate_subkey (gssapi_krb5_context, &cred->session, &subkey);
if (kret)
goto out;
kret = krb5_auth_con_setlocalsubkey(gssapi_krb5_context, ac, subkey);
krb5_free_keyblock (gssapi_krb5_context, subkey);
if (kret)
goto out;
kret = krb5_cc_get_principal(gssapi_krb5_context, ccache, &creds.client); kret = krb5_cc_get_principal(gssapi_krb5_context, ccache, &creds.client);
if (kret) if (kret)
goto out; goto out;
@@ -322,6 +313,16 @@ init_auth
(*context_handle)->auth_context, (*context_handle)->auth_context,
&cred->session); &cred->session);
kret = krb5_auth_con_generatelocalsubkey(gssapi_krb5_context,
(*context_handle)->auth_context,
&cred->session);
if(kret) {
gssapi_krb5_set_error_string ();
*minor_status = kret;
ret = GSS_S_FAILURE;
goto failure;
}
flags = 0; flags = 0;
ap_options = 0; ap_options = 0;
if (req_flags & GSS_C_DELEG_FLAG) if (req_flags & GSS_C_DELEG_FLAG)
@@ -372,16 +373,6 @@ init_auth
} }
#endif #endif
kret = krb5_auth_con_generatelocalsubkey(gssapi_krb5_context,
(*context_handle)->auth_context,
&cred->session);
if(kret) {
gssapi_krb5_set_error_string ();
*minor_status = kret;
ret = GSS_S_FAILURE;
goto failure;
}
kret = krb5_build_authenticator (gssapi_krb5_context, kret = krb5_build_authenticator (gssapi_krb5_context,
(*context_handle)->auth_context, (*context_handle)->auth_context,
enctype, enctype,