Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5 _gss_DES3_g...



details:   https://anonhg.NetBSD.org/src/rev/335b6dea29e1
branches:  trunk
changeset: 764184:335b6dea29e1
user:      elric <elric%NetBSD.org@localhost>
date:      Wed Apr 13 18:30:04 2011 +0000

description:
_gss_DES3_get_mic_compat() requires that ctx->target has been defined, and,
well, it hasn't yet.  Move the call down to after it is defined and things
are better.

diffstat:

 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/init_sec_context.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (31 lines):

diff -r dcfa5f89d035 -r 335b6dea29e1 crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/init_sec_context.c
--- a/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/init_sec_context.c       Wed Apr 13 18:23:42 2011 +0000
+++ b/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/init_sec_context.c       Wed Apr 13 18:30:04 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: init_sec_context.c,v 1.1.1.1 2011/04/13 18:14:45 elric Exp $   */
+/*     $NetBSD: init_sec_context.c,v 1.2 2011/04/13 18:30:04 elric Exp $       */
 
 /*
  * Copyright (c) 1997 - 2008 Kungliga Tekniska Högskolan
@@ -424,10 +424,6 @@
        goto failure;
     }
 
-    ret = _gss_DES3_get_mic_compat(minor_status, ctx, context);
-    if (ret)
-       goto failure;
-
 
     /*
      * This is hideous glue for (NFS) clients that wants to limit the
@@ -471,6 +467,10 @@
 
     ctx->lifetime = ctx->kcred->times.endtime;
 
+    ret = _gss_DES3_get_mic_compat(minor_status, ctx, context);
+    if (ret)
+       goto failure;
+
     ret = _gsskrb5_lifetime_left(minor_status,
                                 context,
                                 ctx->lifetime,



Home | Main Index | Thread Index | Old Index