Prefix der primitives with der_.
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18459 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -45,7 +45,7 @@ _gssapi_encap_length (size_t data_len,
|
||||
|
||||
*len = 1 + 1 + mech->length + data_len;
|
||||
|
||||
len_len = length_len(*len);
|
||||
len_len = der_length_len(*len);
|
||||
|
||||
*total_len = 1 + len_len + *len;
|
||||
}
|
||||
@@ -82,7 +82,7 @@ _gssapi_make_mech_header(void *ptr,
|
||||
size_t len_len, foo;
|
||||
|
||||
*p++ = 0x60;
|
||||
len_len = length_len(len);
|
||||
len_len = der_length_len(len);
|
||||
e = der_put_length (p + len_len - 1, len_len, len, &foo);
|
||||
if(e || foo != len_len)
|
||||
abort ();
|
||||
|
@@ -52,7 +52,7 @@ oid_prefix_equal(gss_OID oid_enc, gss_OID prefix_enc, unsigned *suffix)
|
||||
ret = der_get_oid(prefix_enc->elements, prefix_enc->length,
|
||||
&prefix, NULL);
|
||||
if (ret) {
|
||||
free_oid(&oid);
|
||||
der_free_oid(&oid);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -61,12 +61,12 @@ oid_prefix_equal(gss_OID oid_enc, gss_OID prefix_enc, unsigned *suffix)
|
||||
if (oid.length - 1 == prefix.length) {
|
||||
*suffix = oid.components[oid.length - 1];
|
||||
oid.length--;
|
||||
ret = (heim_oid_cmp(&oid, &prefix) == 0);
|
||||
ret = (der_heim_oid_cmp(&oid, &prefix) == 0);
|
||||
oid.length++;
|
||||
}
|
||||
|
||||
free_oid(&oid);
|
||||
free_oid(&prefix);
|
||||
der_free_oid(&oid);
|
||||
der_free_oid(&prefix);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
Reference in New Issue
Block a user