diff --git a/lib/krb5/crypto.c b/lib/krb5/crypto.c
index ae3f46c0e..4377a1a21 100644
--- a/lib/krb5/crypto.c
+++ b/lib/krb5/crypto.c
@@ -2542,7 +2542,7 @@ krb5_crypto_prfplus(krb5_context context,
     krb5_data_free(&input2);
     if (ret)
 	krb5_data_free(output);
-    return 0;
+    return ret;
 }
 
 /**
@@ -2575,6 +2575,8 @@ krb5_crypto_fx_cf2(krb5_context context,
     size_t i, keysize;
 
     memset(res, 0, sizeof(*res));
+    krb5_data_zero(&os1);
+    krb5_data_zero(&os2);
 
     ret = krb5_enctype_keysize(context, enctype, &keysize);
     if (ret)