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

kdc: Fix warnings

Browse Source
This commit is contained in:
Nicolas Williams
2022-01-14 17:58:19 -06:00
parent 5a3706db5b
commit cf2bab411d
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kdc/connect.c
View File

@@ -1064,7 +1064,7 @@ reap_kid(krb5_context context, krb5_kdc_configuration *config,
pid_t *pids, int max_kids, int options) pid_t *pids, int max_kids, int options)
{ {
pid_t pid; pid_t pid;
char *what; char *what = "untracked";
int status; int status;
int i = 0; /* quiet warnings */ int i = 0; /* quiet warnings */
int ret = 0; int ret = 0;
@@ -1090,7 +1090,6 @@ reap_kid(krb5_context context, krb5_kdc_configuration *config,
if (i == max_kids) { if (i == max_kids) {
/* should not happen */ /* should not happen */
what = "untracked";
sev = "warning: "; sev = "warning: ";
level = 2; level = 2;
} }

4
kdc/digest.c
View File

@@ -1466,6 +1466,10 @@ _kdc_do_digest(krb5_context context,
ret = krb5_encrypt_EncryptedData(context, crypto, KRB5_KU_DIGEST_ENCRYPT, ret = krb5_encrypt_EncryptedData(context, crypto, KRB5_KU_DIGEST_ENCRYPT,
buf.data, buf.length, 0, buf.data, buf.length, 0,
&rep.innerRep); &rep.innerRep);
if (ret) {
krb5_prepend_error_message(context, ret, "Failed to encrypt digest: ");
goto out;
}
ASN1_MALLOC_ENCODE(DigestREP, reply->data, reply->length, &rep, &size, ret); ASN1_MALLOC_ENCODE(DigestREP, reply->data, reply->length, &rep, &size, ret);
if (ret) { if (ret) {

2
kdc/kdc-replay.c
View File

@@ -184,6 +184,8 @@ main(int argc, char **argv)
unsigned int tag2; unsigned int tag2;
ret = der_get_tag (r.data, r.length, ret = der_get_tag (r.data, r.length,
&cl, &ty, &tag2, NULL); &cl, &ty, &tag2, NULL);
if (ret)
krb5_err(context, 1, ret, "Could not decode replay data");
if (MAKE_TAG(cl, ty, 0) != clty) if (MAKE_TAG(cl, ty, 0) != clty)
krb5_errx(context, 1, "class|type mismatch: %d != %d", krb5_errx(context, 1, "class|type mismatch: %d != %d",
(int)MAKE_TAG(cl, ty, 0), (int)clty); (int)MAKE_TAG(cl, ty, 0), (int)clty);

2
kdc/pkinit.c
View File

@@ -231,8 +231,6 @@ generate_dh_keyblock(krb5_context context,
memmove(dh_gen_key + size, dh_gen_key, dh_gen_keylen); memmove(dh_gen_key + size, dh_gen_key, dh_gen_keylen);
memset(dh_gen_key, 0, size); memset(dh_gen_key, 0, size);
} }
ret = 0;
} else if (client_params->keyex == USE_ECDH) { } else if (client_params->keyex == USE_ECDH) {
if (client_params->u.ecdh.public_key == NULL) { if (client_params->u.ecdh.public_key == NULL) {
ret = KRB5KRB_ERR_GENERIC; ret = KRB5KRB_ERR_GENERIC;