diff options
| author | Sam Hartman <hartmans@mit.edu> | 2001-10-26 05:50:25 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 2001-10-26 05:50:25 +0000 |
| commit | 4f979233c32b6d7a937e4b139c131935695d2d3e (patch) | |
| tree | a514bc6eb82b67b2064b4fe06c22d370791bf3bc /src/include | |
| parent | 0af03dd9ced634438709a5706e38828162170bac (diff) | |
| download | krb5-4f979233c32b6d7a937e4b139c131935695d2d3e.tar.gz krb5-4f979233c32b6d7a937e4b139c131935695d2d3e.tar.xz krb5-4f979233c32b6d7a937e4b139c131935695d2d3e.zip | |
* Expose some rc4 crypto routines through the accessor mechanism; cleaner than raw enctype
* Deal with GSSAPI key usage in microsoft translation
* Add rc4 gssapi mechanism; works with itself, not tested against
* Windows yet
* Refactor large chunks of k5seal.c to make code more readable for
debugging
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13859 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ChangeLog | 8 | ||||
| -rw-r--r-- | src/include/k5-int.h | 18 |
2 files changed, 24 insertions, 2 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 8d18c2c41..958dc2ab5 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,11 @@ +2001-10-24 Sam Hartman <hartmans@mit.edu> + + * k5-int.h: Add declaration for arcfour enc_provider and md5 + hash_provider so we can get to these indirectly from libgssapi. + Ick. This is an evil hack but somewhat less evil than having raw + enctypes. + Add above to krb5int_access along with krb5_hmac function + 2001-10-24 Ezra Peisach <epeisach@mit.edu> * configure.in: Use of AC_DEFINE modified to include third diff --git a/src/include/k5-int.h b/src/include/k5-int.h index 9f7a78eba..34fe73795 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -623,6 +623,14 @@ krb5_error_code krb5_hmac krb5_const krb5_keyblock *key, unsigned int icount, krb5_const krb5_data *input, krb5_data *output); +/* + * These declarations are here, so both krb5 and k5crypto + * can get to them. + * krb5 needs to get to them so it can make them available to libgssapi. + */ +extern const struct krb5_enc_provider krb5int_enc_arcfour; +extern const struct krb5_hash_provider krb5int_hash_md5; + #ifdef KRB5_OLD_CRYPTO /* old provider api */ @@ -1512,7 +1520,7 @@ void krb5int_set_prompt_types /* To keep happy libraries which are (for now) accessing internal stuff */ /* Make sure to increment by one when changing the struct */ -#define KRB5INT_ACCESS_STRUCT_VERSION 3 +#define KRB5INT_ACCESS_STRUCT_VERSION 4 typedef struct _krb5int_access { krb5_error_code (*krb5_locate_kdc) (krb5_context, const krb5_data *, @@ -1526,7 +1534,13 @@ typedef struct _krb5int_access { unsigned int krb5_skdc_timeout_shift; unsigned int krb5_skdc_timeout_1; unsigned int krb5_max_dgram_size; -} krb5int_access; + const struct krb5_hash_provider *md5_hash_provider; + const struct krb5_enc_provider *arcfour_enc_provider; + krb5_error_code (* krb5_hmac) + (krb5_const struct krb5_hash_provider *hash, + krb5_const krb5_keyblock *key, unsigned int icount, + krb5_const krb5_data *input, krb5_data *output); + } krb5int_access; #define KRB5INT_ACCESS_VERSION \ (((krb5_int32)((sizeof(krb5int_access) & 0xFFFF) | \ |