CVS commit: src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon May 12 15:25:49 UTC 2014

Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5: verify_mic.c

Log Message:
CID 745439: Fix memory leak


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/verify_mic.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/verify_mic.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/verify_mic.c:1.1.1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/verify_mic.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/verify_mic.c:1.1.1.2	Thu Apr 24 08:45:29 2014
+++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/verify_mic.c	Mon May 12 11:25:49 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: verify_mic.c,v 1.1.1.2 2014/04/24 12:45:29 pettai Exp $	*/
+/*	$NetBSD: verify_mic.c,v 1.2 2014/05/12 15:25:49 christos Exp $	*/
 
 /*
  * Copyright (c) 1997 - 2003 Kungliga Tekniska Högskolan
@@ -256,7 +256,8 @@ retry:
   krb5_crypto_destroy (context, crypto);
   ret = krb5_crypto_init(context, key,
 			 ETYPE_DES3_CBC_SHA1, crypto);
-  if (ret){
+  if (ret) {
+  free (tmp);
   *minor_status = ret;
   return GSS_S_FAILURE;
   }

CVS commit: src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5

[Roland Dowdeswell]

Module Name:src
Committed By:   elric
Date:   Wed Apr 13 18:30:04 UTC 2011

Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5:
init_sec_context.c

Log Message:
_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.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/init_sec_context.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/init_sec_context.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/init_sec_context.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/init_sec_context.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/init_sec_context.c:1.1.1.1	Wed Apr 13 18:14:45 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/init_sec_context.c	Wed Apr 13 18:30:04 2011
@@ -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,