diff options
Diffstat (limited to 'src/lib/crypto')
| -rw-r--r-- | src/lib/crypto/des/ChangeLog | 6 | ||||
| -rw-r--r-- | src/lib/crypto/des/des_int.h | 2 | ||||
| -rw-r--r-- | src/lib/crypto/des/string2key.c | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog index d823b41367..0d72e4b2d0 100644 --- a/src/lib/crypto/des/ChangeLog +++ b/src/lib/crypto/des/ChangeLog @@ -1,3 +1,9 @@ +Thu Nov 09 17:05:57 1995 Chris Provenzano (proven@mit.edu) + + * string2key.c : Remove krb5_enctype from krb5_string_to_key() args. + * string2key.c, des_int.h : Remove krb5_enctype from + mit_des_string_to_key() args. + Tue Oct 31 22:06:52 1995 Theodore Y. Ts'o <tytso@dcl> * finish_key.c (mit_des_finish_key): Make mit_des_finish_key() diff --git a/src/lib/crypto/des/des_int.h b/src/lib/crypto/des/des_int.h index 0293266325..e0f9014363 100644 --- a/src/lib/crypto/des/des_int.h +++ b/src/lib/crypto/des/des_int.h @@ -153,7 +153,7 @@ extern krb5_error_code mit_des_random_key /* string2key.c */ extern krb5_error_code mit_des_string_to_key - PROTOTYPE(( const krb5_encrypt_block FAR *, const krb5_enctype, + PROTOTYPE(( const krb5_encrypt_block FAR *, krb5_keyblock FAR *, const krb5_data FAR *, const krb5_data FAR *)); /* weak_key.c */ diff --git a/src/lib/crypto/des/string2key.c b/src/lib/crypto/des/string2key.c index e5cddf02f3..e36ebcbc7b 100644 --- a/src/lib/crypto/des/string2key.c +++ b/src/lib/crypto/des/string2key.c @@ -41,9 +41,8 @@ */ krb5_error_code -mit_des_string_to_key (eblock, enctype, keyblock, data, salt) +mit_des_string_to_key (eblock, keyblock, data, salt) const krb5_encrypt_block FAR * eblock; -const krb5_enctype enctype; krb5_keyblock FAR * keyblock; const krb5_data FAR * data; const krb5_data FAR * salt; @@ -60,6 +59,7 @@ const krb5_data FAR * salt; register char *p_char; char k_char[64]; mit_des_key_schedule key_sked; + krb5_enctype enctype = eblock->crypto_entry->proto_enctype; #ifndef min #define min(A, B) ((A) < (B) ? (A): (B)) |