Ken Raeburn [Fri, 21 Aug 2009 18:32:53 +0000 (18:32 +0000)]
Use load_32_be processing length in TCP reply
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22570
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Fri, 21 Aug 2009 18:32:50 +0000 (18:32 +0000)]
Change "vague-errors" compile-time conditionals into run-time
conditionals, based on a variable initialized based on the
compile-time conditional (but probably eventually set from the config
file or command line).
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22569
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Fri, 21 Aug 2009 18:32:46 +0000 (18:32 +0000)]
Use {load,store}_{16,32}_be for big-endian integers
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22568
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 18 Aug 2009 03:05:16 +0000 (03:05 +0000)]
Minor code cleanups in pkinit plugin, mostly around malloc/free
invocations. No functional changes.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22534
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 17 Aug 2009 20:07:21 +0000 (20:07 +0000)]
Bump sonames of libkadm5 libraries, since r22527 changed their ABIs
ticket: 6547
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22528
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 17 Aug 2009 19:40:48 +0000 (19:40 +0000)]
Modify kadm5 initializers to accept krb5 contexts
Add krb5_context parameters to all kadm5 initialization functions.
This allows extended error information to be retrieved by the caller
when an error is returned.
ticket: 6547
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22527
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 17 Aug 2009 14:39:44 +0000 (14:39 +0000)]
Remove unused variables resulting from r22521, and also remove the
unused file svr_misc_free.c.
ticket: 6544
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22523
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 14 Aug 2009 16:24:36 +0000 (16:24 +0000)]
In doc/Makefile, specify the new location of the kpasswd man page (the
old one was removed in r22521.
ticket: 6544
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22522
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 13 Aug 2009 21:25:54 +0000 (21:25 +0000)]
Remove kadmin v1 API support
The kadmin v1 API and the even older ovsec_kadm_* API were legacy when
kadmin was first incorporated in 1996, and compatibility with them is
no longer believed to be necessary.
The uninstalled kadmin/passwd has been removed (since it used the ovsec
API). The test suite has been updated to use the v2 API where
appropriate, and the parts specifically designed to test the old API
have been excised.
ticket: 6544
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22521
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 13 Aug 2009 18:48:46 +0000 (18:48 +0000)]
Fix lib/crypto/krb/dk/Makefile.in mydir value
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22520
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Wed, 12 Aug 2009 18:53:47 +0000 (18:53 +0000)]
Reply message ordering bug in ftpd
user() was replying to the user command and then calling login(),
which could send a continuation reply if it fails to chdir to the
user's homedir. Continuation replies must come before the actual
reply; the mis-ordering was causing ftp and ftpd to deadlock. To fix
the bug, invoke login() before reply() so that the continuation reply
comes first.
ticket: 6543
tags: pullup
target_version: 1.7
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22519
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Wed, 12 Aug 2009 17:58:24 +0000 (17:58 +0000)]
r22529@squish: raeburn | 2009-08-12 13:49:45 -0400
.
r22530@squish: raeburn | 2009-08-12 13:55:57 -0400
Change KRBCONF_KDC_MODIFIES_KDB to a mostly run-time option.
Change all code conditionals to test a new global variable, the
initial value of which is based on KRBCONF_KDC_MODIFIES_KDB. There is
currently no way to alter the value from the command line; that will
presumably be desired later.
Change initialize_realms to store db_args in a global variable. In
process_as_req, call db_open instead of the old set_name + init.
Don't reopen if an error is reported by krb5_db_fini.
Add a test of running kinit with an incorrect password, to trigger a
kdb update if enabled.
r22531@squish: raeburn | 2009-08-12 13:58:13 -0400
Fix trailing whitespace.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22518
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 10 Aug 2009 19:35:34 +0000 (19:35 +0000)]
Correct the t_nfold build rules again. We don't have a simple way of
plucking object files from other directories (we don't know for sure
what extension to use), so build an nfold.o in this directory from the
nfold.c in the ../krb source directory.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22517
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 10 Aug 2009 19:12:47 +0000 (19:12 +0000)]
Check for null characters in pkinit cert fields
When processing DNS names or MS UPNs in pkinit certs, disallow
embedded null characters.
ticket: 6542
tags: pullup
target_version: 1.7
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22516
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 10 Aug 2009 05:26:05 +0000 (05:26 +0000)]
Narrow the contract of pkinit_client_profile by passing in the realm
instead of the whole request.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22515
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 10 Aug 2009 05:16:24 +0000 (05:16 +0000)]
In pkinit_clnt.c, make private functions static. There and in
pkinit_srv.c, only declare static functions when necessary for forward
references (as is consistent with the other pkinit sources). Remove
the empty functions pkinit_init_client_profile and
pkinit_fini_client_profile.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22514
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 10 Aug 2009 05:02:43 +0000 (05:02 +0000)]
Convert all uses of strtok() in libraries to strtok_r() for thread
safety.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22513
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 10 Aug 2009 04:42:44 +0000 (04:42 +0000)]
Remove pkinit_identity_process_option, which wasn't doing anything
besides picking a subsidiary function based on the (constant) input
argument. Remove the associated constants from pkinit.h as well. No
functional change.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22512
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 7 Aug 2009 19:17:57 +0000 (19:17 +0000)]
Fix the LDAP build, which was broken by the build reordering in
r22406. Build kdb5_util's getdate from the kadmin/cli getdate
source, instead of borrowing the object file from the kadmin/cli
build directory.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22501
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 3 Aug 2009 23:18:42 +0000 (23:18 +0000)]
In crypto_tests: for t_nfold, link against an nfold object file in the
build directory, not the source directory. Remove the nfold object
from the t_encrypt dependency list since we don't directly use it in
the linking rule.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22489
dc483132-0cff-0310-8789-
dd5450dbe970
Tom Yu [Mon, 3 Aug 2009 21:58:15 +0000 (21:58 +0000)]
Be a little more verbose about errors from mit_des_key_sched(), and
remember to print newlines.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22488
dc483132-0cff-0310-8789-
dd5450dbe970
Tom Yu [Mon, 3 Aug 2009 21:19:46 +0000 (21:19 +0000)]
Fix deplibs for t_crc
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22487
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 3 Aug 2009 20:27:03 +0000 (20:27 +0000)]
Get "make depend" to work in an unbuilt source tree, since bad deps
files can make it difficult to build the tree. To do this, make the
depends target depend on generated header files and on header file
copies or links into the main include directory.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22486
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 3 Aug 2009 18:40:22 +0000 (18:40 +0000)]
Re-run make depend. (I am not certain why the dependencies from
r22477 didn't work for me.)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22482
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 3 Aug 2009 18:00:18 +0000 (18:00 +0000)]
In the crypto-tests check target, refer to t_cf2.expected in the
source tree (where it lives) instead of the cwd.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22481
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 3 Aug 2009 17:57:05 +0000 (17:57 +0000)]
In configure.in's list of Makefiles to generate, remove the trailing
slash from lib/crypto/krb as it breaks Makefile auto-regeneration.
While here, wrap the list to fit within 80 columns and use tab indents
to match the surrounding lines.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22480
dc483132-0cff-0310-8789-
dd5450dbe970
Zhanna Tsitkov [Mon, 3 Aug 2009 14:19:16 +0000 (14:19 +0000)]
Crypto modularity proj: Separate files under crypto directory based on their functionality. Move Kerberos specific files into krb subdir and MIT specific - into builtin subdir. Place all tests into crypto_tests subfolder.
bigredbutton: whitespace
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22477
dc483132-0cff-0310-8789-
dd5450dbe970
Zhanna Tsitkov [Sat, 1 Aug 2009 02:25:56 +0000 (02:25 +0000)]
Fix of the test cleanup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22476
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 30 Jul 2009 19:06:37 +0000 (19:06 +0000)]
Include <assert.h> in k5-platform.h, since we use assertions in some
of the macros defined there, as well as in many source files which do
not themselves include <assert.h>. Report and fix by Rainer Weikusat.
ticket: 6533
tags: pullup
target_version: 1.7
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22475
dc483132-0cff-0310-8789-
dd5450dbe970
Ezra Peisach [Thu, 30 Jul 2009 17:22:28 +0000 (17:22 +0000)]
Fix memory leak in k5_pac_verify_server_checksum
k5_pac_verify_server_checksum was leaking memory when the checksum was valid.
t_pac.c: Fix memory leak by forgetting to release memory.
ticket: 6541
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22474
dc483132-0cff-0310-8789-
dd5450dbe970
Ezra Peisach [Thu, 30 Jul 2009 17:12:20 +0000 (17:12 +0000)]
memory leak in test code t_authdata
Free the krb5_context at the end to release memory.
ticket: 6540
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22473
dc483132-0cff-0310-8789-
dd5450dbe970
Ezra Peisach [Thu, 30 Jul 2009 01:07:03 +0000 (01:07 +0000)]
Fix memory leak by release context at end of test code
ticket: 6539
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22470
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Wed, 29 Jul 2009 16:10:32 +0000 (16:10 +0000)]
Enctype list configuration enhancements
In the processing code for enctype lists, add support for "DEFAULT"
to indicate the default list, for families (des/des3/aes/rc4), and
for removing entries from the current list (-foo). Also add unit
tests and document.
ticket: 6539
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22469
dc483132-0cff-0310-8789-
dd5450dbe970
Zhanna Tsitkov [Tue, 28 Jul 2009 16:21:19 +0000 (16:21 +0000)]
Crypto Modularity proj: Added an option --with-crypto-impl to configure.in to specify crypto impl
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22460
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 27 Jul 2009 17:41:19 +0000 (17:41 +0000)]
Use zero-terminated enctype lists in the context structure instead of
counted lists, to reduce impedance mismatches.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22456
dc483132-0cff-0310-8789-
dd5450dbe970
Tom Yu [Fri, 17 Jul 2009 01:35:58 +0000 (01:35 +0000)]
include win-mac.h in gssftp/ftp/cmds.c for HAVE_STDLIB_H
gssftp/ftp/cmds.c had a preprocessor conditional on HAVE_STDLIB_H that
will not evaluate correctly on WIN32 unless win-mac.h is included first.
ticket: 6531
target_version: 1.6.4
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22443
dc483132-0cff-0310-8789-
dd5450dbe970
Tom Yu [Fri, 10 Jul 2009 19:46:20 +0000 (19:46 +0000)]
check for slogin failure in setup_root_shell
Add a check for a slogin message that indicates an unknown public key
fingerprint, as rlogin looks like it points to slogin by default on
Debian Lenny.
ticket: 6530
target_version: 1.7.1
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22435
dc483132-0cff-0310-8789-
dd5450dbe970
Tom Yu [Fri, 10 Jul 2009 19:20:26 +0000 (19:20 +0000)]
Add a new '-W' option to kadmind and kdb5_util create to allow reading
weak random numbers on startup, to avoid long delays in testing
situations. Use only for testing.
Update testing scripts accordingly.
ticket: 1233
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22434
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 10 Jul 2009 19:13:17 +0000 (19:13 +0000)]
In the dejagnu test suite, remove the no-longer-used check_klogin
function.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22433
dc483132-0cff-0310-8789-
dd5450dbe970
Tom Yu [Thu, 9 Jul 2009 22:08:57 +0000 (22:08 +0000)]
Make datetest buildable again
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22432
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 9 Jul 2009 19:10:57 +0000 (19:10 +0000)]
In tests/dejagnu/Makefile.in, remove a --srcdir option which was
redundant with the one in pre.in.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22431
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 9 Jul 2009 19:07:30 +0000 (19:07 +0000)]
In pre.in, remove some variable expansions in the definition of
DEJAFLAGS which aren't used anywhere in the tree.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22430
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Wed, 1 Jul 2009 16:23:25 +0000 (16:23 +0000)]
k5-platform.h no longer takes responsibility for making "static
inline" work, so remove the comment which says it does.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22425
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Sat, 27 Jun 2009 01:00:05 +0000 (01:00 +0000)]
In krb5_copy_error_message, pass correct pointer to
krb5int_clear_error.
ticket: 6519
tags: pullup
target_version: 1.7
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22424
dc483132-0cff-0310-8789-
dd5450dbe970
Tom Yu [Fri, 26 Jun 2009 02:44:41 +0000 (02:44 +0000)]
Add test case omitted in last commit
ticket: 6428
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22423
dc483132-0cff-0310-8789-
dd5450dbe970
Tom Yu [Fri, 26 Jun 2009 02:43:21 +0000 (02:43 +0000)]
Check for principal expiration prior to checking for password
expiration. Reported by Phil Pishioneri.
ticket: 6428
version_reported: 1.7
target_version: 1.7.1
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22422
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Tue, 23 Jun 2009 04:26:14 +0000 (04:26 +0000)]
syms.c doesn't exist; update clean target and dependencies
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22421
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Tue, 23 Jun 2009 04:21:40 +0000 (04:21 +0000)]
GSSAPI init/accept_sec_context performance testing program
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22420
dc483132-0cff-0310-8789-
dd5450dbe970
Ezra Peisach [Sun, 21 Jun 2009 11:43:18 +0000 (11:43 +0000)]
Update comments to reflect reality and the fact that this is not a file based
cache.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22419
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Thu, 18 Jun 2009 23:25:25 +0000 (23:25 +0000)]
reduce some mutex performance problems in profile library
In profile_node_iterator we unlock a mutex in order to call
profile_update_file_data, which wants to lock that mutex itself, and
then when it returns we re-lock the mutex. (We don't use recursive
mutexes, and I would continue to argue that we shouldn't.) On the
Mac, when running multiple threads, it appears that this results in
very poor peformance, and much system and user CPU time is spent
working with the locks. (Linux doesn't seem to suffer as much.)
So: Split profile_update_file_data into a locking wrapper, and an
inner routine that does the real work but requires that the lock be
held on entry. Call the latter from profile_node_iterator *without*
unlocking first, and only unlock if there's an error. This doesn't
move any significant amount of work into the locking region; it pretty
much just joins locking regions that were disjoint for no good reason.
On my tests on an 8-core Mac, in a test program running
gss_init_sec_context in a loop in 6 threads, this brought CPU usage
per call down by 40%, and improved wall-clock time even more.
Single-threaded performance improved very slightly, probably in the
noise.
Linux showed modest improvement (5% or less) in CPU usage in a
3-thread test on a 4-core system.
Similar tests with gss_accept_sec_context showed similar contention
around the profile-library mutexes, but I haven't analyzed the
performance changes there from this patch.
More work is needed, but this will help.
ticket: 6515
tags: pullup
target_version: 1.7.1
version_reported: 1.7
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22418
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Thu, 18 Jun 2009 21:56:48 +0000 (21:56 +0000)]
minor memory leak in 'none' replay cache type
The replay cache type implementations are responsible for freeing the
main rcache structure when the cache handle is closed. The 'none'
rcache type wasn't doing this, resulting in a small memory leak each
time such a cache was opened and closed. Not a big deal for a server
process servicing a single client, but it could accumulate (very very
slowly) for a long-running server.
ticket: 6514
tags: pullup
target_version: 1.7.1
version_reported: 1.7
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22417
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 18 Jun 2009 17:34:17 +0000 (17:34 +0000)]
Remove the new configure option --enable-static-only, and instead
require --enable-static --disable-shared for the same effect. Error
out if only one of those two is specified.
While here, remove an unnecessary clause in the --disable-rpath block,
and make the notices consistent when using shared and static
libraries.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22416
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 18 Jun 2009 04:34:47 +0000 (04:34 +0000)]
In default.exp, revert an unintended part of the last commit
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22415
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 18 Jun 2009 03:48:38 +0000 (03:48 +0000)]
In default.exp, import RLOGIN_FLAGS from the environment, as is
apparently intended.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22414
dc483132-0cff-0310-8789-
dd5450dbe970
Ezra Peisach [Wed, 17 Jun 2009 17:51:31 +0000 (17:51 +0000)]
In the previous patch - I neglected a potential NULL deref in the call
to krb5int_yarrow_cipher_final. Trivial fix.
ticket: 6512
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22413
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Wed, 17 Jun 2009 15:08:25 +0000 (15:08 +0000)]
In ldap_create.c, remove four incorrect uses of krb5_set_error_message
which resulted in obscured and confusing error diagnostics.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22412
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 11 Jun 2009 17:27:45 +0000 (17:27 +0000)]
Use ticket forwarding in the GSSAPI test cases to exercise
mk_cred/rd_cred etc.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22411
dc483132-0cff-0310-8789-
dd5450dbe970
Ezra Peisach [Thu, 11 Jun 2009 17:01:13 +0000 (17:01 +0000)]
krb5int_yarrow_final could deref NULL if out of memory
krb5int_yarrow_final tests if the Yarrow_CTX* is valid (not NULL) -
and if not - signals and error for return - but still invokes
mem_zero (memset) with it as an argument. This will only happen in
an out-of-memory situation.
ticket: 6512
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22410
dc483132-0cff-0310-8789-
dd5450dbe970
Ezra Peisach [Wed, 10 Jun 2009 02:55:22 +0000 (02:55 +0000)]
krb5int_rd_chpw_rep could call krb5_free_error with random value
clang picked up on a path in which krberror is not set and passed as
an argument to krb5_free_error(). Essentially if the clearresult
length < 2 but everything decodes - you can hit this path...
ticket: 6511
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22409
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 8 Jun 2009 20:14:58 +0000 (20:14 +0000)]
Clean up and simplify kdb5.c; no functional changes
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22408
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 8 Jun 2009 19:11:35 +0000 (19:11 +0000)]
In kdb5.c, remove calls to the locking macros which were stubbed out
in r17612.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22407
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 8 Jun 2009 10:01:57 +0000 (10:01 +0000)]
Restore limited support for static linking
Add enough static linking support to run the test suite without shared
libraries, to facilitate gcov and other kinds of instrumentation. The
necessary changes include:
* Undo some of the changes which removed static linking support,
and cannibalize the defunct krb5_force_static conditional block
in aclocal.m4.
* Add --enable-static-only configure option.
* For plugins, use a different symbol name for static and dynamic
builds, via a macro in k5plugin.h.
* Add build machinery for building static libraries for plugins
(somewhat grotty due to the difference in names).
* Move plugin subdirs earlier in SUBDIRS in src/Makefile.in.
* Make the in-tree KDB5 plugins dependencies of libkdb5 in a static
build (aclocal.m4 has to know what they are).
* In kdb5.c, cannibalize the broken _KDB5_STATIC_LINK support to
allow "loading" of statically linked plugin libraries.
Preauth, authdata, locate, and GSSAPI plugins are not handled by this
change, as they are not currently necessary to the test suite.
Supporting GSSAPI plugins may be a bit tricky but the others should be
straightforward if they become needed.
$(STLIBEXT) changes from .a-nobuild to .a in a normal shared build as
a result of these changes (except on AIX where aclocal.m4 changes it).
This does not seem to be important as we avoid selecting the static
library for building via other means.
ticket: 6510
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22406
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 8 Jun 2009 09:43:45 +0000 (09:43 +0000)]
libkdb5 now depends on libgssrpc. So when linking kpropd, specify
$(KDB5_LIB) before $(KADMCLNT_LIBS) to get the link order right.
Unimportant for dynamic linking in most environments, but relevant for
static linking.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22405
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 8 Jun 2009 09:41:55 +0000 (09:41 +0000)]
Don't build the kadm5/unit-test test programs during "make all"; build
them during "make check" via test dependencies for consistency with
the way we handle other test programs. (Also means we don't need
libraries to be linkable until later in the build process.)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22404
dc483132-0cff-0310-8789-
dd5450dbe970
Ezra Peisach [Sat, 6 Jun 2009 13:46:06 +0000 (13:46 +0000)]
kadmind is parsing acls good deref NULL pointer on error
In kadm5int_acl_parse_line, if you setup an acl w/ restrictions
(i.e. the four argument acl format) - but have an error parsing the
first few fields, acle is NULLed out, and is then derefed.
This adds a conditional and indents according to the krb5 c-style...
ticket: 6509
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22403
dc483132-0cff-0310-8789-
dd5450dbe970
Ezra Peisach [Sat, 6 Jun 2009 03:55:44 +0000 (03:55 +0000)]
kadm5int_acl_parse_restrictions could ref uninitialized variable
The variable sp is never initialized. If the first argument to the
function is null, the code falls through to freeing sp if valid.
However, sp is never set.
ticket: 6508
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22402
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 1 Jun 2009 22:39:31 +0000 (22:39 +0000)]
Make results of krb5_db_def_fetch_mkey more predictable
krb5_db_def_fetch_mkey tries the stash file as a keytab, then falls
back to the old stash file format. If the stash file was in keytab
format, but didn't contain the desired master key, we would try to
read a keytab file as a stash file. This could succeed or fail
depending on byte order and other unpredictable factors. The upshot
was that one of the libkadm5 unit tests (init 108) was getting a
different error code on different platforms.
To fix this, only try the stash file format if we get
KRB5_KEYTAB_BADVNO trying the keytab format. This requires reworking
the error handling logic.
ticket: 6506
tags: pullup
target_version: 1.7
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22397
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 1 Jun 2009 16:51:24 +0000 (16:51 +0000)]
Fix a typo in the admin guide (with not keyword -> with no keyword)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22396
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Sat, 30 May 2009 05:36:52 +0000 (05:36 +0000)]
Fix minor bug in r21269 - wrong field name
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22395
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Wed, 27 May 2009 21:21:29 +0000 (21:21 +0000)]
Revert last change
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22394
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Wed, 27 May 2009 20:08:28 +0000 (20:08 +0000)]
Don't re-run test programs to recreate output every time 'check' is built
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22393
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Wed, 27 May 2009 20:03:46 +0000 (20:03 +0000)]
fix t_prf test code properly
Correction to patch in r22364: "i" was used in two places, one of
which required an int-sized value and the other of which required a
size_t. Instead of changing the type, split the two uses into
separate variables.
ticket: 6505
target_version: 1.7
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22392
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Mon, 25 May 2009 21:48:49 +0000 (21:48 +0000)]
On error getting forwarded creds, actually print out the error
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22384
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Mon, 25 May 2009 21:37:02 +0000 (21:37 +0000)]
Check for 'encoding ### bytes' message consistently, accepting full base64 encoding
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22383
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 25 May 2009 16:47:40 +0000 (16:47 +0000)]
Fix up kinit -T documentation
ticket: 6497
tags: pullup
target_version: 1.7
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22382
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 25 May 2009 16:40:00 +0000 (16:40 +0000)]
Temporarily disable FAST PKINIT for 1.7 release
There are protocol issues and implementation defects surrounding the
combination of FAST an PKINIT currently. To avoid impacting the 1.7
scheduled and to avoid creating interoperability problems later,
disable the combination until the problems are resolved.
ticket: 6501
tags: pullup
target_version: 1.7
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22381
dc483132-0cff-0310-8789-
dd5450dbe970
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