diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/krb5/krb/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/krb5/krb/preauth.c | 53 |
2 files changed, 12 insertions, 46 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 1d58ffc4f..1c09ec591 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,8 @@ +Mon Aug 8 22:38:16 1994 Theodore Y. Ts'o (tytso at tsx-11) + + * preauth.c: Renamed preauthentication mechanism names to match + what bcn and I agreed upon. + Tue Jun 28 19:35:07 1994 Tom Yu (tlyu at dragons-lair) * decode_kdc.c: folding in Harry's changes diff --git a/src/lib/krb5/krb/preauth.c b/src/lib/krb5/krb/preauth.c index 5425402e8..52e585804 100644 --- a/src/lib/krb5/krb/preauth.c +++ b/src/lib/krb5/krb/preauth.c @@ -49,22 +49,14 @@ #include <syslog.h> static krb5_preauth_ops preauth_systems[] = { -#if 0 { - KRB5_PADATA_ENC_RANDOM, - KRB5_PREAUTH_FLAGS_ENCRYPT, - get_random_padata, - verify_random_padata, - }, -#endif - { - KRB5_PADATA_ENC_TIMESTAMP, + KRB5_PADATA_ENC_UNIX_TIME, KRB5_PREAUTH_FLAGS_ENCRYPT, - get_timestamp_padata, - verify_timestamp_padata, + get_unixtime_padata, + verify_unixtime_padata, }, { - KRB5_PADATA_ENC_SECURID, + KRB5_PADATA_ENC_SANDIA_SECURID, KRB5_PREAUTH_FLAGS_ENCRYPT | KRB5_PREAUTH_FLAGS_HARDWARE, get_securid_padata, verify_securid_padata, @@ -314,7 +306,7 @@ find_preauthenticator(type, preauth) int seeded = 0 ; /* Used by srand below */ krb5_error_code -get_timestamp_padata(client, src_addr, pa_data) +get_unixtime_padata(client, src_addr, pa_data) krb5_principal client; krb5_address **src_addr; krb5_pa_data *pa_data; @@ -350,7 +342,7 @@ get_timestamp_padata(client, src_addr, pa_data) } krb5_error_code -verify_timestamp_padata(client, src_addr, data) +verify_unixtime_padata(client, src_addr, data) krb5_principal client; krb5_address **src_addr; krb5_data *data; @@ -379,38 +371,6 @@ verify_timestamp_padata(client, src_addr, data) return 0; } -#if 0 -krb5_error_code -get_random_padata(client, src_addr, pa_data) - krb5_principal client; - krb5_address **src_addr; - krb5_pa_data *pa_data; -{ - char temp[MAX_PREAUTH_SIZE]; - - srand(time(0)); - sprintf(temp, "%1u", rand() & 0x7fffffff); - pa_data->length = strlen(temp) + 1; - pa_data->contents = (unsigned char *) malloc(pa_data->length); - if (!pa_data->contents) - return(ENOMEM); - memcpy(pa_data->contents, temp, pa_data->length); - return(0); -} - -krb5_error_code -verify_random_padata(client, src_addr, data) - krb5_principal client; - krb5_address **src_addr; - krb5_data *data; -{ - if (atof(data->data) > 2147483637.0) - return KRB5_PREAUTH_FAILED; - - return 0; -} -#endif - #ifdef KRBCONF_SECUREID #include "sdcli.h" #include "sdconf.c" @@ -477,6 +437,7 @@ verify_securid_padata(client, src_addr, data) free(username); return(KRB5_PREAUTH_FAILED); } + #endif |