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

Remove local error label and have just one exit label, set error

Browse Source 
strings properly.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17932 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-08-24 11:27:42 +00:00
parent 3c804cfd89
commit 821b7e5e20
1 changed files with 101 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
kdc/digest.c
View File

@@ -206,8 +206,11 @@ _kdc_do_digest(krb5_context context,
r.element = choice_DigestRepInner_initReply; r.element = choice_DigestRepInner_initReply;
hex_encode(server_nonce, sizeof(server_nonce), &r.u.initReply.nonce); hex_encode(server_nonce, sizeof(server_nonce), &r.u.initReply.nonce);
if (r.u.initReply.nonce == NULL) if (r.u.initReply.nonce == NULL) {
goto error; krb5_set_error_string(context, "Failed to decode server nonce");
ret = ENOMEM;
goto out;
}
sp = krb5_storage_emem(); sp = krb5_storage_emem();
if (sp == NULL) { if (sp == NULL) {
@@ -227,8 +230,12 @@ _kdc_do_digest(krb5_context context,
asprintf(&s, "%s-%s:%s", r.u.initReply.nonce, asprintf(&s, "%s-%s:%s", r.u.initReply.nonce,
ireq.u.init.channel->cb_type, ireq.u.init.channel->cb_type,
ireq.u.init.channel->cb_binding); ireq.u.init.channel->cb_binding);
if (s == NULL) if (s == NULL) {
goto error; krb5_set_error_string(context, "Failed to allocate "
"channel binding");
ret = ENOMEM;
goto out;
}
free(r.u.initReply.nonce); free(r.u.initReply.nonce);
r.u.initReply.nonce = s; r.u.initReply.nonce = s;
} }
@@ -242,12 +249,18 @@ _kdc_do_digest(krb5_context context,
if (strcasecmp(ireq.u.init.type, "CHAP") == 0) { if (strcasecmp(ireq.u.init.type, "CHAP") == 0) {
r.u.initReply.identifier = r.u.initReply.identifier =
malloc(sizeof(*r.u.initReply.identifier)); malloc(sizeof(*r.u.initReply.identifier));
if (r.u.initReply.identifier == NULL) if (r.u.initReply.identifier == NULL) {
goto error; krb5_set_error_string(context, "out of memory");
ret = ENOMEM;
goto out;
}
asprintf(r.u.initReply.identifier, "%02X", identifier & 0xff); asprintf(r.u.initReply.identifier, "%02X", identifier & 0xff);
if (*r.u.initReply.identifier == NULL) if (*r.u.initReply.identifier == NULL) {
goto error; krb5_set_error_string(context, "out of memory");
ret = ENOMEM;
goto out;
}
ret = krb5_store_stringz(sp, *r.u.initReply.identifier); ret = krb5_store_stringz(sp, *r.u.initReply.identifier);
if (ret) { if (ret) {
@@ -309,7 +322,7 @@ _kdc_do_digest(krb5_context context,
goto out; goto out;
} }
if (size != buf.length) if (size != buf.length)
krb5_abortx(context, "asn1 internal error"); krb5_abortx(context, "ASN1 internal error");
hex_encode(buf.data, buf.length, &r.u.initReply.opaque); hex_encode(buf.data, buf.length, &r.u.initReply.opaque);
if (r.u.initReply.opaque == NULL) { if (r.u.initReply.opaque == NULL) {
@@ -350,44 +363,56 @@ _kdc_do_digest(krb5_context context,
buf.length = strlen(ireq.u.digestRequest.opaque); buf.length = strlen(ireq.u.digestRequest.opaque);
buf.data = malloc(buf.length); buf.data = malloc(buf.length);
if (buf.data == NULL) if (buf.data == NULL) {
goto error; krb5_set_error_string(context, "out of memory");
ret = ENOMEM;
goto out;
}
ret = hex_decode(ireq.u.digestRequest.opaque, buf.data, buf.length); ret = hex_decode(ireq.u.digestRequest.opaque, buf.data, buf.length);
if (ret <= 0) if (ret <= 0) {
goto error; krb5_set_error_string(context, "Failed to decode opaque");
ret = ENOMEM;
goto out;
}
buf.length = ret; buf.length = ret;
ret = decode_Checksum(buf.data, buf.length, &res, NULL); ret = decode_Checksum(buf.data, buf.length, &res, NULL);
free(buf.data); free(buf.data);
if (ret) if (ret) {
goto error; krb5_set_error_string(context, "Failed to decode digest Checksum");
goto out;
}
ret = krb5_storage_to_data(sp, &buf); ret = krb5_storage_to_data(sp, &buf);
if (ret) if (ret) {
goto error; krb5_clear_error_string(context);
goto out;
}
serverNonce.length = strlen(ireq.u.digestRequest.serverNonce); serverNonce.length = strlen(ireq.u.digestRequest.serverNonce);
serverNonce.data = malloc(serverNonce.length); serverNonce.data = malloc(serverNonce.length);
if (serverNonce.data == NULL) if (serverNonce.data == NULL) {
goto error; krb5_set_error_string(context, "out of memory");
ret = ENOMEM;
goto out;
}
/* /*
* CHAP does the checksum of the raw nonce, HTTP/SASL uses the * CHAP does the checksum of the raw nonce, but do it for all
* HEX encoded nonce. This works just fine since CHAP doesn't * types, since we need to check the timestamp.
* use channel-bindings.
*/ */
if (strcasecmp(ireq.u.digestRequest.type, "CHAP") == 0) { {
ssize_t ssize; ssize_t ssize;
ssize = hex_decode(ireq.u.digestRequest.serverNonce, ssize = hex_decode(ireq.u.digestRequest.serverNonce,
serverNonce.data, serverNonce.length); serverNonce.data, serverNonce.length);
if (ssize <= 0) if (ssize <= 0) {
goto error; krb5_set_error_string(context, "Failed to decode serverNonce");
ret = ENOMEM;
goto out;
}
serverNonce.length = ssize; serverNonce.length = ssize;
} else {
memcpy(serverNonce.data, ireq.u.digestRequest.serverNonce,
serverNonce.length);
} }
{ {
@@ -413,21 +438,25 @@ _kdc_do_digest(krb5_context context,
krb5_crypto_destroy(context, crypto); krb5_crypto_destroy(context, crypto);
crypto = NULL; crypto = NULL;
if (ret) if (ret)
goto error; goto out;
kdc_log(context, config, 0, "checksum verified ok!");
/* verify time */ /* verify time */
{ {
unsigned char *p = serverNonce.data; unsigned char *p = serverNonce.data;
uint32_t t; uint32_t t;
if (serverNonce.length < 4) if (serverNonce.length < 4) {
goto error; krb5_set_error_string(context, "server nonce too short");
ret = EINVAL;
goto out;
}
t = p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24); t = p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24);
if (abs((kdc_time & 0xffffffff) - t) > context->max_skew) if (abs((kdc_time & 0xffffffff) - t) > context->max_skew) {
goto error; krb5_set_error_string(context, "time screw in server nonce ");
ret = EINVAL;
goto out;
}
} }
/* get username */ /* get username */
@@ -435,17 +464,22 @@ _kdc_do_digest(krb5_context context,
ireq.u.digestRequest.username, ireq.u.digestRequest.username,
&clientprincipal); &clientprincipal);
if (ret) if (ret)
goto error; goto out;
ret = _kdc_db_fetch(context, config, clientprincipal, ret = _kdc_db_fetch(context, config, clientprincipal,
HDB_F_GET_CLIENT, &db, &user); HDB_F_GET_CLIENT, &db, &user);
if (ret) if (ret)
goto error; goto out;
ret = hdb_entry_get_password(context, db, &user->entry, &password); ret = hdb_entry_get_password(context, db, &user->entry, &password);
if (ret && password == NULL) if (ret || password == NULL) {
goto error; if (ret == 0) {
ret = EINVAL;
krb5_set_error_string(context, "password missing");
}
goto out;
}
/* just support CHAP for now */ /* just support CHAP for now */
if (strcasecmp(ireq.u.digestRequest.type, "CHAP") == 0) { if (strcasecmp(ireq.u.digestRequest.type, "CHAP") == 0) {
@@ -453,14 +487,18 @@ _kdc_do_digest(krb5_context context,
char md[MD5_DIGEST_LENGTH]; char md[MD5_DIGEST_LENGTH];
char id; char id;
if (ireq.u.digestRequest.identifier == NULL) if (ireq.u.digestRequest.identifier == NULL) {
goto error; krb5_set_error_string(context, "Identifier missing "
"from CHAP request");
ret = EINVAL;
goto out;
}
if (strlen(*ireq.u.digestRequest.identifier) != 2) if (hex_decode(*ireq.u.digestRequest.identifier, &id, 1) != 1) {
goto error; krb5_set_error_string(context, "failed to decode identifier");
ret = EINVAL;
if (hex_decode(*ireq.u.digestRequest.identifier, &id, 1) != 1) goto out;
goto error; }
MD5_Init(&ctx); MD5_Init(&ctx);
MD5_Update(&ctx, &id, 1); MD5_Update(&ctx, &id, 1);
@@ -476,15 +514,27 @@ _kdc_do_digest(krb5_context context,
goto out; goto out;
} }
} else { } else {
goto error; r.element = choice_DigestRepInner_error;
asprintf(&r.u.error.reason, "unsupported digest type %s",
ireq.u.digestRequest.type);
if (r.u.error.reason == NULL) {
krb5_set_error_string(context, "out of memory");
ret = ENOMEM;
goto out;
}
r.u.error.code = EINVAL;
} }
break; break;
} }
default: default:
error:
r.element = choice_DigestRepInner_error; r.element = choice_DigestRepInner_error;
r.u.error.reason = strdup("error"); r.u.error.reason = strdup("unknown operation");
if (r.u.error.reason == NULL) {
krb5_set_error_string(context, "out of memory");
ret = ENOMEM;
goto out;
}
r.u.error.code = EINVAL; r.u.error.code = EINVAL;
break; break;
} }
@@ -495,7 +545,7 @@ _kdc_do_digest(krb5_context context,
goto out; goto out;
} }
if (size != buf.length) if (size != buf.length)
krb5_abortx(context, "asn1 internal error"); krb5_abortx(context, "ASN1 internal error");
krb5_auth_con_addflags(context, ac, KRB5_AUTH_CONTEXT_USE_SUBKEY, NULL); krb5_auth_con_addflags(context, ac, KRB5_AUTH_CONTEXT_USE_SUBKEY, NULL);
@@ -526,7 +576,7 @@ _kdc_do_digest(krb5_context context,
goto out; goto out;
} }
if (size != reply->length) if (size != reply->length)
krb5_abortx(context, "asn1 internal error"); krb5_abortx(context, "ASN1 internal error");
out: out: