Merge remote branch 'origin/mdb.master'

[openldap] / libraries / liblutil / md5.c

diff --git a/libraries/liblutil/md5.c b/libraries/liblutil/md5.c
index 10f713d1a7d3346d92da705aed5c5c75ee70795a..b36bfbb7d64f0bca93d57e61fa5b920644f57e1a 100644 (file)
--- a/libraries/liblutil/md5.c
+++ b/libraries/liblutil/md5.c
@@ -1,12 +1,21 @@
+/* md5.c -- MD5 message-digest algorithm */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2012 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
-/*
- * Modified by Kurt D. Zeilenga for inclusion into OpenLDAP
- * I hereby disclaim copyright in any changes I have made; this
- * code remains in the public domain.
+/* This work was adapted for inclusion in OpenLDAP Software by
+ * Kurt D. Zeilenga based upon code developed by Colin Plumb
+ * and subsequently modified by Jim Kingdon. 
  */
 
 /*
@@ -176,7 +185,7 @@ lutil_MD5Final( unsigned char *digest, struct lutil_MD5Context *ctx )
        putu32(ctx->buf[1], digest + 4);
        putu32(ctx->buf[2], digest + 8);
        putu32(ctx->buf[3], digest + 12);
-       memset(ctx, '\0', sizeof(ctx)); /* In case it's sensitive */
+       memset(ctx, '\0', sizeof(*ctx));        /* In case it's sensitive */
 }
 
 #ifndef ASM_MD5