sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

lib/krb5_wrap: prefer new enctyptes in ms_suptypes_to_ietf_enctypes()

Browse Source 
This is currently not critical as we only use keytabs
only as acceptor, but in future we'll also use them
for kinit() and there we should prefer the newest type.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Stefan Metzmacher 2019-11-29 13:47:16 +01:00
parent fd2ca9d26d
commit 0be5505942
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/krb5_wrap/enctype_convert.c
View File

@ -83,13 +83,17 @@ krb5_error_code ms_suptypes_to_ietf_enctypes(TALLOC_CTX *mem_ctx,
uint32_t enctype_bitmap, uint32_t enctype_bitmap,
krb5_enctype **enctypes) krb5_enctype **enctypes)
{ {
unsigned int i, j = 0; size_t max_bits = 8 * sizeof(enctype_bitmap);
size_t j = 0;
ssize_t i;
*enctypes = talloc_zero_array(mem_ctx, krb5_enctype, *enctypes = talloc_zero_array(mem_ctx, krb5_enctype,
(8 * sizeof(enctype_bitmap)) + 1); max_bits + 1);
if (!*enctypes) { if (!*enctypes) {
return ENOMEM; return ENOMEM;
} }
for (i = 0; i < (8 * sizeof(enctype_bitmap)); i++) {
for (i = max_bits - 1; i >= 0; i--) {
uint32_t bit_value = (1U << i) & enctype_bitmap; uint32_t bit_value = (1U << i) & enctype_bitmap;
if (bit_value & enctype_bitmap) { if (bit_value & enctype_bitmap) {
(*enctypes)[j] = ms_suptype_to_ietf_enctype(bit_value); (*enctypes)[j] = ms_suptype_to_ietf_enctype(bit_value);