projects
/
mod_auth_kerb.cvs
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- 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;
ret = 0;
e = encode_octet_string(p, len, (data)->mechListMIC, &l);
BACK;
-e = der_put_length_and_tag (p, len, ret,
CONTE
XT, CONS, 3, &l);
+e = der_put_length_and_tag (p, len, ret,
KERB_CT
XT, CONS, 3, &l);
BACK;
ret += oldret;
}
BACK;
ret += oldret;
}
@@
-37,7
+37,7
@@
int oldret = ret;
ret = 0;
e = encode_octet_string(p, len, (data)->mechToken, &l);
BACK;
ret = 0;
e = encode_octet_string(p, len, (data)->mechToken, &l);
BACK;
-e = der_put_length_and_tag (p, len, ret,
CONTE
XT, CONS, 2, &l);
+e = der_put_length_and_tag (p, len, ret,
KERB_CT
XT, CONS, 2, &l);
BACK;
ret += oldret;
}
BACK;
ret += oldret;
}
@@
-47,7
+47,7
@@
int oldret = ret;
ret = 0;
e = encode_ContextFlags(p, len, (data)->reqFlags, &l);
BACK;
ret = 0;
e = encode_ContextFlags(p, len, (data)->reqFlags, &l);
BACK;
-e = der_put_length_and_tag (p, len, ret,
CONTE
XT, CONS, 1, &l);
+e = der_put_length_and_tag (p, len, ret,
KERB_CT
XT, CONS, 1, &l);
BACK;
ret += oldret;
}
BACK;
ret += oldret;
}
@@
-57,7
+57,7
@@
int oldret = ret;
ret = 0;
e = encode_MechTypeList(p, len, (data)->mechTypes, &l);
BACK;
ret = 0;
e = encode_MechTypeList(p, len, (data)->mechTypes, &l);
BACK;
-e = der_put_length_and_tag (p, len, ret,
CONTE
XT, CONS, 0, &l);
+e = der_put_length_and_tag (p, len, ret,
KERB_CT
XT, CONS, 0, &l);
BACK;
ret += oldret;
}
BACK;
ret += oldret;
}
@@
-87,7
+87,7
@@
return ASN1_BAD_FORMAT;
{
size_t newlen, oldlen;
{
size_t newlen, oldlen;
-e = der_match_tag (p, len,
CONTE
XT, CONS, 0, &l);
+e = der_match_tag (p, len,
KERB_CT
XT, CONS, 0, &l);
if (e)
(data)->mechTypes = NULL;
else {
if (e)
(data)->mechTypes = NULL;
else {
@@
-115,7
+115,7
@@
len = oldlen - newlen;
{
size_t newlen, oldlen;
{
size_t newlen, oldlen;
-e = der_match_tag (p, len,
CONTE
XT, CONS, 1, &l);
+e = der_match_tag (p, len,
KERB_CT
XT, CONS, 1, &l);
if (e)
(data)->reqFlags = NULL;
else {
if (e)
(data)->reqFlags = NULL;
else {
@@
-143,7
+143,7
@@
len = oldlen - newlen;
{
size_t newlen, oldlen;
{
size_t newlen, oldlen;
-e = der_match_tag (p, len,
CONTE
XT, CONS, 2, &l);
+e = der_match_tag (p, len,
KERB_CT
XT, CONS, 2, &l);
if (e)
(data)->mechToken = NULL;
else {
if (e)
(data)->mechToken = NULL;
else {
@@
-171,7
+171,7
@@
len = oldlen - newlen;
{
size_t newlen, oldlen;
{
size_t newlen, oldlen;
-e = der_match_tag (p, len,
CONTE
XT, CONS, 3, &l);
+e = der_match_tag (p, len,
KERB_CT
XT, CONS, 3, &l);
if (e)
(data)->mechListMIC = NULL;
else {
if (e)
(data)->mechListMIC = NULL;
else {