diff --git a/lib/krb5/keyblock.c b/lib/krb5/keyblock.c
index abca3ee05..317bed382 100644
--- a/lib/krb5/keyblock.c
+++ b/lib/krb5/keyblock.c
@@ -63,7 +63,8 @@ krb5_free_keyblock_contents(krb5_context context,
 {
     if(keyblock) {
 	if (keyblock->keyvalue.data != NULL)
-	    memset(keyblock->keyvalue.data, 0, keyblock->keyvalue.length);
+	    memset_s(keyblock->keyvalue.data, keyblock->keyvalue.length,
+		     0, keyblock->keyvalue.length);
 	krb5_data_free (&keyblock->keyvalue);
 	keyblock->keytype = KRB5_ENCTYPE_NULL;
     }