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

switch to krb5_clear_error_message

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23914 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-10-14 02:56:17 +00:00
parent cdc2b37670
commit dd22b9cdde
3 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
kdc/digest.c
View File

@@ -288,7 +288,7 @@ _kdc_do_digest(krb5_context context,
krb5_free_principal(context, principal); krb5_free_principal(context, principal);
goto out; goto out;
} }
krb5_clear_error_string(context); krb5_clear_error_message(context);
ret = _kdc_db_fetch(context, config, principal, ret = _kdc_db_fetch(context, config, principal,
HDB_F_GET_SERVER, NULL, &server); HDB_F_GET_SERVER, NULL, &server);
@@ -399,7 +399,7 @@ _kdc_do_digest(krb5_context context,
} }
ret = krb5_store_stringz(sp, ireq.u.init.type); ret = krb5_store_stringz(sp, ireq.u.init.type);
if (ret) { if (ret) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
goto out; goto out;
} }
@@ -421,7 +421,7 @@ _kdc_do_digest(krb5_context context,
ret = krb5_store_stringz(sp, r.u.initReply.nonce); ret = krb5_store_stringz(sp, r.u.initReply.nonce);
if (ret) { if (ret) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
goto out; goto out;
} }
@@ -447,14 +447,14 @@ _kdc_do_digest(krb5_context context,
if (ireq.u.init.hostname) { if (ireq.u.init.hostname) {
ret = krb5_store_stringz(sp, *ireq.u.init.hostname); ret = krb5_store_stringz(sp, *ireq.u.init.hostname);
if (ret) { if (ret) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
goto out; goto out;
} }
} }
ret = krb5_storage_to_data(sp, &buf); ret = krb5_storage_to_data(sp, &buf);
if (ret) { if (ret) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
goto out; goto out;
} }
@@ -488,7 +488,7 @@ _kdc_do_digest(krb5_context context,
hex_encode(buf.data, buf.length, &r.u.initReply.opaque); hex_encode(buf.data, buf.length, &r.u.initReply.opaque);
free(buf.data); free(buf.data);
if (r.u.initReply.opaque == NULL) { if (r.u.initReply.opaque == NULL) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
ret = ENOMEM; ret = ENOMEM;
goto out; goto out;
} }
@@ -507,7 +507,7 @@ _kdc_do_digest(krb5_context context,
} }
ret = krb5_store_stringz(sp, ireq.u.digestRequest.type); ret = krb5_store_stringz(sp, ireq.u.digestRequest.type);
if (ret) { if (ret) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
goto out; goto out;
} }
@@ -516,7 +516,7 @@ _kdc_do_digest(krb5_context context,
if (ireq.u.digestRequest.hostname) { if (ireq.u.digestRequest.hostname) {
ret = krb5_store_stringz(sp, *ireq.u.digestRequest.hostname); ret = krb5_store_stringz(sp, *ireq.u.digestRequest.hostname);
if (ret) { if (ret) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
goto out; goto out;
} }
} }
@@ -546,7 +546,7 @@ _kdc_do_digest(krb5_context context,
ret = krb5_storage_to_data(sp, &buf); ret = krb5_storage_to_data(sp, &buf);
if (ret) { if (ret) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
goto out; goto out;
} }
@@ -644,7 +644,7 @@ _kdc_do_digest(krb5_context context,
hex_encode(md, sizeof(md), &mdx); hex_encode(md, sizeof(md), &mdx);
if (mdx == NULL) { if (mdx == NULL) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
ret = ENOMEM; ret = ENOMEM;
goto out; goto out;
} }
@@ -763,7 +763,7 @@ _kdc_do_digest(krb5_context context,
hex_encode(md, sizeof(md), &mdx); hex_encode(md, sizeof(md), &mdx);
if (mdx == NULL) { if (mdx == NULL) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
ret = ENOMEM; ret = ENOMEM;
goto out; goto out;
} }
@@ -879,7 +879,7 @@ _kdc_do_digest(krb5_context context,
hex_encode(answer.data, answer.length, &mdx); hex_encode(answer.data, answer.length, &mdx);
if (mdx == NULL) { if (mdx == NULL) {
free(answer.data); free(answer.data);
krb5_clear_error_string(context); krb5_clear_error_message(context);
ret = ENOMEM; ret = ENOMEM;
goto out; goto out;
} }
@@ -925,7 +925,7 @@ _kdc_do_digest(krb5_context context,
r.u.response.rsp = calloc(1, sizeof(*r.u.response.rsp)); r.u.response.rsp = calloc(1, sizeof(*r.u.response.rsp));
if (r.u.response.rsp == NULL) { if (r.u.response.rsp == NULL) {
free(answer.data); free(answer.data);
krb5_clear_error_string(context); krb5_clear_error_message(context);
ret = ENOMEM; ret = ENOMEM;
goto out; goto out;
} }
@@ -933,7 +933,7 @@ _kdc_do_digest(krb5_context context,
hex_encode(md, sizeof(md), r.u.response.rsp); hex_encode(md, sizeof(md), r.u.response.rsp);
if (r.u.response.rsp == NULL) { if (r.u.response.rsp == NULL) {
free(answer.data); free(answer.data);
krb5_clear_error_string(context); krb5_clear_error_message(context);
ret = ENOMEM; ret = ENOMEM;
goto out; goto out;
} }
@@ -950,14 +950,14 @@ _kdc_do_digest(krb5_context context,
r.u.response.session_key = r.u.response.session_key =
calloc(1, sizeof(*r.u.response.session_key)); calloc(1, sizeof(*r.u.response.session_key));
if (r.u.response.session_key == NULL) { if (r.u.response.session_key == NULL) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
ret = ENOMEM; ret = ENOMEM;
goto out; goto out;
} }
ret = krb5_data_copy(r.u.response.session_key, md, 16); ret = krb5_data_copy(r.u.response.session_key, md, 16);
if (ret) { if (ret) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
goto out; goto out;
} }
} }
@@ -1076,13 +1076,13 @@ _kdc_do_digest(krb5_context context,
} }
ret = krb5_store_uint32(sp, r.u.ntlmInitReply.flags); ret = krb5_store_uint32(sp, r.u.ntlmInitReply.flags);
if (ret) { if (ret) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
goto out; goto out;
} }
ret = krb5_storage_to_data(sp, &buf); ret = krb5_storage_to_data(sp, &buf);
if (ret) { if (ret) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
goto out; goto out;
} }
@@ -1364,7 +1364,7 @@ _kdc_do_digest(krb5_context context,
s = krb5_get_error_message(context, ret); s = krb5_get_error_message(context, ret);
if (s == NULL) { if (s == NULL) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
goto out; goto out;
} }

4
kdc/krb5tgs.c
View File

@@ -501,7 +501,7 @@ check_constrained_delegation(krb5_context context,
ret = hdb_entry_get_ConstrainedDelegACL(&client->entry, &acl); ret = hdb_entry_get_ConstrainedDelegACL(&client->entry, &acl);
if (ret) { if (ret) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
return ret; return ret;
} }
@@ -1578,7 +1578,7 @@ server_lookup:
if(i == b->etype.len) { if(i == b->etype.len) {
kdc_log(context, config, 0, kdc_log(context, config, 0,
"Addition ticket have not matching etypes", spp); "Addition ticket have not matching etypes", spp);
krb5_clear_error_string(context); krb5_clear_error_message(context);
return KRB5KDC_ERR_ETYPE_NOSUPP; return KRB5KDC_ERR_ETYPE_NOSUPP;
} }
etype = b->etype.val[i]; etype = b->etype.val[i];

34
kdc/pkinit.c
View File

@@ -90,7 +90,7 @@ pk_check_pkauthenticator_win2k(krb5_context context,
/* XXX cusec */ /* XXX cusec */
if (a->ctime == 0 || abs(a->ctime - now) > context->max_skew) { if (a->ctime == 0 || abs(a->ctime - now) > context->max_skew) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
return KRB5KRB_AP_ERR_SKEW; return KRB5KRB_AP_ERR_SKEW;
} }
return 0; return 0;
@@ -112,13 +112,13 @@ pk_check_pkauthenticator(krb5_context context,
/* XXX cusec */ /* XXX cusec */
if (a->ctime == 0 || abs(a->ctime - now) > context->max_skew) { if (a->ctime == 0 || abs(a->ctime - now) > context->max_skew) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
return KRB5KRB_AP_ERR_SKEW; return KRB5KRB_AP_ERR_SKEW;
} }
ASN1_MALLOC_ENCODE(KDC_REQ_BODY, buf, buf_size, &req->req_body, &len, ret); ASN1_MALLOC_ENCODE(KDC_REQ_BODY, buf, buf_size, &req->req_body, &len, ret);
if (ret) { if (ret) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
return ret; return ret;
} }
if (buf_size != len) if (buf_size != len)
@@ -133,18 +133,18 @@ pk_check_pkauthenticator(krb5_context context,
&checksum); &checksum);
free(buf); free(buf);
if (ret) { if (ret) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
return ret; return ret;
} }
if (a->paChecksum == NULL) { if (a->paChecksum == NULL) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
ret = KRB5_KDC_ERR_PA_CHECKSUM_MUST_BE_INCLUDED; ret = KRB5_KDC_ERR_PA_CHECKSUM_MUST_BE_INCLUDED;
goto out; goto out;
} }
if (der_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_message(context);
ret = KRB5KRB_ERR_GENERIC; ret = KRB5KRB_ERR_GENERIC;
} }
@@ -327,7 +327,7 @@ get_dh_param(krb5_context context,
&glue, &glue,
&size); &size);
if (ret) { if (ret) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
return ret; return ret;
} }
@@ -371,7 +371,7 @@ _kdc_pk_rd_padata(krb5_context context,
if (!config->enable_pkinit) { if (!config->enable_pkinit) {
kdc_log(context, config, 0, "PK-INIT request but PK-INIT not enabled"); kdc_log(context, config, 0, "PK-INIT request but PK-INIT not enabled");
krb5_clear_error_string(context); krb5_clear_error_message(context);
return 0; return 0;
} }
@@ -379,7 +379,7 @@ _kdc_pk_rd_padata(krb5_context context,
client_params = calloc(1, sizeof(*client_params)); client_params = calloc(1, sizeof(*client_params));
if (client_params == NULL) { if (client_params == NULL) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
ret = ENOMEM; ret = ENOMEM;
goto out; goto out;
} }
@@ -492,7 +492,7 @@ _kdc_pk_rd_padata(krb5_context context,
} }
} else { } else {
krb5_clear_error_string(context); krb5_clear_error_message(context);
ret = KRB5KDC_ERR_PADATA_TYPE_NOSUPP; ret = KRB5KDC_ERR_PADATA_TYPE_NOSUPP;
goto out; goto out;
} }
@@ -659,7 +659,7 @@ BN_to_integer(krb5_context context, BIGNUM *bn, heim_integer *integer)
integer->length = BN_num_bytes(bn); integer->length = BN_num_bytes(bn);
integer->data = malloc(integer->length); integer->data = malloc(integer->length);
if (integer->data == NULL) { if (integer->data == NULL) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
return ENOMEM; return ENOMEM;
} }
BN_bn2bin(bn, integer->data); BN_bn2bin(bn, integer->data);
@@ -718,7 +718,7 @@ pk_mk_pa_reply_enckey(krb5_context context,
ret = copy_EncryptionKey(reply_key, &kp.replyKey); ret = copy_EncryptionKey(reply_key, &kp.replyKey);
if (ret) { if (ret) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
goto out; goto out;
} }
kp.nonce = client_params->nonce; kp.nonce = client_params->nonce;
@@ -734,13 +734,13 @@ pk_mk_pa_reply_enckey(krb5_context context,
ret = copy_EncryptionKey(reply_key, &kp.replyKey); ret = copy_EncryptionKey(reply_key, &kp.replyKey);
if (ret) { if (ret) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
goto out; goto out;
} }
ret = krb5_crypto_init(context, reply_key, 0, &ascrypto); ret = krb5_crypto_init(context, reply_key, 0, &ascrypto);
if (ret) { if (ret) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
goto out; goto out;
} }
@@ -748,13 +748,13 @@ pk_mk_pa_reply_enckey(krb5_context context,
req_buffer->data, req_buffer->length, req_buffer->data, req_buffer->length,
&kp.asChecksum); &kp.asChecksum);
if (ret) { if (ret) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
goto out; goto out;
} }
ret = krb5_crypto_destroy(context, ascrypto); ret = krb5_crypto_destroy(context, ascrypto);
if (ret) { if (ret) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
goto out; goto out;
} }
ASN1_MALLOC_ENCODE(ReplyKeyPack, buf.data, buf.length, &kp, &size,ret); ASN1_MALLOC_ENCODE(ReplyKeyPack, buf.data, buf.length, &kp, &size,ret);
@@ -971,7 +971,7 @@ _kdc_pk_mk_pa_reply(krb5_context context,
int i; int i;
if (!config->enable_pkinit) { if (!config->enable_pkinit) {
krb5_clear_error_string(context); krb5_clear_error_message(context);
return 0; return 0;
} }