diff options
| author | Ken Hornstein <kenh@cmf.nrl.navy.mil> | 2002-10-30 18:41:24 +0000 |
|---|---|---|
| committer | Ken Hornstein <kenh@cmf.nrl.navy.mil> | 2002-10-30 18:41:24 +0000 |
| commit | a02992087ea991bbd0793f21021f843af6df1ef7 (patch) | |
| tree | e5f2a481d6134183de90175c08803546dcd59ab2 /src/include | |
| parent | ea56e463282c6168f8ec0f7c5aff43302efc7234 (diff) | |
| download | krb5-a02992087ea991bbd0793f21021f843af6df1ef7.zip krb5-a02992087ea991bbd0793f21021f843af6df1ef7.tar.gz krb5-a02992087ea991bbd0793f21021f843af6df1ef7.tar.bz2 | |
Wrong ASN.1 definition and padata type for new hardware preauth
It turned out that early in the development cycle, one of our developers
picked the "next" PADATA type in krb5.hin, and we said, "We've got to
fix that when we get the real one assigned" ... and we never did. Noticed
by Ezra Peisach.
Also, the definition for sam-pk-for-sad was changed to OCTET STRING from
EncryptionKey in the draft and the code, but we never updated the ASN.1
definition. Also noticed by Ezra Peisach.
ticket: new
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14945 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ChangeLog | 5 | ||||
| -rw-r--r-- | src/include/krb5.hin | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index bf8dbf6..6c6e507 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,8 @@ +2002-10-30 Ken Hornstein <kenh@cmf.nrl.navy.mil> + + * krb5.hin: Change definitions of new SAM preauth types to + match kerberos-clarifications. + 2002-10-24 Ken Hornstein <kenh@cmf.nrl.navy.mil> * k5-int.h, krb5.hin: Add new protocols, definitions, and diff --git a/src/include/krb5.hin b/src/include/krb5.hin index 5b8cb2c..ceb5a47 100644 --- a/src/include/krb5.hin +++ b/src/include/krb5.hin @@ -866,8 +866,11 @@ krb5_error_code krb5_decrypt_data #define KRB5_PADATA_ETYPE_INFO 11 /* Etype info for preauth */ #define KRB5_PADATA_SAM_CHALLENGE 12 /* draft challenge system */ #define KRB5_PADATA_SAM_RESPONSE 13 /* draft challenge system response */ -#define KRB5_PADATA_SAM_CHALLENGE_2 14 /* draft challenge system, updated */ -#define KRB5_PADATA_SAM_RESPONSE_2 15 /* draft challenge system, updated */ +#define KRB5_PADATA_PK_AS_REQ 14 /* PKINIT */ +#define KRB5_PADATA_PK_AS_REP 15 /* PKINIT */ + +#define KRB5_PADATA_SAM_CHALLENGE_2 30 /* draft challenge system, updated */ +#define KRB5_PADATA_SAM_RESPONSE_2 31 /* draft challenge system, updated */ #define KRB5_SAM_USE_SAD_AS_KEY 0x80000000 #define KRB5_SAM_SEND_ENCRYPTED_SAD 0x40000000 |