diff options
| author | Theodore Tso <tytso@mit.edu> | 1992-09-30 14:33:37 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1992-09-30 14:33:37 +0000 |
| commit | 3095354c89323cc380495b7ce19862bf948cd557 (patch) | |
| tree | 0fbe93752e9758611ecc5caff5fa5df70275df54 | |
| parent | fea8edc409d63fbad517228cbfa2f9f586e84e2c (diff) | |
| download | krb5-3095354c89323cc380495b7ce19862bf948cd557.tar.gz krb5-3095354c89323cc380495b7ce19862bf948cd557.tar.xz krb5-3095354c89323cc380495b7ce19862bf948cd557.zip | |
KRB5_PADATA_ENC_RANDOM --> KRB5_PADATA_ENC_TIMESTAMP
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@2460 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/include/krb5/proto.h | 4 | ||||
| -rw-r--r-- | src/kadmin/kpasswd/kpasswd.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/include/krb5/proto.h b/src/include/krb5/proto.h index 2c709e4a4b..eeaf28de77 100644 --- a/src/include/krb5/proto.h +++ b/src/include/krb5/proto.h @@ -64,8 +64,10 @@ #define KRB5_PADATA_TGS_REQ KRB5_PADATA_AP_REQ #define KRB5_PADATA_ENC_TIMESTAMPS 2 #define KRB5_PADATA_PW_SALT 3 +#if 0 /* Not used */ #define KRB5_PADATA_ENC_ENCKEY 4 /* Key encrypted within itself */ -#define KRB5_PADATA_ENC_RANDOM 5 /* random data */ +#endif +#define KRB5_PADATA_ENC_TIMESTAMP 5 /* timestamp encrypted in key */ #define KRB5_PADATA_ENC_SECURID 6 /* SecurId passcode */ /* Reserved for SPX pre-authentication. */ diff --git a/src/kadmin/kpasswd/kpasswd.c b/src/kadmin/kpasswd/kpasswd.c index c4a070ede1..02d78f0a4f 100644 --- a/src/kadmin/kpasswd/kpasswd.c +++ b/src/kadmin/kpasswd/kpasswd.c @@ -718,7 +718,7 @@ OLDDECLARG(krb5_principal, client) 0, /* options */ my_addresses, /* do random preauth */ - KRB5_PADATA_ENC_RANDOM, + KRB5_PADATA_ENC_TIMESTAMP, ETYPE_DES_CBC_CRC, /* etype */ KEYTYPE_DES, old_password, @@ -741,7 +741,7 @@ OLDDECLARG(krb5_principal, client) if ((retval = krb5_get_in_tkt( 0, /* options */ my_addresses, - KRB5_PADATA_ENC_RANDOM, /* do random preauth */ + KRB5_PADATA_ENC_TIMESTAMP, /* do preauth */ ETYPE_DES_CBC_CRC, KEYTYPE_DES, v4_pwd_keyproc, |