diff options
| author | Sam Hartman <hartmans@mit.edu> | 2003-05-06 18:46:46 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 2003-05-06 18:46:46 +0000 |
| commit | 3352ed02d146c3627337ab2c9d41f696f4a87fbd (patch) | |
| tree | 545beae179ae94dd6231afcc7976abbf4c14b224 /src/include | |
| parent | 0b3d7319c6d560294fd362c1b218281a4fa4323d (diff) | |
| download | krb5-3352ed02d146c3627337ab2c9d41f696f4a87fbd.tar.gz krb5-3352ed02d146c3627337ab2c9d41f696f4a87fbd.tar.xz krb5-3352ed02d146c3627337ab2c9d41f696f4a87fbd.zip | |
Implement encoders for etype_info2 and add support to s2kparams for
decoders.
Ticket: 1454
Status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15393 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ChangeLog | 6 | ||||
| -rw-r--r-- | src/include/k5-int.h | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index e3b83e825..8ae6cd178 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,9 @@ +2003-05-06 Sam Hartman <hartmans@mit.edu> + + * k5-int.h: Add s2kparams to + krb5_etype_info_entry + Add encode_etype_info2 and decode_etype_info2 + 2003-05-02 Ken Raeburn <raeburn@mit.edu> * port-sockets.h (inet_ntop) [!_WIN32 && !HAVE_MACSOCK_H]: Define diff --git a/src/include/k5-int.h b/src/include/k5-int.h index 35d924bc3..ccbd16899 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -282,12 +282,15 @@ typedef struct _krb5_alt_method { * A null-terminated array of this structure is returned by the KDC as * the data part of the ETYPE_INFO preauth type. It informs the * client which encryption types are supported. + * The same data structure is used by both etype-info and etype-info2 + * but s2kparams must be null when encoding etype-info. */ typedef struct _krb5_etype_info_entry { krb5_magic magic; krb5_enctype etype; unsigned int length; krb5_octet *salt; + krb5_data s2kparams; } krb5_etype_info_entry; /* @@ -1230,6 +1233,8 @@ krb5_error_code encode_krb5_alt_method krb5_error_code encode_krb5_etype_info (const krb5_etype_info_entry **, krb5_data **code); +krb5_error_code encode_krb5_etype_info2 + (const krb5_etype_info_entry **, krb5_data **code); krb5_error_code encode_krb5_enc_data (const krb5_enc_data *, krb5_data **); @@ -1408,6 +1413,9 @@ krb5_error_code decode_krb5_alt_method krb5_error_code decode_krb5_etype_info (const krb5_data *output, krb5_etype_info_entry ***rep); +krb5_error_code decode_krb5_etype_info2 + (const krb5_data *output, krb5_etype_info_entry ***rep); + krb5_error_code decode_krb5_enc_data (const krb5_data *output, krb5_enc_data **rep); |