diff options
| author | Alexandra Ellwood <lxs@mit.edu> | 2003-03-06 20:08:24 +0000 |
|---|---|---|
| committer | Alexandra Ellwood <lxs@mit.edu> | 2003-03-06 20:08:24 +0000 |
| commit | b6771f9fe404c0ed3745ffbec2ec933cc46a30c2 (patch) | |
| tree | 549efdc06316a4cd6039848e67f95f502d2fcc37 | |
| parent | da7763c3fb33d164e0f1a2697e167fcdfdb5ec8c (diff) | |
| download | krb5-b6771f9fe404c0ed3745ffbec2ec933cc46a30c2.zip krb5-b6771f9fe404c0ed3745ffbec2ec933cc46a30c2.tar.gz krb5-b6771f9fe404c0ed3745ffbec2ec933cc46a30c2.tar.bz2 | |
* prng.c: use Unix randomness sources on Mac OS X
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15249 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/crypto/ChangeLog | 4 | ||||
| -rw-r--r-- | src/lib/crypto/prng.c | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index ff1a2b5..6f73ddf 100644 --- a/src/lib/crypto/ChangeLog +++ b/src/lib/crypto/ChangeLog @@ -1,3 +1,7 @@ +2003-03-06 Alexandra Ellwood <lxs@mit.edu> + + * prng.c: use Unix randomness sources on Mac OS X. + 2003-03-05 Ken Raeburn <raeburn@mit.edu> * Makefile.in (OBJFILELIST, OBJFILEDEP) [##DOS]: Add aes.lst. diff --git a/src/lib/crypto/prng.c b/src/lib/crypto/prng.c index 0f45e6b..881eebd 100644 --- a/src/lib/crypto/prng.c +++ b/src/lib/crypto/prng.c @@ -118,10 +118,9 @@ void prng_cleanup (void) /* * Routines to get entropy from the OS. For UNIX we try /dev/urandom - * and /dev/random. Currently we don't do anything for pre-OSX Mac and - * Windows. + * and /dev/random. Currently we don't do anything for Windows. */ -#if defined(_WIN32) || (defined(TARGET_OS_MAC) && !defined(TARGET_API_MAC_OSX)) +#if defined(_WIN32) krb5_error_code KRB5_CALLCONV krb5_c_random_os_entropy ( @@ -132,7 +131,7 @@ krb5_c_random_os_entropy ( return 0; } -#else /*Windows and non-OSX Mac*/ +#else /*Windows*/ #ifdef HAVE_UNISTD_H #include <unistd.h> #endif |