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

krb5: Use iovec checksum in krb5_encrypt_iov_ivec

Browse Source 
Use the iovec checksum routines in krb5_encrypt_iov_ivec. This
still marshalls all of the iovecs together to perform the encryption
operation, but this change halves the amount of time spent on
data marshalling in this function.
This commit is contained in:
Simon Wilkinson
2018-05-14 14:25:44 +01:00
committed by Jeffrey Altman
parent c45c0d3c66
commit 62a8fc89bc
1 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
lib/krb5/crypto.c
View File

@@ -1667,32 +1667,39 @@ krb5_encrypt_iov_ivec(krb5_context context,
ret = iov_coalesce(context, &ivec_data, data, num_data, TRUE, &sign_data); ret = iov_coalesce(context, &ivec_data, data, num_data, TRUE, &sign_data);
if(ret) if(ret)
goto cleanup; goto cleanup;
ret = create_checksum(context,
et->keyed_checksum,
crypto,
INTEGRITY_USAGE(usage),
sign_data.data,
sign_data.length,
&cksum);
if(ret == 0 && cksum.checksum.length != trailersz) {
free_Checksum (&cksum);
krb5_clear_error_message (context);
ret = KRB5_CRYPTO_INTERNAL;
}
if (ret)
goto cleanup;
/* save cksum at end */
memcpy(tiv->data.data, cksum.checksum.data, cksum.checksum.length);
free_Checksum (&cksum);
} else { } else {
ret = iov_coalesce(context, NULL, data, num_data, TRUE, &sign_data); cksum.checksum = tiv->data;
if(ret) ret = create_checksum_iov(context,
goto cleanup; et->keyed_checksum,
} crypto,
INTEGRITY_USAGE(usage),
data,
num_data,
&cksum);
if (ret)
goto cleanup;
ret = create_checksum(context,
et->keyed_checksum,
crypto,
INTEGRITY_USAGE(usage),
sign_data.data,
sign_data.length,
&cksum);
if(ret == 0 && cksum.checksum.length != trailersz) {
free_Checksum (&cksum);
krb5_clear_error_message (context);
ret = KRB5_CRYPTO_INTERNAL;
}
if(ret)
goto cleanup;
/* save cksum at end */
memcpy(tiv->data.data, cksum.checksum.data, cksum.checksum.length);
free_Checksum (&cksum);
if (!(et->flags & F_ENC_THEN_CKSUM)) {
ret = iov_coalesce(context, NULL, data, num_data, FALSE, &enc_data); ret = iov_coalesce(context, NULL, data, num_data, FALSE, &enc_data);
if(ret) if(ret)
goto cleanup; goto cleanup;