Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: binary MIME-Version: 1.0 X-Mailer: MIME-tools 5.427 (Entity 5.427) From: ghudson@mit.edu Subject: git commit RT-Send-CC: X-RT-Original-Encoding: iso-8859-1 Content-Length: 1764 Improve extended gic option support The current extended gic option facility violates strict aliasing, is not nestable (gic_opt_to_opte cannot be used on an extended options structure casted back to krb5_get_init_creds_options), and requires callers to use error-prone conversion functions. Rewrite this code to use a new structure private to gic_opt.c, which contains a krb5_get_init_creds_opt structure as its first member. We can cast between the extended structure and its first element without violating strict aliasing (C99 6.7.2.1 paragraph 13 and the aggregate type clause of 6.5 paragraph 7). Define internal accessor functions for the extended option fields. Replace all uses of krb5_gic_opt_ext in callers with krb5_get_init_creds_opt and the new accessors. Bring krb5_get_init_creds_opt_set_pa back into gic_opt.c (reverting faa810c5b59fa33d9f7db837c5bb88df5436bb30) so that all of the code which accesses the extended options structure can be in one file. https://github.com/krb5/krb5/commit/c724843cb90cfed71d54eab94b68b0583c1d6dc5 Author: Greg Hudson Commit: c724843cb90cfed71d54eab94b68b0583c1d6dc5 Branch: master src/lib/krb5/krb/Makefile.in | 3 - src/lib/krb5/krb/deps | 11 - src/lib/krb5/krb/fast.c | 15 +- src/lib/krb5/krb/fast.h | 2 +- src/lib/krb5/krb/get_in_tkt.c | 102 ++++----- src/lib/krb5/krb/gic_opt.c | 439 +++++++++++++++++-------------------- src/lib/krb5/krb/gic_opt_set_pa.c | 99 --------- src/lib/krb5/krb/gic_pwd.c | 53 ++--- src/lib/krb5/krb/init_creds_ctx.h | 3 +- src/lib/krb5/krb/int-proto.h | 118 +++------- src/lib/krb5/krb/preauth2.c | 22 +- 11 files changed, 316 insertions(+), 551 deletions(-)