- renamed enum CONTEXT into KERB_CTXT to address name clashes on Windows

[mod_auth_kerb.cvs/.git] / spnegokrb5 / asn1_NegTokenInit.c

diff --git a/spnegokrb5/asn1_NegTokenInit.c b/spnegokrb5/asn1_NegTokenInit.c
index 49c835d..11258a1 100644 (file)
--- a/spnegokrb5/asn1_NegTokenInit.c
+++ b/spnegokrb5/asn1_NegTokenInit.c
@@ -27,7 +27,7 @@ int oldret = ret;
 ret = 0;
 e = encode_octet_string(p, len, (data)->mechListMIC, &l);
 BACK;
-e = der_put_length_and_tag (p, len, ret, CONTEXT, CONS, 3, &l);
+e = der_put_length_and_tag (p, len, ret, KERB_CTXT, CONS, 3, &l);
 BACK;
 ret += oldret;
 }
@@ -37,7 +37,7 @@ int oldret = ret;
 ret = 0;
 e = encode_octet_string(p, len, (data)->mechToken, &l);
 BACK;
-e = der_put_length_and_tag (p, len, ret, CONTEXT, CONS, 2, &l);
+e = der_put_length_and_tag (p, len, ret, KERB_CTXT, CONS, 2, &l);
 BACK;
 ret += oldret;
 }
@@ -47,7 +47,7 @@ int oldret = ret;
 ret = 0;
 e = encode_ContextFlags(p, len, (data)->reqFlags, &l);
 BACK;
-e = der_put_length_and_tag (p, len, ret, CONTEXT, CONS, 1, &l);
+e = der_put_length_and_tag (p, len, ret, KERB_CTXT, CONS, 1, &l);
 BACK;
 ret += oldret;
 }
@@ -57,7 +57,7 @@ int oldret = ret;
 ret = 0;
 e = encode_MechTypeList(p, len, (data)->mechTypes, &l);
 BACK;
-e = der_put_length_and_tag (p, len, ret, CONTEXT, CONS, 0, &l);
+e = der_put_length_and_tag (p, len, ret, KERB_CTXT, CONS, 0, &l);
 BACK;
 ret += oldret;
 }
@@ -87,7 +87,7 @@ return ASN1_BAD_FORMAT;
 {
 size_t newlen, oldlen;
 
-e = der_match_tag (p, len, CONTEXT, CONS, 0, &l);
+e = der_match_tag (p, len, KERB_CTXT, CONS, 0, &l);
 if (e)
 (data)->mechTypes = NULL;
 else {
@@ -115,7 +115,7 @@ len = oldlen - newlen;
 {
 size_t newlen, oldlen;
 
-e = der_match_tag (p, len, CONTEXT, CONS, 1, &l);
+e = der_match_tag (p, len, KERB_CTXT, CONS, 1, &l);
 if (e)
 (data)->reqFlags = NULL;
 else {
@@ -143,7 +143,7 @@ len = oldlen - newlen;
 {
 size_t newlen, oldlen;
 
-e = der_match_tag (p, len, CONTEXT, CONS, 2, &l);
+e = der_match_tag (p, len, KERB_CTXT, CONS, 2, &l);
 if (e)
 (data)->mechToken = NULL;
 else {
@@ -171,7 +171,7 @@ len = oldlen - newlen;
 {
 size_t newlen, oldlen;
 
-e = der_match_tag (p, len, CONTEXT, CONS, 3, &l);
+e = der_match_tag (p, len, KERB_CTXT, CONS, 3, &l);
 if (e)
 (data)->mechListMIC = NULL;
 else {