mirror of
https://github.com/samba-team/samba.git
synced 2025-01-26 10:04:02 +03:00
s4:heimdal: import lorikeet-heimdal-200911170333 (commit b532c294d974cead40a1183c71be644c6ccc2832)
This fixes up connections to Windows 2003, because the previous import had a broken arcfour-hmac-md5 implementation (fixed in Heimdal 316fc6ff8ffb0cbb1ef3689685e9977c37405bc4) Andrew Bartlett
This commit is contained in:
parent
b9e262c512
commit
dc351a579d
@ -38,6 +38,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <com_right.h>
|
||||
#include <roken.h>
|
||||
|
||||
#ifdef LIBINTL
|
||||
#include <libintl.h>
|
||||
|
@ -33,8 +33,6 @@
|
||||
|
||||
#include "spnego_locl.h"
|
||||
|
||||
RCSID("$Id$");
|
||||
|
||||
static OM_uint32
|
||||
send_reject (OM_uint32 *minor_status,
|
||||
gss_buffer_t output_token)
|
||||
|
@ -32,8 +32,6 @@
|
||||
|
||||
#include "spnego_locl.h"
|
||||
|
||||
RCSID("$Id$");
|
||||
|
||||
/*
|
||||
* Apparently Microsoft got the OID wrong, and used
|
||||
* 1.2.840.48018.1.2.2 instead. We need both this and
|
||||
|
@ -32,8 +32,6 @@
|
||||
|
||||
#include "spnego_locl.h"
|
||||
|
||||
RCSID("$Id$");
|
||||
|
||||
static OM_uint32
|
||||
spnego_supported_mechs(OM_uint32 *minor_status, gss_OID_set *mechs)
|
||||
{
|
||||
|
@ -32,8 +32,6 @@
|
||||
|
||||
#include "spnego_locl.h"
|
||||
|
||||
RCSID("$Id$");
|
||||
|
||||
OM_uint32
|
||||
_gss_spnego_release_cred(OM_uint32 *minor_status, gss_cred_id_t *cred_handle)
|
||||
{
|
||||
|
@ -33,8 +33,6 @@
|
||||
#include "spnego_locl.h"
|
||||
#include <gssapi_mech.h>
|
||||
|
||||
RCSID("$Id$");
|
||||
|
||||
/*
|
||||
* RFC2478, SPNEGO:
|
||||
* The security mechanism of the initial
|
||||
|
@ -33,8 +33,6 @@
|
||||
|
||||
#include "spnego_locl.h"
|
||||
|
||||
RCSID("$Id$");
|
||||
|
||||
/*
|
||||
* Is target_name an sane target for `mech´.
|
||||
*/
|
||||
|
@ -2386,7 +2386,6 @@ usage2arcfour (krb5_context context, unsigned *usage)
|
||||
{
|
||||
switch (*usage) {
|
||||
case KRB5_KU_AS_REP_ENC_PART : /* 3 */
|
||||
case KRB5_KU_TGS_REP_ENC_PART_SUB_KEY : /* 9 */
|
||||
*usage = 8;
|
||||
return 0;
|
||||
case KRB5_KU_USAGE_SEAL : /* 22 */
|
||||
|
@ -244,16 +244,12 @@ init_tgs_req (krb5_context context,
|
||||
if(ret)
|
||||
goto fail;
|
||||
|
||||
ret = krb5_generate_subkey_extended(context, &krbtgt->session,
|
||||
ETYPE_NULL, &key);
|
||||
ret = krb5_auth_con_generatelocalsubkey(context, ac, &krbtgt->session);
|
||||
if (ret)
|
||||
goto fail;
|
||||
|
||||
ret = krb5_auth_con_setlocalsubkey(context, ac, key);
|
||||
if (ret)
|
||||
goto fail;
|
||||
|
||||
ret = set_auth_data (context, &t->req_body, &in_creds->authdata, key);
|
||||
ret = set_auth_data (context, &t->req_body, &in_creds->authdata,
|
||||
ac->local_subkey);
|
||||
if (ret)
|
||||
goto fail;
|
||||
|
||||
@ -265,12 +261,11 @@ init_tgs_req (krb5_context context,
|
||||
if(ret)
|
||||
goto fail;
|
||||
|
||||
*subkey = key;
|
||||
key = NULL;
|
||||
|
||||
ret = krb5_auth_con_getlocalsubkey(context, ac, subkey);
|
||||
if (ret)
|
||||
goto fail;
|
||||
|
||||
fail:
|
||||
if (key)
|
||||
krb5_free_keyblock (context, key);
|
||||
if (ac)
|
||||
krb5_auth_con_free(context, ac);
|
||||
if (ret) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user