diff options
| author | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2010-03-16 16:53:39 +0100 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2010-03-16 17:11:49 +0100 |
| commit | dc5e0d84641173b7f710f0a735970f5dd2c27d38 (patch) | |
| tree | bc528a6177b53dde594d0f346c533c759ab6b610 /source4/heimdal/lib/krb5/pkinit.c | |
| parent | 973001e91a3988f4338f88599acbf4ab8978e1c9 (diff) | |
| download | samba-dc5e0d84641173b7f710f0a735970f5dd2c27d38.tar.gz samba-dc5e0d84641173b7f710f0a735970f5dd2c27d38.tar.bz2 samba-dc5e0d84641173b7f710f0a735970f5dd2c27d38.zip | |
heimdal - fix overlapped identifiers in the "krb5" library
Diffstat (limited to 'source4/heimdal/lib/krb5/pkinit.c')
| -rw-r--r-- | source4/heimdal/lib/krb5/pkinit.c | 12 |
1 files changed, 6 insertions, 6 deletions
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); |