From 644ebda4429a524c3a8654d272744978d9181fe1 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Sun, 5 Apr 1998 06:11:29 +0000 Subject: [PATCH] Use `gss_krb5_getsomekey'. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4729 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/gssapi/get_mic.c | 9 ++------- lib/gssapi/krb5/get_mic.c | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/lib/gssapi/get_mic.c b/lib/gssapi/get_mic.c index 7ad1fbbb1..bb89d6307 100644 --- a/lib/gssapi/get_mic.c +++ b/lib/gssapi/get_mic.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 Kungliga Tekniska Högskolan + * Copyright (c) 1997, 1998 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -85,12 +85,7 @@ OM_uint32 gss_get_mic md5_finito (&md5, hash); memset (&zero, 0, sizeof(zero)); -#if 0 - memcpy (&key, context_handle->auth_context->key.keyvalue.data, - sizeof(key)); -#endif - memcpy (&key, context_handle->auth_context->local_subkey->keyvalue.data, - sizeof(key)); + gss_krb5_getsomekey(context_handle, &key); des_set_key (&key, schedule); des_cbc_cksum ((des_cblock *)hash, (des_cblock *)hash, sizeof(hash), schedule, &zero); diff --git a/lib/gssapi/krb5/get_mic.c b/lib/gssapi/krb5/get_mic.c index 7ad1fbbb1..bb89d6307 100644 --- a/lib/gssapi/krb5/get_mic.c +++ b/lib/gssapi/krb5/get_mic.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 Kungliga Tekniska Högskolan + * Copyright (c) 1997, 1998 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -85,12 +85,7 @@ OM_uint32 gss_get_mic md5_finito (&md5, hash); memset (&zero, 0, sizeof(zero)); -#if 0 - memcpy (&key, context_handle->auth_context->key.keyvalue.data, - sizeof(key)); -#endif - memcpy (&key, context_handle->auth_context->local_subkey->keyvalue.data, - sizeof(key)); + gss_krb5_getsomekey(context_handle, &key); des_set_key (&key, schedule); des_cbc_cksum ((des_cblock *)hash, (des_cblock *)hash, sizeof(hash), schedule, &zero);