vendor/heimdal/7.7.0

5 files changed, 17 insertions, 17 deletions

diff --git a/lib/gssapi/gen-oid.pl b/lib/gssapi/gen-oid.pl
index a2341ad9816d..a2341ad9816d 100755..100644
--- a/lib/gssapi/gen-oid.pl
+++ b/lib/gssapi/gen-oid.pl
diff --git a/lib/gssapi/krb5/arcfour.c b/lib/gssapi/krb5/arcfour.c
index 0aa2da0808bf..d88ec4cddc53 100644
--- a/lib/gssapi/krb5/arcfour.c
+++ b/lib/gssapi/krb5/arcfour.c
@@ -304,7 +304,7 @@ _gssapi_get_mic_arcfour(OM_uint32 * minor_status,
     EVP_Cipher(&rc4_key, p, p, 8);
     EVP_CIPHER_CTX_cleanup(&rc4_key);
 
-    memset(k6_data, 0, sizeof(k6_data));
+    memset_s(k6_data, sizeof(k6_data), 0, sizeof(k6_data));
 
     *minor_status = 0;
     return GSS_S_COMPLETE;
@@ -389,7 +389,7 @@ _gssapi_verify_mic_arcfour(OM_uint32 * minor_status,
     else
 	cmp = memcmp(&SND_SEQ[4], "\x00\x00\x00\x00", 4);
 
-    memset(SND_SEQ, 0, sizeof(SND_SEQ));
+    memset_s(SND_SEQ, sizeof(SND_SEQ), 0, sizeof(SND_SEQ));
     if (cmp != 0) {
 	*minor_status = 0;
 	return GSS_S_BAD_MIC;
@@ -516,7 +516,7 @@ _gssapi_wrap_arcfour(OM_uint32 * minor_status,
     ret = arcfour_mic_key(context, &Klocal,
 			  p0 + 8, 4, /* SND_SEQ */
 			  k6_data, sizeof(k6_data));
-    memset(Klocaldata, 0, sizeof(Klocaldata));
+    memset_s(Klocaldata, sizeof(Klocaldata), 0, sizeof(Klocaldata));
     if (ret) {
 	_gsskrb5_release_buffer(minor_status, output_message_buffer);
 	*minor_status = ret;
@@ -550,7 +550,7 @@ _gssapi_wrap_arcfour(OM_uint32 * minor_status,
 	EVP_CipherInit_ex(&rc4_key, EVP_rc4(), NULL, k6_data, NULL, 1);
 	EVP_Cipher(&rc4_key, p0 + 8, p0 + 8 /* SND_SEQ */, 8);
 	EVP_CIPHER_CTX_cleanup(&rc4_key);
-	memset(k6_data, 0, sizeof(k6_data));
+	memset_s(k6_data, sizeof(k6_data), 0, sizeof(k6_data));
     }
 
     if (conf_state)
@@ -650,7 +650,7 @@ OM_uint32 _gssapi_unwrap_arcfour(OM_uint32 *minor_status,
 	EVP_CipherInit_ex(&rc4_key, EVP_rc4(), NULL, k6_data, NULL, 1);
 	EVP_Cipher(&rc4_key, SND_SEQ, p0 + 8, 8);
 	EVP_CIPHER_CTX_cleanup(&rc4_key);
-	memset(k6_data, 0, sizeof(k6_data));
+	memset_s(k6_data, sizeof(k6_data), 0, sizeof(k6_data));
     }
 
     _gsskrb5_decode_be_om_uint32(SND_SEQ, &seq_number);
@@ -678,7 +678,7 @@ OM_uint32 _gssapi_unwrap_arcfour(OM_uint32 *minor_status,
     ret = arcfour_mic_key(context, &Klocal,
 			  SND_SEQ, 4,
 			  k6_data, sizeof(k6_data));
-    memset(Klocaldata, 0, sizeof(Klocaldata));
+    memset_s(Klocaldata, sizeof(Klocaldata), 0, sizeof(Klocaldata));
     if (ret) {
 	*minor_status = ret;
 	return GSS_S_FAILURE;
@@ -1069,7 +1069,7 @@ _gssapi_wrap_iov_arcfour(OM_uint32 *minor_status,
     kret = arcfour_mic_key(context, &Klocal,
 			   p0 + 8, 4, /* SND_SEQ */
 			   k6_data, sizeof(k6_data));
-    memset(Klocaldata, 0, sizeof(Klocaldata));
+    memset_s(Klocaldata, sizeof(Klocaldata), 0, sizeof(Klocaldata));
     if (kret) {
 	*minor_status = kret;
 	major_status = GSS_S_FAILURE;
@@ -1300,7 +1300,7 @@ _gssapi_unwrap_iov_arcfour(OM_uint32 *minor_status,
 			   snd_seq,
 			   4,
 			   k6_data, sizeof(k6_data));
-    memset(Klocaldata, 0, sizeof(Klocaldata));
+    memset_s(Klocaldata, sizeof(Klocaldata), 0, sizeof(Klocaldata));
     if (kret) {
 	*minor_status = kret;
 	return GSS_S_FAILURE;
diff --git a/lib/gssapi/krb5/get_mic.c b/lib/gssapi/krb5/get_mic.c
index 643385d9e892..d9cf9d700737 100644
--- a/lib/gssapi/krb5/get_mic.c
+++ b/lib/gssapi/krb5/get_mic.c
@@ -121,8 +121,8 @@ mic_des
 			       ++seq_number);
   HEIMDAL_MUTEX_unlock(&ctx->ctx_id_mutex);
 
-  memset (deskey, 0, sizeof(deskey));
-  memset (&schedule, 0, sizeof(schedule));
+  memset_s(deskey, sizeof(deskey), 0, sizeof(deskey));
+  memset_s(&schedule, sizeof(schedule), 0, sizeof(schedule));
 
   *minor_status = 0;
   return GSS_S_COMPLETE;
diff --git a/lib/gssapi/krb5/verify_mic.c b/lib/gssapi/krb5/verify_mic.c
index 9968ce403ef7..7070f3de46be 100644
--- a/lib/gssapi/krb5/verify_mic.c
+++ b/lib/gssapi/krb5/verify_mic.c
@@ -89,8 +89,8 @@ verify_mic_des
   DES_cbc_cksum ((void *)hash, (void *)hash, sizeof(hash),
 		 &schedule, &zero);
   if (ct_memcmp (p - 8, hash, 8) != 0) {
-    memset (deskey, 0, sizeof(deskey));
-    memset (&schedule, 0, sizeof(schedule));
+    memset_s(deskey, sizeof(deskey), 0, sizeof(deskey));
+    memset_s(&schedule, sizeof(schedule), 0, sizeof(schedule));
     return GSS_S_BAD_MIC;
   }
 
@@ -105,8 +105,8 @@ verify_mic_des
   EVP_Cipher(&des_ctx, p, p, 8);
   EVP_CIPHER_CTX_cleanup(&des_ctx);
 
-  memset (deskey, 0, sizeof(deskey));
-  memset (&schedule, 0, sizeof(schedule));
+  memset_s(deskey, sizeof(deskey), 0, sizeof(deskey));
+  memset_s(&schedule, sizeof(schedule), 0, sizeof(schedule));
 
   seq = p;
   _gsskrb5_decode_om_uint32(seq, &seq_number);
diff --git a/lib/gssapi/ntlm/init_sec_context.c b/lib/gssapi/ntlm/init_sec_context.c
index 5499a1b814e7..f3198d8a274d 100644
--- a/lib/gssapi/ntlm/init_sec_context.c
+++ b/lib/gssapi/ntlm/init_sec_context.c
@@ -72,11 +72,11 @@ from_file(const char *fn, const char *target_domain,
 
 	heim_ntlm_nt_key(p, key);
 
-	memset(buf, 0, sizeof(buf));
+	memset_s(buf, sizeof(buf), 0, sizeof(buf));
 	fclose(f);
 	return 0;
     }
-    memset(buf, 0, sizeof(buf));
+    memset_s(buf, sizeof(buf), 0, sizeof(buf));
     fclose(f);
     return ENOENT;
 }
@@ -466,7 +466,7 @@ _gss_ntlm_init_sec_context
 	    ret = heim_ntlm_build_ntlm1_master(ntlmv2, sizeof(ntlmv2),
 					       &sessionkey,
 					       &type3.sessionkey);
-	    memset(ntlmv2, 0, sizeof(ntlmv2));
+	    memset_s(ntlmv2, sizeof(ntlmv2), 0, sizeof(ntlmv2));
 	    if (ret) {
 		_gss_ntlm_delete_sec_context(minor_status,
 					     context_handle, NULL);