heimdal - fix overlapped identifiers in the "krb5" library

3 files changed, 11 insertions, 11 deletions

diff --git a/source4/heimdal/lib/krb5/crypto.c b/source4/heimdal/lib/krb5/crypto.c
index 8cc7b06026..745c856810 100644
--- a/source4/heimdal/lib/krb5/crypto.c
+++ b/source4/heimdal/lib/krb5/crypto.c
@@ -2043,13 +2043,13 @@ evp_encrypt(krb5_context context,
     c = encryptp ? &ctx->ectx : &ctx->dctx;
     if (ivec == NULL) {
 	/* alloca ? */
-	size_t len = EVP_CIPHER_CTX_iv_length(c);
-	void *loiv = malloc(len);
+	size_t len2 = EVP_CIPHER_CTX_iv_length(c);
+	void *loiv = malloc(len2);
 	if (loiv == NULL) {
 	    krb5_clear_error_message(context);
 	    return ENOMEM;
 	}
-	memset(loiv, 0, len);
+	memset(loiv, 0, len2);
 	EVP_CipherInit_ex(c, NULL, NULL, NULL, loiv, -1);
 	free(loiv);
     } else
diff --git a/source4/heimdal/lib/krb5/init_creds_pw.c b/source4/heimdal/lib/krb5/init_creds_pw.c
index f32b4186a4..5901c55319 100644
--- a/source4/heimdal/lib/krb5/init_creds_pw.c
+++ b/source4/heimdal/lib/krb5/init_creds_pw.c
@@ -1895,7 +1895,7 @@ krb5_get_init_creds_password(krb5_context context,
 
 
     if (ret == KRB5KDC_ERR_KEY_EXPIRED && chpw == 0) {
-	char buf[1024];
+	char buf2[1024];
 
 	/* try to avoid recursion */
 	if (in_tkt_service != NULL && strcmp(in_tkt_service, "kadmin/changepw") == 0)
@@ -1908,7 +1908,7 @@ krb5_get_init_creds_password(krb5_context context,
 	ret = change_password (context,
 			       client,
 			       ctx->password,
-			       buf,
+			       buf2,
 			       sizeof(buf),
 			       prompter,
 			       data,
diff --git a/source4/heimdal/lib/krb5/pkinit.c b/source4/heimdal/lib/krb5/pkinit.c
index f6457aa5c9..341f6a3ee9 100644
--- a/source4/heimdal/lib/krb5/pkinit.c
+++ b/source4/heimdal/lib/krb5/pkinit.c
@@ -1170,10 +1170,10 @@ pk_rd_pa_reply_enckey(krb5_context context,
 
     /* win2k uses ContentInfo */
     if (type == PKINIT_WIN2K) {
-	heim_oid type;
+	heim_oid type2;
 	heim_octet_string out;
 
-	ret = hx509_cms_unwrap_ContentInfo(&content, &type, &out, NULL);
+	ret = hx509_cms_unwrap_ContentInfo(&content, &type2, &out, NULL);
 	if (ret) {
 	    /* windows LH with interesting CMS packets */
 	    size_t ph = 1 + der_length_len(content.length);
@@ -1190,19 +1190,19 @@ pk_rd_pa_reply_enckey(krb5_context context,
 	    content.data = ptr;
 	    content.length += ph;
 
-	    ret = hx509_cms_unwrap_ContentInfo(&content, &type, &out, NULL);
+	    ret = hx509_cms_unwrap_ContentInfo(&content, &type2, &out, NULL);
 	    if (ret)
 		goto out;
 	}
-	if (der_heim_oid_cmp(&type, &asn1_oid_id_pkcs7_signedData)) {
+	if (der_heim_oid_cmp(&type2, &asn1_oid_id_pkcs7_signedData)) {
 	    ret = EINVAL; /* XXX */
 	    krb5_set_error_message(context, ret,
 				   N_("PKINIT: Invalid content type", ""));
-	    der_free_oid(&type);
+	    der_free_oid(&type2);
 	    der_free_octet_string(&out);
 	    goto out;
 	}
-	der_free_oid(&type);
+	der_free_oid(&type2);
 	krb5_data_free(&content);
 	ret = krb5_data_copy(&content, out.data, out.length);
 	der_free_octet_string(&out);