Ken Raeburn [Sun, 24 May 2009 19:58:47 +0000 (19:58 +0000)]
If --enable-pkinit is explicitly given, and OpenSSL is too old, error out instead of
ignoring the option and disabling pkinit.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22370
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Sun, 24 May 2009 15:53:51 +0000 (15:53 +0000)]
Fix vector initialization error in KDC preauth code
In the KDC, get_preauth_hint_list had two bugs initializing the
preauth array. It was allocating 21 extra entries instead of two due
to a typo (harmless), and it was only zeroing up through one extra
entry (harmful). Adjust the code to use calloc to avoid further
disagreements of this nature.
ticket: 6496
target_version: 1.7
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22369
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Sun, 24 May 2009 00:48:31 +0000 (00:48 +0000)]
Fix test rules for non-gmake make versions
The build rules for the new t_ad_fx_armor and t_authdata test programs
used $<, which is only portable for implicit rules (but is valid in
gmake for all rules). Stop using $< in those rules so that "make
check" works with System V make.
ticket: 6495
target_version: 1.7
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22368
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Sat, 23 May 2009 00:09:58 +0000 (00:09 +0000)]
In krb5_ktfileint_write_entry, add a no-op fseek in between reading
EOF and writing the placeholder length field. Otherwise we can run
into an apparent bug in the Solaris 10 stdio library which causes the
next no-op fseek after the fwrite to fail with EINVAL.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22367
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Fri, 22 May 2009 17:31:09 +0000 (17:31 +0000)]
whitespace
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22366
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Fri, 22 May 2009 17:22:07 +0000 (17:22 +0000)]
Make Sun cc error out on unknown attributes
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22365
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Fri, 22 May 2009 17:20:15 +0000 (17:20 +0000)]
Use correct type for krb5_c_prf_length length arg
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22364
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Fri, 22 May 2009 17:19:37 +0000 (17:19 +0000)]
Use printf format attribute only with gcc
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22363
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Fri, 22 May 2009 14:31:28 +0000 (14:31 +0000)]
make prompt string vars point to const
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22362
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Fri, 22 May 2009 14:12:17 +0000 (14:12 +0000)]
fix minor syntax error
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22361
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 22 May 2009 14:08:25 +0000 (14:08 +0000)]
Remove spurious assertion in handle_authdata
In handle_authdata in the KDC, remove a spurious assertion (added in
r21566 on the mskrb-integ branch) that authdata starts out empty.
authdata can be legitimately added by check_padata, which precedes
handle_authdata, and this happens with pkinit.
ticket: 6492
tags: pullup
target_version: 1.7
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22360
dc483132-0cff-0310-8789-
dd5450dbe970
Sam Hartman [Wed, 20 May 2009 18:06:29 +0000 (18:06 +0000)]
Include regression test for krb-fx-cf2 for RC4 enctype
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22359
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Wed, 20 May 2009 17:44:37 +0000 (17:44 +0000)]
Add a comment to the r22168 change since it's not obvious why we're
decrypting authdata that way.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22358
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Wed, 20 May 2009 02:05:53 +0000 (02:05 +0000)]
Restore compatibility with KDCs using key usage 8 to encrypt TGS
replies in a subkey, by implementing a fallback in
krb5_arcfour_decrypt.
ticket: 6490
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22357
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 19 May 2009 23:17:49 +0000 (23:17 +0000)]
When using keyed checksum types with TGS subkeys, Microsoft AD 2003
verifies the checksum using the subkey, whereas MIT and Heimdal verify
it using the TGS session key. (RFC 4120 is actually silent on which
is correct; RFC 4757 specifies the TGS session key.) To sidestep this
interop issue, don't use keyed checksum types with RC4 keys without
explicit configuration in krb5.conf. Using keyed checksum types with
AES is fine since, experimentally, AD 2008 accepts checksums keyed
with the TGS session key.
ticket: 6490
status: open
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22356
dc483132-0cff-0310-8789-
dd5450dbe970
Sam Hartman [Mon, 18 May 2009 23:28:53 +0000 (23:28 +0000)]
In practice, key usage 9 requires no translation
ticket: 6490
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22355
dc483132-0cff-0310-8789-
dd5450dbe970
Sam Hartman [Mon, 18 May 2009 19:08:48 +0000 (19:08 +0000)]
Copy the sequence key rather than the subkey for lucid contexts in RFC
1964 mode, so that we map to raw des enctypes rather than say
des-cbc-crc.
ticket: 6488
target_version: 1.7
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22354
dc483132-0cff-0310-8789-
dd5450dbe970
Sam Hartman [Mon, 18 May 2009 19:08:29 +0000 (19:08 +0000)]
Document use of key fields in GSS context
The addition of etype negotiation has made the meanings of the various
keys in the GSS-API context structure more complicated. Document them
to aid in code understanding.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22353
dc483132-0cff-0310-8789-
dd5450dbe970
Tom Yu [Thu, 14 May 2009 21:04:57 +0000 (21:04 +0000)]
Add IOV_SHIM_EXERCISE_WRAP and IOV_SHIM_EXERCISE_UNWRAP conditionals
to allow finer-grained testing.
ticket: 6487
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22352
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 14 May 2009 16:50:52 +0000 (16:50 +0000)]
gss_krb5int_export_lucid_sec_context was erroneously copying the first
sizeof(void *) bytes of the context into data_set, instead of the
pointer to the context.
ticket: 6488
status: open
tags: pullup
target_version: 1.7
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22351
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 14 May 2009 16:16:32 +0000 (16:16 +0000)]
UCS2 support doesn't handle upper half of BMP
Make krb5_ucs2 an unsigned type. Eliminate the need for distinguished
values for ucs2 and ucs4 characters by changing the API of the single-
character conversion routines.
ticket: 6489
tags: pullup
target_version: 1.7
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22350
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Thu, 14 May 2009 01:18:43 +0000 (01:18 +0000)]
remove some old code for debugging the debugging code
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22349
dc483132-0cff-0310-8789-
dd5450dbe970
Tom Yu [Wed, 13 May 2009 20:41:37 +0000 (20:41 +0000)]
In util/support/utf8_conv.c, the SWAP16 macro is invoked with an
argument that has side effects. On platforms where SWAP16 can
evaluate its argument twice (including platforms where utf8_conv.c
creates a fallback definition for the SWAP16 macro), this can cause a
read overrun by a factor of two.
Rearrange the data flow to avoid calling SWAP16 with an argument that
has side effects.
ticket: 6486
tags: pullup
target_version: 1.7
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22348
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Mon, 11 May 2009 23:34:56 +0000 (23:34 +0000)]
reduce character-class table entry size (40%) based on limited data ranges; make table const
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22344
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 11 May 2009 22:46:56 +0000 (22:46 +0000)]
In recvauth_common, convert a use of strcpy to strdup
ticket: 6200
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22343
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 11 May 2009 16:57:45 +0000 (16:57 +0000)]
Refactor rule_an_to_ln, creating a new helper function to handle the
selection string specifier. Eliminate two (safe) uses of sscanf in
the process. Add a test case including literal text in the selection
string specifier.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22326
dc483132-0cff-0310-8789-
dd5450dbe970
Sam Hartman [Thu, 7 May 2009 20:35:28 +0000 (20:35 +0000)]
Try decrypting using session key if subkey fails in tgs rep handling
Heimdal at least up through 1.2 incorrectly encrypts the TGS response
in the session key not the subkey when a subkey is supplied. See RFC
4120 page 35. Work around this by trying decryption using the session
key after the subkey fails.
* decode_kdc_rep.c: rename to krb5int_decode_tgs_rep; only used for
TGS and now needs to take keyusage
* gc_via_tkt: pass in session key and appropriate usage if subkey
fails.
Note that the dead code to process AS responses in decode_kdc_rep is
not removed by this commit. That will be removed as FAST TGS client
support is integrated post 1.7.
ticket: 6484
Tags: pullup
Target_Version: 1.7
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22325
dc483132-0cff-0310-8789-
dd5450dbe970
Sam Hartman [Thu, 7 May 2009 20:35:19 +0000 (20:35 +0000)]
man1 in title header for man1 manpages
A previous ticket moved kadmin, kadmin.local, ktutil and k5srvutil man
pages to man1 from man8. This updates the section within the man
page.
ticket: 6483
Target_Version: 1.7
Tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22324
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 7 May 2009 19:51:46 +0000 (19:51 +0000)]
Allow more than 10 past keys to be stored by a policy
Remove the arbitrary limit of 10 past keys in policies. We were not
taking advantage of that limit in any other code.
ticket: 6482
target_version: 1.7
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22323
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 7 May 2009 19:42:57 +0000 (19:42 +0000)]
After consultation with kenh, remove a comment and if statement which
should no longer apply to the pa_sam_2 code, fixing a memory leak.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22322
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Wed, 6 May 2009 18:54:47 +0000 (18:54 +0000)]
Fix yet another memory leak in pa_sam
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22321
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Wed, 6 May 2009 18:53:03 +0000 (18:53 +0000)]
Fix multiple memory leaks in obtain_sam_padata
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22320
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Wed, 6 May 2009 18:52:44 +0000 (18:52 +0000)]
In pa_sam, use the correct function to free sam_challenge in the
success path.
ticket: 6210
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22319
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Wed, 6 May 2009 15:56:21 +0000 (15:56 +0000)]
Fix a memory leak in pa_sam_2 where an outer data structure wasn't
freed after the contents are coopted.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22318
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 5 May 2009 17:11:48 +0000 (17:11 +0000)]
Fix a memory leak in pa_sam
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22317
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 5 May 2009 17:08:54 +0000 (17:08 +0000)]
Fix a memory leak in krb5_obtain_padata
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22316
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 5 May 2009 16:57:42 +0000 (16:57 +0000)]
In pa_sam_2, free sc2 in an error-handling case where it was leaked
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22315
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 5 May 2009 16:55:58 +0000 (16:55 +0000)]
In pa_sam_2, free scratch in a couple of error-handling blocks where
it was live and not freed. The function should be reorganized to use
a cleanup handler, but (I believe) is not covered by the test suite
and should not undergo such major surgery until it is.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22314
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 5 May 2009 16:46:29 +0000 (16:46 +0000)]
In krb5int_rd_setpw_rep, if we get an error result, set ap_rep.length
to 0 so that it is initialized for a check later in the function.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22313
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 5 May 2009 16:39:54 +0000 (16:39 +0000)]
Remove some unnecessary null checks in krb5_get_in_tkt_with_password
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22312
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 5 May 2009 16:35:31 +0000 (16:35 +0000)]
Remove some unnecessary null checks in krb5_get_in_tkt_with_keytab
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22311
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 5 May 2009 16:30:19 +0000 (16:30 +0000)]
In krb5_get_in_tkt, free the whole encoded request (since the
structure was allocated by encode_krb5_as_req), not just the contents.
ticket: 6401
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22310
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 5 May 2009 16:00:40 +0000 (16:00 +0000)]
Fix a case in the krb5_rd_rep error handler (introduced in the last
commit) where scratch.data could be indirected through even if it
wasn't allocated successfully.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22309
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 4 May 2009 19:43:36 +0000 (19:43 +0000)]
Simplify cleanup in obtain_sam_padata slightly
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22308
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 4 May 2009 17:16:38 +0000 (17:16 +0000)]
Fix an error message memory leak in krb5_preauth_supply_preauth_data
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22307
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 4 May 2009 17:06:43 +0000 (17:06 +0000)]
Fix some direct returns in krb5_get_cred_from_kdc_opt which would leak
memory.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22306
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 4 May 2009 16:08:03 +0000 (16:08 +0000)]
krb5_rd_rep could leak memory through its output parameter on error.
Adjust the flow control so that *repl is NULL on error and the memory
allocated by decode_krb5_ap_rep_enc_part is freed.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22305
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Sun, 3 May 2009 18:47:27 +0000 (18:47 +0000)]
Fix formatting of ok_as_delegate documentation in admin guide
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22304
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Sat, 2 May 2009 04:58:19 +0000 (04:58 +0000)]
Fix a memory leak in krb5int_rd_chpw_rep in a block of code handling
buggy MS KDC behavior. It's not entirely clear what should happen in
the case where memory was leaked (error packet received containing
e_data) so pick a conservative option.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22303
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 1 May 2009 20:19:43 +0000 (20:19 +0000)]
Fix a memory leak by reorganizing krb5_principal_internalize to use
the recommended flow control for error handling. Also initialize the
output parameter so that it is set in case of error.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22302
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 1 May 2009 20:11:01 +0000 (20:11 +0000)]
Check return value of ftell() in krb5_ktfileint_find_slot
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22301
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 1 May 2009 20:07:13 +0000 (20:07 +0000)]
Move an error check to an earlier location in krb5_524_conv_principal
to fix a memory leak.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22300
dc483132-0cff-0310-8789-
dd5450dbe970
Sam Hartman [Thu, 30 Apr 2009 20:48:36 +0000 (20:48 +0000)]
make depend
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22299
dc483132-0cff-0310-8789-
dd5450dbe970
Sam Hartman [Thu, 30 Apr 2009 20:17:42 +0000 (20:17 +0000)]
Implement DES and 3DES PRF. Patch fromKAMADA Ken'ichi
Currently the DES and 3DES PRF output 16-byte results. This is
consistent with RFC 3961, but we need to confirm it is consistent with
Heimdal and WG decisions. See IETF 74 minutes for some discussion of
the concern as it applies to AES and thus possibly all simplified
profile enctypes.
ticket: 5587
Tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22298
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 30 Apr 2009 17:49:28 +0000 (17:49 +0000)]
In krb5_kt_resolve, ensure that the output parameter is set to NULL on
failure even if the underlying resolver doesn't do that properly.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22297
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 30 Apr 2009 17:28:55 +0000 (17:28 +0000)]
In ktfile_common_resolve, set the output pointer to NULL on error, and
use a cleanup label instead of freeing the same resources in multiple
error handling blocks.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22296
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 30 Apr 2009 17:16:20 +0000 (17:16 +0000)]
Fix a memory leak by reorganizing krb5_ktf_keytab_internalize to use
the recommended exception-handling flow control. Eliminate the check
for ktdata being null after resolution because that's not possible.
Add a check for the resolved keytab being of a different type, since
that would result in data structure corruption.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22295
dc483132-0cff-0310-8789-
dd5450dbe970
Zhanna Tsitkov [Thu, 30 Apr 2009 16:27:08 +0000 (16:27 +0000)]
Uninitialized variable may cause unpredictable behavior in kdc_verify_preauth
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22294
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 30 Apr 2009 15:08:50 +0000 (15:08 +0000)]
Document ok_as_delegate in the admin guide
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22293
dc483132-0cff-0310-8789-
dd5450dbe970
Sam Hartman [Thu, 30 Apr 2009 00:38:48 +0000 (00:38 +0000)]
Do not return PREAUTH_FAILED on unknown preauth
If the KDC receives unknown pre-authentication data then ignore it.
Do not get into a case where PREAUTH_FAILED is returned because of
unknown pre-authentication. The main AS loop will cause
PREAUTH_REQUIRED to be returned if the preauth_required flag is set
and no valid preauth is found.
ticket: 6480
Target_Version: 1.7
Tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22292
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Wed, 29 Apr 2009 23:21:21 +0000 (23:21 +0000)]
Add DEBUG_ERROR_LOCATIONS support
If DEBUG_ERROR_LOCATIONS is defined, replace uses of
krb5_set_error_message and krb5int_set_error with calls to the new
_fl variants of those functions, and include filename and line number
information in the calls. Requires C99-style variadic macros if
defined.
ticket: 6479
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22291
dc483132-0cff-0310-8789-
dd5450dbe970
Tom Yu [Wed, 29 Apr 2009 00:31:50 +0000 (00:31 +0000)]
Fix typo in error message reported by Marek Mahut (Red Hat)
ticket: 6472
target_version: 1.7
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22290
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 28 Apr 2009 18:00:13 +0000 (18:00 +0000)]
Fix handling of RET_SEQUENCE flag in mk_priv/mk_ncred
Regularize the handling of KRB5_AUTH_CONTEXT_RET_SEQUENCE in
krb5_mk_safe, krb5_mk_priv, and krb5_mk_ncred, using krb5_mk_safe as
a baseline. RET_SEQUENCE now implies DO_SEQUENCE for all three
functions, the sequence number is always incremented if it is used,
and outdata->seq is always set if RET_SEQUENCE is passed.
Note that in the corresponding rd_ functions, RET_SEQUENCE and
DO_SEQUENCE are independent flags, which is not consistent with the
above. This compromise is intended to preserve compatibility with
any working code which might exist using the RET_SEQUENCE flag.
ticket: 6478
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22288
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 28 Apr 2009 17:54:13 +0000 (17:54 +0000)]
Fix typo
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22287
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 28 Apr 2009 15:45:31 +0000 (15:45 +0000)]
Fix a couple of memory leaks in krb5int_sendto, reworking the error
handling a bit for cleanliness in the process.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22286
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 28 Apr 2009 04:46:10 +0000 (04:46 +0000)]
Fix a memory leak in aname_replacer using the recommended flow control
for exception handling.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22285
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 28 Apr 2009 04:30:03 +0000 (04:30 +0000)]
Fix a memory leak in module_locate_server
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22284
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 27 Apr 2009 23:48:22 +0000 (23:48 +0000)]
Fix a few memory leaks in krb5_mk_ncred. Also tighten up the error
handling of the sequence number, only decreasing it if it was
increased. The handling of DO_SEQUENCE and RET_SEQUENCE may still be
flawed in some cases.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22283
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 27 Apr 2009 23:01:08 +0000 (23:01 +0000)]
Fix an unchecked use of fwrite in krb5_ktfileint_delete_entry
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22282
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 27 Apr 2009 15:42:23 +0000 (15:42 +0000)]
Move KRB5_KDB_OK_AS_DELEGATE from kdb_ext.h to kdb.h. Add kadmin
support for the flag. In the KDC, remove the restriction on returning
the flag on cross-realm TGTs since there is now a defined meaning for
that (it allows ok-as-delegate to be honored on the foreign realm's
service tickets).
ticket: 5596
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22281
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Sat, 25 Apr 2009 09:36:11 +0000 (09:36 +0000)]
make installed headers C++-safe
Now that we're installing the kadm5 headers, they should be C++-safe
like the others. Wrap the content in 'extern "C"' if compiling as
C++. New test program to verify.
ticket: 6477
target_version: 1.7
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22280
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 24 Apr 2009 21:15:04 +0000 (21:15 +0000)]
Simplify and shorten krb5_ktfileint_find_slot, and properly handle the
commit_point output parameter.
ticket: 6475
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22279
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 24 Apr 2009 19:49:54 +0000 (19:49 +0000)]
In krb5_ktfileint_find_slot, don't continue the loop when we find a
final zero-length buffer. This is a minimal fix intended to be pulled
up to the 1.7 branch; a code cleanup commit will follow.
ticket: 6475
status: open
tags: pullup
target_version: 1.7
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22278
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 23 Apr 2009 23:37:42 +0000 (23:37 +0000)]
In krb5_principal_compare_flags, improve clarity slightly by using a
boolean temporary instead of an ordering temporary in the loop over
the elements, since we only care about the boolean result.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22277
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 23 Apr 2009 15:15:22 +0000 (15:15 +0000)]
In krb5_rcache_externalize, remove a pointless null check of a pointer
we just dereferenced.
Rewrite krb5_rcache_internalize to use the recommended cleanup flow
control, closing a memory leak in the process.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22276
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 23 Apr 2009 14:55:42 +0000 (14:55 +0000)]
Close a memory leak in asn1_decode_etype_info2_entry_1_3
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22275
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 23 Apr 2009 14:52:25 +0000 (14:52 +0000)]
In krb5_fcc_read, remove an assert which could never trigger (because
len is unsigned and cannot be less than zero).
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22274
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 23 Apr 2009 14:50:06 +0000 (14:50 +0000)]
Fix an error-handling block in sendto_kdc.c's setup_connection() which
would always attempt to close -1.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22273
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 23 Apr 2009 08:42:40 +0000 (08:42 +0000)]
In krb5_get_cred_via_tkt, strip the ok-as-delegate flag from
credentials obtained using a foreign TGT, unless the TGT also has
ok-as-delegate set.
ticket: 6473
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22272
dc483132-0cff-0310-8789-
dd5450dbe970
Sam Hartman [Wed, 22 Apr 2009 13:30:00 +0000 (13:30 +0000)]
move kadmin, ktutil, k5srvutil man pages to man1
These binaries have been moved to /usr/bin so their manpages should
move from man8 to man1.
Ticket: 6474
Target_Version: 1.7
Tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22267
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Wed, 22 Apr 2009 08:26:17 +0000 (08:26 +0000)]
In the cross-realm setup example in the admin documentation, use
"addprinc" instead of "add_princ" since the latter is not a recognized
alias for add_principal.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22266
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 16 Apr 2009 16:46:33 +0000 (16:46 +0000)]
Send explicit salt for SALTTYPE_NORMAL keys
Change the signature of _make_etype_info_entry to take the canonical
client principal instead of the request structure. Also fixes the salt
we compute for SALTTYPE_NOREALM keys.
Sending an explicit salt for SALTTYPE_NORMAL keys is believed to be
necessary for some preauth scenarios involving aliases.
ticket: 6470
target_version: 1.7
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22264
dc483132-0cff-0310-8789-
dd5450dbe970
Sam Hartman [Tue, 14 Apr 2009 15:35:12 +0000 (15:35 +0000)]
Require fast_req checksum to be keyed
Since the fast_req checksum is unencrypted, a keyed checksum type needs to be used.
ticket: 6461
Target_Version: 1.7
Tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22210
dc483132-0cff-0310-8789-
dd5450dbe970
Sam Hartman [Tue, 14 Apr 2009 15:05:21 +0000 (15:05 +0000)]
Implement kinit option for FAST armor ccache
Implement the -T option to kinit to specify the FAST armor ccache.
ticket: 6460
Target_version: 1.7
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22209
dc483132-0cff-0310-8789-
dd5450dbe970
Will Fiveash [Mon, 13 Apr 2009 22:15:05 +0000 (22:15 +0000)]
Update kdb5_util man page with missing purge_mkeys command
While previously updating the kdb5_util command man page to include
documentation on new subcommands added as a result of the Master Key
Migration project I missed the purge_mkeys command. I've added that
with this commit.
Ticket: 6459
Version_Reported: 1.7
Target_Version: 1.7
Tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22208
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 13 Apr 2009 19:29:14 +0000 (19:29 +0000)]
krb5_fcc_generate_new was destroying a locked mutex in the err_out
label, which is used for I/O failures. Unlock the mutex first.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22200
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 13 Apr 2009 18:43:29 +0000 (18:43 +0000)]
In pa_sam, remove a gratuitous null check for etype which was
immediately followed by dereferencing etype.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22199
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 13 Apr 2009 18:36:42 +0000 (18:36 +0000)]
Make krb5_mkt_resolve error handling work
Very little is likely to go wrong inside krb5_mkt_resolve (it just
allocates memory and plays with mutexes), but if anything did, the
handling was almost always wrong. Reorganize the function to handle
errors properly, using a helper create_list_node function to simplify
the task.
ticket: 6454
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22198
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 13 Apr 2009 17:16:35 +0000 (17:16 +0000)]
In krb5int_dns_init, fix a malloc-returning-null check which could let
a null result slip past.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22197
dc483132-0cff-0310-8789-
dd5450dbe970
Ezra Peisach [Sun, 12 Apr 2009 15:40:41 +0000 (15:40 +0000)]
More dead code elimination. When asprintf was used the varaible namelen was
no longer necessary.
ticket: 6453
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22196
dc483132-0cff-0310-8789-
dd5450dbe970
Ezra Peisach [Sun, 12 Apr 2009 14:59:08 +0000 (14:59 +0000)]
remove dead code
Remove some more dead code assignment - where the variable is
immediately assigned in the next statement - or not used at all.
ticket: 6453
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22195
dc483132-0cff-0310-8789-
dd5450dbe970
Ezra Peisach [Sun, 12 Apr 2009 14:09:29 +0000 (14:09 +0000)]
Remove dead assignment of variables that are never used
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22194
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 10 Apr 2009 21:17:03 +0000 (21:17 +0000)]
In krb5_get_in_tkt, r7002 introduced an unused local variable
"padata". It was accidentally used in r18641 instead of
preauth_to_use when sorting the received padata sequence, causing the
sort to be a no-op. Sort the correct sequence and eliminate the
unused local variable.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22193
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 10 Apr 2009 20:17:38 +0000 (20:17 +0000)]
Simplify the coupling of problem to response code in recvauth_common,
eliminating a big switch statement with a dead-code default block.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22192
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 10 Apr 2009 19:54:35 +0000 (19:54 +0000)]
Remove an unnecessary cleanup in krb5_cc_set_default_name
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22191
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 10 Apr 2009 19:51:53 +0000 (19:51 +0000)]
Check the return value of krb5_timeofday in krb5int_populate_gic_opt.
Also initialize krb5int_populate_gic_opt's output variable.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22190
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 10 Apr 2009 19:50:55 +0000 (19:50 +0000)]
Check return value of krb5int_copy_data_contents in preauth2.c's
pa_salt.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22189
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 10 Apr 2009 16:09:19 +0000 (16:09 +0000)]
Document allow_weak_crypto
Also document which cryptosystems are defined to be weak, and add some
enctype entries which weren't in the documentation.
ticket: 6452
tags: pullup
target_version: 1.7
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22188
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 9 Apr 2009 17:57:03 +0000 (17:57 +0000)]
Update defaults in documentation
doc/definitions.texinfo had, predictably, fallen out of date with
respect to the code. Update a few of the out of date comments and
defaults, particularly the default enctype lists.
ticket: 6451
tags: pullup
target_version: 1.7
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22187
dc483132-0cff-0310-8789-
dd5450dbe970
Ezra Peisach [Thu, 9 Apr 2009 11:53:27 +0000 (11:53 +0000)]
kdc: handle_referral_params does not return ENOMEM errors
retval was set but never returned.
ticket: 6450
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22186
dc483132-0cff-0310-8789-
dd5450dbe970