oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Prefix der primitives with der_.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18460 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-10-14 10:16:45 +00:00
parent 00c5c484a9
commit 69883abf62
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kdc/krb5tgs.c
View File

@@ -96,7 +96,7 @@ find_KRB5SignedPath(krb5_context context,
} }
if (data) if (data)
ret = copy_octet_string(&child.val[0].ad_data, data); ret = der_copy_octet_string(&child.val[0].ad_data, data);
free_AuthorizationData(&child); free_AuthorizationData(&child);
return ret; return ret;
} }

14
kdc/pkinit.c
View File

@@ -156,7 +156,7 @@ pk_check_pkauthenticator(krb5_context context,
goto out; goto out;
} }
if (heim_octet_string_cmp(a->paChecksum, &checksum.checksum) != 0) { if (der_heim_octet_string_cmp(a->paChecksum, &checksum.checksum) != 0) {
krb5_clear_error_string(context); krb5_clear_error_string(context);
ret = KRB5KRB_ERR_GENERIC; ret = KRB5KRB_ERR_GENERIC;
} }
@@ -269,7 +269,7 @@ get_dh_param(krb5_context context,
memset(&dhparam, 0, sizeof(dhparam)); memset(&dhparam, 0, sizeof(dhparam));
if (heim_oid_cmp(&dh_key_info->algorithm.algorithm, oid_id_dhpublicnumber())) { if (der_heim_oid_cmp(&dh_key_info->algorithm.algorithm, oid_id_dhpublicnumber())) {
krb5_set_error_string(context, krb5_set_error_string(context,
"PKINIT invalid oid in clientPublicValue"); "PKINIT invalid oid in clientPublicValue");
return KRB5_BADMSGTYPE; return KRB5_BADMSGTYPE;
@@ -338,7 +338,7 @@ get_dh_param(krb5_context context,
client_params->dh_public_key = integer_to_BN(context, client_params->dh_public_key = integer_to_BN(context,
"subjectPublicKey", "subjectPublicKey",
&glue); &glue);
free_heim_integer(&glue); der_free_heim_integer(&glue);
if (client_params->dh_public_key == NULL) if (client_params->dh_public_key == NULL)
goto out; goto out;
} }
@@ -501,7 +501,7 @@ _kdc_pk_rd_padata(krb5_context context,
goto out; goto out;
} }
ret = heim_oid_cmp(&contentInfoOid, oid_id_pkcs7_signedData()); ret = der_heim_oid_cmp(&contentInfoOid, oid_id_pkcs7_signedData());
if (ret != 0) { if (ret != 0) {
krb5_set_error_string(context, "PK-AS-REQ-Win2k invalid content " krb5_set_error_string(context, "PK-AS-REQ-Win2k invalid content "
"type oid"); "type oid");
@@ -541,7 +541,7 @@ _kdc_pk_rd_padata(krb5_context context,
} }
/* Signature is correct, now verify the signed message */ /* Signature is correct, now verify the signed message */
if (heim_oid_cmp(&eContentType, pa_contentType)) { if (der_heim_oid_cmp(&eContentType, pa_contentType)) {
krb5_set_error_string(context, "got wrong oid for pkauthdata"); krb5_set_error_string(context, "got wrong oid for pkauthdata");
ret = KRB5_BADMSGTYPE; ret = KRB5_BADMSGTYPE;
goto out; goto out;
@@ -620,8 +620,8 @@ out:
if (signed_content.data) if (signed_content.data)
free(signed_content.data); free(signed_content.data);
krb5_data_free(&eContent); krb5_data_free(&eContent);
free_oid(&eContentType); der_free_oid(&eContentType);
free_oid(&contentInfoOid); der_free_oid(&contentInfoOid);
if (ret) if (ret)
_kdc_pk_free_client_param(context, client_params); _kdc_pk_free_client_param(context, client_params);
else else

2
lib/hdb/ext.c
View File

@@ -307,7 +307,7 @@ hdb_entry_get_password(krb5_context context, HDB *db,
*p = strdup(str); *p = strdup(str);
free_octet_string(&pw); der_free_octet_string(&pw);
if (*p == NULL) { if (*p == NULL) {
krb5_set_error_string(context, "malloc: out of memory"); krb5_set_error_string(context, "malloc: out of memory");
return ENOMEM; return ENOMEM;