diff options
| author | Tom Yu <tlyu@mit.edu> | 2003-02-11 01:35:32 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2003-02-11 01:35:32 +0000 |
| commit | 208e27d7e52cdaa9ed75bcfbd22b0527f5a2c4df (patch) | |
| tree | f4fddbb0ce88584bbc8ce7e45800259228159fb3 /src/lib/des425 | |
| parent | 5a2fb0d6ee3d6db893fbe34c4097c019f8a4027d (diff) | |
| download | krb5-208e27d7e52cdaa9ed75bcfbd22b0527f5a2c4df.tar.gz krb5-208e27d7e52cdaa9ed75bcfbd22b0527f5a2c4df.tar.xz krb5-208e27d7e52cdaa9ed75bcfbd22b0527f5a2c4df.zip | |
Fix lots of things to compile on Unix. Fix some typos
By means of carrying through local addresses in many places, eliminate
or reduce sections of code depending on TARGET_OS_MAC conditionals.
Conditionalize some prototypes in krb.h with KRB_PRIVATE, to avoid
leakage on Mac.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15173 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/des425')
| -rw-r--r-- | src/lib/des425/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/des425/str_to_key.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog index 91bc5f7d34..cb2881b5e2 100644 --- a/src/lib/des425/ChangeLog +++ b/src/lib/des425/ChangeLog @@ -1,3 +1,8 @@ +2003-02-10 Tom Yu <tlyu@mit.edu> + + * str_to_key.c (afs_string_to_key): Move out from under + TARGET_OS_MAC conditional. + 2003-01-10 Ken Raeburn <raeburn@mit.edu> * configure.in: Don't explicitly invoke AC_PROG_INSTALL, or check diff --git a/src/lib/des425/str_to_key.c b/src/lib/des425/str_to_key.c index ccbf806219..ce95a531fe 100644 --- a/src/lib/des425/str_to_key.c +++ b/src/lib/des425/str_to_key.c @@ -150,7 +150,6 @@ des_string_to_key(str,key) /* can do dumb things sometimes */ } -#if TARGET_OS_MAC char *mit_afs_crypt (const char *, const char *, const char *); void afs_string_to_key(char *str, char *cell, des_cblock key) @@ -170,6 +169,7 @@ void afs_string_to_key(char *str, char *cell, des_cblock key) mit_afs_string_to_key(&keyblock, &str_data, &cell_data); } +#if TARGET_OS_MAC char *des_crypt(const char *str, const char *salt) { char afs_buf[16]; |