Ken Raeburn [Mon, 28 Dec 2009 00:21:10 +0000 (00:21 +0000)]
Note last real update was a while back; delete listings of libraries no longer in tree
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23521
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Mon, 28 Dec 2009 00:21:06 +0000 (00:21 +0000)]
allow testing when offline
Define new make variable OFFLINE to "no"; if it's set to "yes", skip
the testing of t_locate_kdc, which requires access to mit.edu SRV
records.
ticket: 6606
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23520
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Mon, 28 Dec 2009 00:21:00 +0000 (00:21 +0000)]
Include prof_int.h in init_ctx.c instead of init_os_ctx.c,
corresponding to the moved use of profile_copy in r23484.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23519
dc483132-0cff-0310-8789-
dd5450dbe970
Zhanna Tsitkov [Wed, 23 Dec 2009 16:00:05 +0000 (16:00 +0000)]
Code modularity related updates
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23484
dc483132-0cff-0310-8789-
dd5450dbe970
Zhanna Tsitkov [Tue, 22 Dec 2009 22:26:55 +0000 (22:26 +0000)]
Remove krb5_ prefix from some static func names
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23483
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 21 Dec 2009 17:58:12 +0000 (17:58 +0000)]
Add a set_cred_option handler for SPNEGO which forwards to the
underlying mechanism. Fixes SPNEGO credential delegation in 1.7 and
copying of SPNEGO initiator creds in both 1.7 and trunk. Patch
provided by nalin@redhat.com.
ticket: 6594
target_version: 1.7.1
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23482
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 17 Dec 2009 20:03:16 +0000 (20:03 +0000)]
Fix a cleanup handler in the store_creds code; krb5_cc_close doesn't
handle NULL arguments, so we have to check.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23480
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 17 Dec 2009 04:49:27 +0000 (04:49 +0000)]
Add GSS extensions to store credentials, generate random bits
Merge /users/lhoward/gssextras-no-cqa to trunk. Adds
gss_pseudo_random and gss_store_cred.
ticket: 6597
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23479
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Wed, 16 Dec 2009 20:04:32 +0000 (20:04 +0000)]
Whitespace fixes
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23477
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 15 Dec 2009 17:40:27 +0000 (17:40 +0000)]
On Luke's advice, remove krb5_init_creds_store_creds. It is not a
Heimdal API and its functionality is covered by
krb5_get_init_creds_opt_set_out_ccache.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23469
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 15 Dec 2009 17:33:09 +0000 (17:33 +0000)]
Get rid of the requirement of defining MAX_ENCTYPE in
krb5int_parse_enctype_list, at the cost of making repeated realloc()
calls during parsing.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23468
dc483132-0cff-0310-8789-
dd5450dbe970
Zhanna Tsitkov [Tue, 15 Dec 2009 16:37:00 +0000 (16:37 +0000)]
Formatining enhancement
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23467
dc483132-0cff-0310-8789-
dd5450dbe970
Sam Hartman [Mon, 14 Dec 2009 18:28:16 +0000 (18:28 +0000)]
fast negotiation projec
Merge branches/fast-negotiate into trunk.
This implements http://k5wiki.kerberos.org/wiki/Projects/Fast_negotiation
Additional changes:
* krb5_c_make_checksum with checksum type 0 uses mandatory checksum for given key enctype
Conflicts:
src/lib/crypto/krb/make_checksum.c
ticket: 6595
Tags: enhancement
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23465
dc483132-0cff-0310-8789-
dd5450dbe970
Tom Yu [Thu, 10 Dec 2009 19:34:47 +0000 (19:34 +0000)]
Don't use sizeof(pointertype) to get the length of an allocated array
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23464
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 10 Dec 2009 19:04:47 +0000 (19:04 +0000)]
Add comments to make it slightly clearer how
krb5int_confounder_checksum works.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23463
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 10 Dec 2009 17:10:10 +0000 (17:10 +0000)]
Restructure the crypto checksum implementation to minimize
dependencies on the internals of modules.
* Keyhash providers are gone.
* The cksumtypes table contains checksum and verify functions,
similar to the etypes encrypt and decrypt functions. New checksum
functions parallel the old keyhash providers, and there are also
functions for unkeyed and derived-key HMAC checksums.
* The flags field is now used to indicate whether a checksum is
unkeyed, but not whether it is a derived-key HMAC checksum.
* The descbc checksum is handled through a new enc_provider function
which calculates a CBC MAC.
The OpenSSL module does not implement the CBC MAC function (it didn't
implement descbc before). builtin/des could probably get rid of
f_cksum.c (the old DES CBC routine) with some alterations to
string2key.c.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23462
dc483132-0cff-0310-8789-
dd5450dbe970
Zhanna Tsitkov [Wed, 9 Dec 2009 16:52:41 +0000 (16:52 +0000)]
Change file holder for krb5int_check_clockskew. Minor Style changes per code practices
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23460
dc483132-0cff-0310-8789-
dd5450dbe970
Ezra Peisach [Tue, 8 Dec 2009 03:24:23 +0000 (03:24 +0000)]
Remove dependency on /bin/csh in test suite
The libdb2 test suite would fail if /bin/csh was not present. The
tests did not execute /bin/csh - but used the contents as data to put
into the test database. Iterate over a few "known" files until one is found
that could be used for it... Tests for /bin/csh, /bin/cat, /usr/bin/cat,
/bin/ls, /usr/bin/ls. If none of these exist - then fail.
ticket: 6593
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23458
dc483132-0cff-0310-8789-
dd5450dbe970
Tom Yu [Tue, 8 Dec 2009 00:04:48 +0000 (00:04 +0000)]
Mark and reindent lib/gssapi, with some exceptions
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23457
dc483132-0cff-0310-8789-
dd5450dbe970
Tom Yu [Mon, 7 Dec 2009 23:26:27 +0000 (23:26 +0000)]
Mark lib/apputils
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23456
dc483132-0cff-0310-8789-
dd5450dbe970
Tom Yu [Mon, 7 Dec 2009 22:36:41 +0000 (22:36 +0000)]
Mark and reindent util, with some exceptions
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23455
dc483132-0cff-0310-8789-
dd5450dbe970
Tom Yu [Mon, 7 Dec 2009 15:30:37 +0000 (15:30 +0000)]
handle negative enctypes better
krb5_dbe_def_search_enctype and krb5int_parse_enctype_list were making
assumptions that enctype numbers are positive. Potentially more code
makes this assumption, but these appear to be the major ones.
ticket: 6592
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23454
dc483132-0cff-0310-8789-
dd5450dbe970
Ezra Peisach [Sun, 6 Dec 2009 22:07:02 +0000 (22:07 +0000)]
Initialize ihash_iov in case fall through to cleanup handler and try
to free garbarge.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23453
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Sun, 6 Dec 2009 20:55:16 +0000 (20:55 +0000)]
Remove the ivec parameters from the keyhash provider functions, as
they are never used by callers.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23452
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Sun, 6 Dec 2009 16:25:22 +0000 (16:25 +0000)]
Make depend
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23451
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Sun, 6 Dec 2009 16:23:11 +0000 (16:23 +0000)]
Make the libk5crypto hash_provider interface take crypto_iov lists
instead of lists of krb5_data. Make the base HMAC APIs take
crypto_iov lists and drop the _iov variants.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23450
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Sun, 6 Dec 2009 15:57:36 +0000 (15:57 +0000)]
In the built-in des3 provider, remove the unused version of
validate_and_schedule, and drop the _iov suffix from the one we do
use. (Cleanup from r23444.)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23449
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Sat, 5 Dec 2009 22:53:04 +0000 (22:53 +0000)]
Make the alloc_data and k5alloc convenience functions work if the
caller requests zero bytes, by allocating one byte instead.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23448
dc483132-0cff-0310-8789-
dd5450dbe970
Ezra Peisach [Sat, 5 Dec 2009 13:47:37 +0000 (13:47 +0000)]
Remove tests for sched.h, kdb_db.h, kdc.c. None of these are used in the tree
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23447
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 4 Dec 2009 14:58:10 +0000 (14:58 +0000)]
Remove some code paths in crypto-length which are dead now that the
internal interface can't return an error.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23446
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 4 Dec 2009 14:54:57 +0000 (14:54 +0000)]
Remove CRC32_SHIFT4 code as we are unlikely to ever need it
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23445
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 4 Dec 2009 05:12:35 +0000 (05:12 +0000)]
Consolidate the IOV and non-IOV encryption/decryption code paths, and
drop the _iov suffix from most encryption- and decryption-related
functions. The enc_provider encrypt and decrypt functions take IOVs,
as do the enctype entries in etypes.c, and there are no separate
encrypt_iov or decrypt_iov functions.
aead_provider is gone. Enctype functions now take pointers to the
enctype entry instead of pointers to the enc/hash/aead providers; this
allows dk_encrypt and dk_decrypt to be polymorphic in the length
function they use now that AES and DES3 can't differentiate by aead
provider.
aes_string_to_key needed to be moved into the krb/ fold for this since
it's an enctype function; it was duplicated between builtin/ and
openssl/ before. This leaves openssl/aes empty; the build system
currently demands that all modules have the same directory structure,
so the directory and Makefile will stick around for now.
Three separate copies of the derive_random logic are also now
consolidated into one.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23444
dc483132-0cff-0310-8789-
dd5450dbe970
Tom Yu [Thu, 3 Dec 2009 04:49:37 +0000 (04:49 +0000)]
Revert r23442. Revert r23436 changes unrelated to comment reformatting
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23443
dc483132-0cff-0310-8789-
dd5450dbe970
Tom Yu [Thu, 3 Dec 2009 04:10:18 +0000 (04:10 +0000)]
Update export list to reflect changes in r23436
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23442
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Thu, 3 Dec 2009 02:35:21 +0000 (02:35 +0000)]
Reformat new comments
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23441
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Thu, 3 Dec 2009 02:17:28 +0000 (02:17 +0000)]
fix slow behavior on Mac OS X with link-local addresses
When using my previous patch, if a local hostname like "foobar.local"
is looked up, you may get back a link-local IPv6 address. However,
the KDC seems to be unable to respond from that address, resulting in
a ~1s delay for each KDC exchange while waiting for the client to fail
over to another address (in my case, another IPv6 address).
Create a new object for holding whatever auxiliary information might
be needed to properly transmit the response to the client. Currently,
that only means the interface index number under IPv6. Fill it in on
receipt, always; copy it back to the pktinfo structure when
transmitting, ONLY if the local source address is link-local.
If an error occurs while transmitting the reply, print both the remote
destination address and the local source address. Use getnameinfo
instead of inet_ntop.
Apply the same changes to kadmind, to keep the versions of network.c
more or less in sync.
ticket: 6591
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23440
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Thu, 3 Dec 2009 02:17:24 +0000 (02:17 +0000)]
allow testing even if name->addr->name mapping doesn't work
Many of the tests are set up to fail if the local hostname can't be
mapped to an address and back to a name again. If the name results in
an address, and we can get a fully-qualified name or something that
looks like it, though, we should be able to just go ahead and run some
tests.
This is also closer to the current behavior of sname_to_principal when
reverse DNS is enabled.
ticket: 6590
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23439
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Thu, 3 Dec 2009 02:17:20 +0000 (02:17 +0000)]
Sense of POINTERS_ARE_ALL_THE_SAME test was backwards
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23438
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Thu, 3 Dec 2009 02:17:16 +0000 (02:17 +0000)]
Temporarily define UINT16_TYPE and UINT32_TYPE so the load/store
functions don't need excessive conditionals internally.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23437
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Wed, 2 Dec 2009 23:34:05 +0000 (23:34 +0000)]
Reformat new block comment per coding style
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23436
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Wed, 2 Dec 2009 23:09:42 +0000 (23:09 +0000)]
Actually record dependencies of crypto tests
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23435
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Wed, 2 Dec 2009 23:09:40 +0000 (23:09 +0000)]
Check ALL_DEP_SRCS, not SRCS, to decide what to put into the deps file
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23434
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Wed, 2 Dec 2009 23:09:36 +0000 (23:09 +0000)]
update dependencies
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23433
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Wed, 2 Dec 2009 23:09:33 +0000 (23:09 +0000)]
Perform the AES-CBC XOR operations 4 bytes at a time, using the helper
functions for loading and storing potentially-unaligned values.
Improves bulk AES encryption performance by 2% or so on 32-bit x86
with gcc 4.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23432
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Wed, 2 Dec 2009 23:09:29 +0000 (23:09 +0000)]
Add store_{16,32,64}_n functions, for potentially-unaligned, native-order values
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23431
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Wed, 2 Dec 2009 22:37:16 +0000 (22:37 +0000)]
Speed up the per-block loops of AES, DES3, and DES IOV encryption by
avoiding function calls and copies in the case where the next block
is wholly contained within the current buffer. To do this, introduce
two new inline functions in aead.h called iov_next_block and
iov_store_block.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23430
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Wed, 2 Dec 2009 20:13:26 +0000 (20:13 +0000)]
Remove t_kperf on make clean
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23429
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Wed, 2 Dec 2009 19:52:54 +0000 (19:52 +0000)]
Clean up the AES enc_provider code a bit. Chiefly, work with unsigned
char blocks, casting input->data and output->data once each upon entry
to the non-IOV encrypt and decrypt functions, rather than casting our
working buffers each time we need to work with an outside function.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23428
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Wed, 2 Dec 2009 18:32:03 +0000 (18:32 +0000)]
In t_kperf, generate a valid ciphertext when testing decryption
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23427
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Wed, 2 Dec 2009 18:10:12 +0000 (18:10 +0000)]
Fix an incorrect length in the new krb5int_c_decrypt_aead_compat
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23426
dc483132-0cff-0310-8789-
dd5450dbe970
Zhanna Tsitkov [Wed, 2 Dec 2009 18:06:19 +0000 (18:06 +0000)]
Fixed the conflicting type "static krb5_error_code KRB5_CALLCONV" of krb5_change_set_password and some reindentation/reformating
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23425
dc483132-0cff-0310-8789-
dd5450dbe970
Zhanna Tsitkov [Tue, 1 Dec 2009 16:22:47 +0000 (16:22 +0000)]
Reindent and removed krb5_ prefix from static func name
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23398
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 1 Dec 2009 01:36:42 +0000 (01:36 +0000)]
Fix AES IOV decryption of small messages
AES messages never need to be padded because the confounder ensures
that the plaintext is at least one block long. Remove a check in
krb5int_dk_decrypt_iov which was rejecting short AES messages because
it didn't count the header length.
ticket: 6589
tags: pullup
target_version: 1.7.1
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23397
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 1 Dec 2009 01:32:02 +0000 (01:32 +0000)]
Make krb5int_c_decrypt_aead_compat more efficient by building the
buffers explicitly rather than using stream decryption. Sidesteps
some machinery and avoids copying the output.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23396
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 1 Dec 2009 00:40:54 +0000 (00:40 +0000)]
Fix the usage fallback in krb5int_arcfour_decrypt_iov. Factor out IOV
encryption with a keyblock since this makes four uses of it in one
file.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23395
dc483132-0cff-0310-8789-
dd5450dbe970
Tom Yu [Mon, 30 Nov 2009 23:09:36 +0000 (23:09 +0000)]
Mark and reindent tests, with some exclusions
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23394
dc483132-0cff-0310-8789-
dd5450dbe970
Zhanna Tsitkov [Mon, 30 Nov 2009 22:29:48 +0000 (22:29 +0000)]
Reindent
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23393
dc483132-0cff-0310-8789-
dd5450dbe970
Tom Yu [Mon, 30 Nov 2009 21:35:38 +0000 (21:35 +0000)]
Mark and reindent util/support
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23392
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 30 Nov 2009 19:37:31 +0000 (19:37 +0000)]
Remove some stray tabs
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23391
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 30 Nov 2009 19:05:01 +0000 (19:05 +0000)]
Use aead_dk instead of aead_old for des-hmac-sha1, since it uses
dk_encrypt.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23390
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 30 Nov 2009 19:03:58 +0000 (19:03 +0000)]
Fix ivec chaining for DES iov encryption
krb5int_des_cbc_decrypt_iov was using a plaintext block to update the
ivec. Fix it to use the last cipher block, borrowing from the
corresponding des3 function. The impact of this bug is not serious
since ivec chaining is not typically used with IOV encryption in 1.7.
ticket: 6588
tags: pullup
target_version: 1.7.1
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23389
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 30 Nov 2009 16:19:24 +0000 (16:19 +0000)]
Add an AEAD provider for enctypes which use krb5_old_encrypt and
krb5_old_decrypt; this makes every enctype have an AEAD provider. To
make this work, expose make_unkeyed_checksum_iov to other files (under
the name krb5int_hash_iov) and make krb5int_c_padding_length take into
account the header length.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23388
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 30 Nov 2009 16:13:50 +0000 (16:13 +0000)]
In the des enc_provider decrypt_iov function, count header blocks as
well as data and padding blocks when checking for correctly padded
input.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23387
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 30 Nov 2009 16:12:36 +0000 (16:12 +0000)]
Make the crc32 hash provider correctly chain multiple input buffers,
so that it returns the same result if you pass it one big buffer or
many small buffers containing the same data. To do this, change the
contract of mit_crc32 so that the cksum parameter is in-out.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23386
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 30 Nov 2009 14:17:06 +0000 (14:17 +0000)]
Stream decryption is handled in krb5_k_decrypt_iov; remove some
lingering checks in the dk and raw aead providers from before that
was introduced.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23385
dc483132-0cff-0310-8789-
dd5450dbe970
Sam Hartman [Mon, 30 Nov 2009 14:14:47 +0000 (14:14 +0000)]
Fix memory leak
ticket: 6585
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23384
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 30 Nov 2009 01:19:14 +0000 (01:19 +0000)]
Terminate the loop in find_authdata_1 if we get an error in one of the
iterations.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23382
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Sun, 29 Nov 2009 23:13:57 +0000 (23:13 +0000)]
Remove the non-iov entry point introduced in r23378, since it's easy
to use the iov entry point at both call sites. Rename the iov entry
point to remove the "_iov" suffix since it's no longer needed to
disambiguate.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23381
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Sun, 29 Nov 2009 15:43:29 +0000 (15:43 +0000)]
Avoid using strncpy in the production of the arcfour salt because it
produces a (spurious) Coverity defect. Fix a memory leak in
krb5int_arcfour_encrypt.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23380
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Sun, 29 Nov 2009 15:32:28 +0000 (15:32 +0000)]
Add do-while(0) around multi-statement macros in f_tables.h for more
consistent and elegant emacs auto-formatting.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23379
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Sat, 28 Nov 2009 23:10:31 +0000 (23:10 +0000)]
Create functional internal interfaces to allow GSSAPI to perform
arcfour encryption of GSS tokens. This factors out derivation of
the usage and encryption keys, and removes the need for the provider
structures to be visible to all of krb5 via k5-int.h.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23378
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Sat, 28 Nov 2009 15:53:39 +0000 (15:53 +0000)]
Clean up the arcfour token encryption and decryption functions by
making use of newer convenience functions and by factoring out the
derivation of the usage and encryption keys.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23377
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Sat, 28 Nov 2009 15:51:45 +0000 (15:51 +0000)]
Add a convenience inline function in k5-int.h to initialize a
krb5_data structure with allocated memory.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23376
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Sat, 28 Nov 2009 00:43:34 +0000 (00:43 +0000)]
Mark and reindent lib/crypto
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23374
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 27 Nov 2009 21:30:51 +0000 (21:30 +0000)]
Add krb5_key versions of the auth context key accessors, and use them
to simplify the gss-krb5 code a little bit.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23372
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 27 Nov 2009 21:15:53 +0000 (21:15 +0000)]
Allow null keys to be referenced (a no-op) for simpler "copying" of
keys which might or might not exist. Consistent with allowing freeing
of null keys.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23371
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 27 Nov 2009 21:14:03 +0000 (21:14 +0000)]
Export krb5_k_reference_key since it's part of the public API
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23370
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 27 Nov 2009 20:38:28 +0000 (20:38 +0000)]
Clean up the flow control in krb5int_send_tgs, and avoid setting the
subkey output param when success is not guaranteed.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23369
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 27 Nov 2009 19:30:29 +0000 (19:30 +0000)]
If krb5_init_creds_step is called on an already complete context,
return 0 rather than uninitialized stack garbage.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23368
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 27 Nov 2009 09:15:50 +0000 (09:15 +0000)]
Move the arcfour directory from the crypto module dirs into krb. This
directory contains the token encryption code (similar to dk, old, and
raw) which is Kerberos-specific. The actual stream cipher lives in
enc_provider/rc4.c, which is still in the module dirs.
arcfour/arcfour-int.h contained the definitions of some structures
used only in enc_provider/rc4.c. Move those definitions into that
source file so that everything in arcfour is at the right level of
abstraction to live in krb.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23367
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 27 Nov 2009 09:10:47 +0000 (09:10 +0000)]
Make depend
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23366
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Fri, 27 Nov 2009 00:00:06 +0000 (00:00 +0000)]
Add krb5_k_prf, the krb5_key version of krb5_c_prf
ticket: 6576
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23365
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 26 Nov 2009 23:23:11 +0000 (23:23 +0000)]
Clean up a few cases where krb5_get_in_tkt_with_keytab would leak the
options structure.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23363
dc483132-0cff-0310-8789-
dd5450dbe970
Tom Yu [Thu, 26 Nov 2009 03:54:59 +0000 (03:54 +0000)]
Pullup to 1.7-branch is only for the test case, as krb5-1.7 behaved
correctly for these checksums.
Fix regression in MD4-DES and MD5-DES keyed checksums. The original
key was being used for the DES encryption, not the "xorkey". (key
with each byte XORed with 0xf0)
Add a test case that will catch future regressions of this sort, by
including a verification of a "known-good" checksum (derived from a
known-to-be-interoperable version of the implementation).
ticket: 6584
target_version: 1.7.1
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23361
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Thu, 26 Nov 2009 00:05:08 +0000 (00:05 +0000)]
libkrb5 support for non-blocking AS requests
Merge Luke's iakerb-libkrb5-as-only branch into trunk with several bug
fixes. Adds support for the krb5_init_creds APIs (same as Heimdal's)
which allow AS requests to be performed via a different transport than
the blocking send_to_kdc.
ticket: 6586
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23358
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Wed, 25 Nov 2009 23:09:07 +0000 (23:09 +0000)]
Defer the conversion of the gic options structure to the extended form
until we reach krb5_get_init_creds. Rename that function to
krb5int_get_init_creds since it isn't public. Also stop exporting it.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23357
dc483132-0cff-0310-8789-
dd5450dbe970
Zhanna Tsitkov [Wed, 25 Nov 2009 19:03:29 +0000 (19:03 +0000)]
Coding Style related fixes
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23356
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Wed, 25 Nov 2009 14:36:05 +0000 (14:36 +0000)]
In krb5_db2_db_init, make a format string constant to make Coverity
happy. (Previously it was a disjunction of two constants, which is
fine, but not as obviously safe to a static analysis tool.)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23355
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Wed, 25 Nov 2009 00:23:57 +0000 (00:23 +0000)]
Mark and reindent the pkinit plugin code, except for the header files
which are kind of difficult.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23354
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 24 Nov 2009 23:52:25 +0000 (23:52 +0000)]
Mark and reindent plugins, except for pkinit, which needs a little
cleanup first.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23353
dc483132-0cff-0310-8789-
dd5450dbe970
Zhanna Tsitkov [Tue, 24 Nov 2009 21:08:00 +0000 (21:08 +0000)]
Remove krb5_ prefix from the name of the static func get_as_key_keytab. Reindent
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23352
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 24 Nov 2009 17:46:45 +0000 (17:46 +0000)]
Mark and reindent what's left of the appl directory
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23342
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 24 Nov 2009 15:43:16 +0000 (15:43 +0000)]
Remove appl man pages from the list of pages to convert in the doc
build system.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23341
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 24 Nov 2009 03:11:22 +0000 (03:11 +0000)]
Fix boilerplate in zap.c
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23340
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Tue, 24 Nov 2009 01:25:10 +0000 (01:25 +0000)]
Punt the volatile cast in the non-gcc, non-Windows version of zap.
Use a function call into libkrb5support instead, since that's hard to
inline.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23339
dc483132-0cff-0310-8789-
dd5450dbe970
Sam Hartman [Tue, 24 Nov 2009 01:05:30 +0000 (01:05 +0000)]
KDC MUST NOT accept ap-request armor in FAST TGS
Per the latest preauth framework spec, the working group has decided
to forbid ap-request armor in the TGS request because of security
problems with that armor type.
This commit was tested against an implementation of FAST TGS client to
confirm that if explicit armor is sent, the request is rejected.
ticket: 6585
target_version: 1.7.1
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23325
dc483132-0cff-0310-8789-
dd5450dbe970
Ken Raeburn [Tue, 24 Nov 2009 00:03:19 +0000 (00:03 +0000)]
Expand comments around 'zap' code
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23319
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 23 Nov 2009 20:52:16 +0000 (20:52 +0000)]
Simplify depfix.pl by assuming that all files outside of the source
and build directory (after substitutions) are external headers which
should not be tracked.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23314
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Mon, 23 Nov 2009 19:24:42 +0000 (19:24 +0000)]
Check return value of gethostname in krb5_klog_init
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23313
dc483132-0cff-0310-8789-
dd5450dbe970
Greg Hudson [Sun, 22 Nov 2009 19:11:53 +0000 (19:11 +0000)]
Make zap() work with non-gcc C++ compilers.
Eliminate the intermediate name krb5int_zap_data.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23311
dc483132-0cff-0310-8789-
dd5450dbe970