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;
|
||||
}
|
||||
|
@@ -55,20 +55,20 @@ gss_decapsulate_token(gss_buffer_t input_token,
|
||||
ret = decode_GSSAPIContextToken(input_token->value, input_token->length,
|
||||
&ct, NULL);
|
||||
if (ret) {
|
||||
free_oid(&o);
|
||||
der_free_oid(&o);
|
||||
return GSS_S_FAILURE;
|
||||
}
|
||||
|
||||
if (heim_oid_cmp(&ct.thisMech, &o) == 0) {
|
||||
if (der_heim_oid_cmp(&ct.thisMech, &o) == 0) {
|
||||
status = GSS_S_COMPLETE;
|
||||
output_token->value = ct.innerContextToken.data;
|
||||
output_token->length = ct.innerContextToken.length;
|
||||
free_oid(&ct.thisMech);
|
||||
der_free_oid(&ct.thisMech);
|
||||
} else {
|
||||
free_GSSAPIContextToken(&ct);
|
||||
status = GSS_S_FAILURE;
|
||||
}
|
||||
free_oid(&o);
|
||||
der_free_oid(&o);
|
||||
|
||||
return status;
|
||||
}
|
||||
|
@@ -56,7 +56,7 @@ gss_encapsulate_token(gss_buffer_t input_token,
|
||||
ASN1_MALLOC_ENCODE(GSSAPIContextToken,
|
||||
output_token->value, output_token->length,
|
||||
&ct, &size, ret);
|
||||
free_oid(&ct.thisMech);
|
||||
der_free_oid(&ct.thisMech);
|
||||
if (ret) {
|
||||
output_token->length = 0;
|
||||
output_token->value = NULL;
|
||||
|
@@ -52,7 +52,7 @@ gss_oid_to_str(OM_uint32 *minor_status, gss_OID oid, gss_buffer_t oid_str)
|
||||
}
|
||||
|
||||
ret = der_print_heim_oid(&o, ' ', &p);
|
||||
free_oid(&o);
|
||||
der_free_oid(&o);
|
||||
if (ret) {
|
||||
*minor_status = ret;
|
||||
return GSS_S_FAILURE;
|
||||
|
@@ -255,7 +255,7 @@ spnego_initial
|
||||
ni.mechListMIC = NULL;
|
||||
|
||||
ni_len = length_NegTokenInit(&ni);
|
||||
buf_size = 1 + length_len(ni_len) + ni_len;
|
||||
buf_size = 1 + der_length_len(ni_len) + ni_len;
|
||||
|
||||
buf = malloc(buf_size);
|
||||
if (buf == NULL) {
|
||||
|
@@ -292,7 +292,7 @@ hdb_entry_get_password(krb5_context context, HDB *db,
|
||||
ext->data.u.password.password.length,
|
||||
&pw);
|
||||
} else {
|
||||
ret = copy_octet_string(&ext->data.u.password.password, &pw);
|
||||
ret = der_copy_octet_string(&ext->data.u.password.password, &pw);
|
||||
}
|
||||
if (ret) {
|
||||
krb5_clear_error_string(context);
|
||||
|
Reference in New Issue
Block a user