diff options
| author | Chris Provenzano <proven@mit.edu> | 1995-11-09 22:23:27 +0000 |
|---|---|---|
| committer | Chris Provenzano <proven@mit.edu> | 1995-11-09 22:23:27 +0000 |
| commit | afc51d1e3b641931b9a01fe519aa2e3e3dad155b (patch) | |
| tree | 267a5f28a1c4854df276a99a2d5b0fd9ae5e18c7 /src/include | |
| parent | 8b8d05a4d54631a3764c2a0c068d391ed2832d05 (diff) | |
| download | krb5-afc51d1e3b641931b9a01fe519aa2e3e3dad155b.tar.gz krb5-afc51d1e3b641931b9a01fe519aa2e3e3dad155b.tar.xz krb5-afc51d1e3b641931b9a01fe519aa2e3e3dad155b.zip | |
* krb5.hin : Remove krb5_enctype from krb5_string_to_key() args
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7078 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ChangeLog | 4 | ||||
| -rw-r--r-- | src/include/krb5.hin | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 275027010..d5a76c3cb 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,7 @@ +Thu Nov 09 17:05:57 1995 Chris Provenzano (proven@mit.edu) + + * krb5.hin : Remove krb5_enctype from krb5_string_to_key() args. + Thu Nov 9 00:04:52 1995 Theodore Y. Ts'o <tytso@dcl> * k5-int.h: Remove etype_info from the argument list of diff --git a/src/include/krb5.hin b/src/include/krb5.hin index 95ff8de16..e6a2f2e8b 100644 --- a/src/include/krb5.hin +++ b/src/include/krb5.hin @@ -351,7 +351,6 @@ typedef struct _krb5_cryptosystem_entry { krb5_const krb5_keyblock FAR *)); krb5_error_code (*finish_key) KRB5_NPROTOTYPE(( krb5_encrypt_block FAR *)); krb5_error_code (*string_to_key) KRB5_NPROTOTYPE((krb5_const krb5_encrypt_block FAR *, - krb5_const krb5_enctype, krb5_keyblock FAR *, krb5_const krb5_data FAR *, krb5_const krb5_data FAR *)); @@ -453,7 +452,7 @@ extern krb5_cksumtype krb5_max_cksum; /* max entry in array */ #define krb5_decrypt(context, inptr, outptr, size, eblock, ivec) (*(eblock)->crypto_entry->decrypt_func)(inptr, outptr, size, eblock, ivec) #define krb5_process_key(context, eblock, key) (*(eblock)->crypto_entry->process_key)(eblock, key) #define krb5_finish_key(context, eblock) (*(eblock)->crypto_entry->finish_key)(eblock) -#define krb5_string_to_key(context, eblock, enctype, keyblock, data, princ) (*(eblock)->crypto_entry->string_to_key)(eblock, enctype, keyblock, data, princ) +#define krb5_string_to_key(context, eblock, keyblock, data, princ) (*(eblock)->crypto_entry->string_to_key)(eblock, keyblock, data, princ) #define krb5_init_random_key(context, eblock, keyblock, ptr) (*(eblock)->crypto_entry->init_random_key)(keyblock, ptr) #define krb5_finish_random_key(context, eblock, ptr) (*(eblock)->crypto_entry->finish_random_key)(ptr) #define krb5_random_key(context, eblock, ptr, keyblock) (*(eblock)->crypto_entry->random_key)(eblock, ptr, keyblock) |