diff options
| -rw-r--r-- | src/clients/kinit/ChangeLog | 5 | ||||
| -rw-r--r-- | src/clients/kinit/kinit.c | 2 | ||||
| -rw-r--r-- | src/include/krb5/ChangeLog | 5 | ||||
| -rw-r--r-- | src/include/krb5/proto.h | 6 | ||||
| -rw-r--r-- | src/lib/krb5/krb/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/krb5/krb/preauth.c | 53 |
6 files changed, 26 insertions, 50 deletions
diff --git a/src/clients/kinit/ChangeLog b/src/clients/kinit/ChangeLog index 77d1e068c3..fd5a027bd1 100644 --- a/src/clients/kinit/ChangeLog +++ b/src/clients/kinit/ChangeLog @@ -1,3 +1,8 @@ +Mon Aug 8 22:26:11 1994 Theodore Y. Ts'o (tytso at tsx-11) + + * kinit.c: Change name of preauthentication + KRB5_PADATA_ENC_TIMESTAMP to KRB5_PADATA_ENC_UNIX_TIME + Sat Jul 16 03:01:49 1994 Tom Yu (tlyu at dragons-lair) * kinit.c: frob error codes diff --git a/src/clients/kinit/kinit.c b/src/clients/kinit/kinit.c index 2e2b0de563..e8b91ba30c 100644 --- a/src/clients/kinit/kinit.c +++ b/src/clients/kinit/kinit.c @@ -65,7 +65,7 @@ krb5_data tgtname = { */ int preauth_search_list[] = { 0, - KRB5_PADATA_ENC_TIMESTAMP, + KRB5_PADATA_ENC_UNIX_TIME, -1 }; diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog index cfbf9bc758..37147ec477 100644 --- a/src/include/krb5/ChangeLog +++ b/src/include/krb5/ChangeLog @@ -1,3 +1,8 @@ +Mon Aug 8 22:36:24 1994 Theodore Y. Ts'o (tytso at tsx-11) + + * proto.h: Change preauthentication names to match official names + which bcn and I agreed upon. + Tue Aug 2 03:39:14 1994 Tom Yu (tlyu@dragons-lair) * acconfig.h: add HAVE_SETVBUF diff --git a/src/include/krb5/proto.h b/src/include/krb5/proto.h index 2a55660a80..da3992f35a 100644 --- a/src/include/krb5/proto.h +++ b/src/include/krb5/proto.h @@ -63,13 +63,13 @@ #define KRB5_PADATA_NONE 0 #define KRB5_PADATA_AP_REQ 1 #define KRB5_PADATA_TGS_REQ KRB5_PADATA_AP_REQ -#define KRB5_PADATA_ENC_TIMESTAMPS 2 +#define KRB5_PADATA_ENC_TIMESTAMP 2 #define KRB5_PADATA_PW_SALT 3 #if 0 /* Not used */ #define KRB5_PADATA_ENC_ENCKEY 4 /* Key encrypted within itself */ #endif -#define KRB5_PADATA_ENC_TIMESTAMP 5 /* timestamp encrypted in key */ -#define KRB5_PADATA_ENC_SECURID 6 /* SecurId passcode */ +#define KRB5_PADATA_ENC_UNIX_TIME 5 /* timestamp encrypted in key */ +#define KRB5_PADATA_ENC_SANDIA_SECURID 6 /* SecurId passcode */ #define KRB5_PADATA_SESAME 7 /* Sesame project */ #define KRB5_PADATA_OSF_DCE 8 /* OSF DCE */ diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 1d58ffc4ff..1c09ec5913 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 5425402e87..52e585804c 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 |