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:
Love Hörnquist Åstrand
2006-10-14 10:12:16 +00:00
parent 4903096d3f
commit 00c5c484a9
7 changed files with 14 additions and 14 deletions
+4 -4
View File
@@ -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;
}
+1 -1
View File
@@ -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;
+1 -1
View File
@@ -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;