diff options
| author | nectar <nectar@FreeBSD.org> | 2002-02-19 15:46:56 +0000 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 2002-02-19 15:46:56 +0000 |
| commit | 69a91bec14ec3ad49d1c8a82c40a796755f9e4a3 (patch) | |
| tree | 85ecf91fd00875cec4b93111d3a8ed9eec9cddfe /crypto/heimdal/lib/gssapi/verify_mic.c | |
| parent | 8db4cdb3da4228a5d93635e43825e2e8a2f66db7 (diff) | |
| download | FreeBSD-src-69a91bec14ec3ad49d1c8a82c40a796755f9e4a3.zip FreeBSD-src-69a91bec14ec3ad49d1c8a82c40a796755f9e4a3.tar.gz | |
Import of Heimdal Kerberos from KTH repository circa 2002/02/17.
Diffstat (limited to 'crypto/heimdal/lib/gssapi/verify_mic.c')
| -rw-r--r-- | crypto/heimdal/lib/gssapi/verify_mic.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/crypto/heimdal/lib/gssapi/verify_mic.c b/crypto/heimdal/lib/gssapi/verify_mic.c index b39ae73..e286d4a 100644 --- a/crypto/heimdal/lib/gssapi/verify_mic.c +++ b/crypto/heimdal/lib/gssapi/verify_mic.c @@ -33,7 +33,7 @@ #include "gssapi_locl.h" -RCSID("$Id: verify_mic.c,v 1.13 2001/05/11 09:16:47 assar Exp $"); +RCSID("$Id: verify_mic.c,v 1.15 2001/08/23 04:35:55 assar Exp $"); static OM_uint32 verify_mic_des @@ -58,8 +58,10 @@ verify_mic_des ret = gssapi_krb5_verify_header (&p, token_buffer->length, "\x01\x01"); - if (ret) + if (ret) { + *minor_status = 0; return ret; + } if (memcmp(p, "\x00\x00", 2) != 0) return GSS_S_BAD_SIG; @@ -113,7 +115,7 @@ verify_mic_des return GSS_S_BAD_MIC; } - krb5_auth_setremoteseqnumber (gssapi_krb5_context, + krb5_auth_con_setremoteseqnumber (gssapi_krb5_context, context_handle->auth_context, ++seq_number); @@ -144,8 +146,10 @@ verify_mic_des3 ret = gssapi_krb5_verify_header (&p, token_buffer->length, "\x01\x01"); - if (ret) + if (ret) { + *minor_status = 0; return ret; + } if (memcmp(p, "\x04\x00", 2) != 0) /* SGN_ALG = HMAC SHA1 DES3-KD */ return GSS_S_BAD_SIG; @@ -226,7 +230,7 @@ verify_mic_des3 return GSS_S_BAD_MIC; } - krb5_auth_setremoteseqnumber (gssapi_krb5_context, + krb5_auth_con_setremoteseqnumber (gssapi_krb5_context, context_handle->auth_context, ++seq_number); @@ -247,9 +251,7 @@ gss_verify_mic OM_uint32 ret; krb5_keytype keytype; - ret = krb5_auth_con_getremotesubkey (gssapi_krb5_context, - context_handle->auth_context, - &key); + ret = gss_krb5_get_remotekey(context_handle, &key); if (ret) { gssapi_krb5_set_error_string (); *minor_status = ret; |
