diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2003-03-05 03:03:04 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2003-03-05 03:03:04 +0000 |
| commit | 805904312e781e852c4c198ad91b32bac3c95c4e (patch) | |
| tree | 5261c67dbc2a85df358f98101194500da5ed3740 /src/lib/crypto/old | |
| parent | 3d02caa5af4dc5f8ece6286c138d08404d87936b (diff) | |
| download | krb5-805904312e781e852c4c198ad91b32bac3c95c4e.tar.gz krb5-805904312e781e852c4c198ad91b32bac3c95c4e.tar.xz krb5-805904312e781e852c4c198ad91b32bac3c95c4e.zip | |
Clean up PBKDF2 interface. Add s2k-params to string-to-key interface, except
no new decl in krb5.h yet; rename changed s2k functions to use krb5int_ prefix.
Add AES to etype table. Delete some unused declarations.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15229 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/old')
| -rw-r--r-- | src/lib/crypto/old/ChangeLog | 6 | ||||
| -rw-r--r-- | src/lib/crypto/old/des_stringtokey.c | 5 | ||||
| -rw-r--r-- | src/lib/crypto/old/old.h | 5 |
3 files changed, 13 insertions, 3 deletions
diff --git a/src/lib/crypto/old/ChangeLog b/src/lib/crypto/old/ChangeLog index 0cdd65931..c23b40371 100644 --- a/src/lib/crypto/old/ChangeLog +++ b/src/lib/crypto/old/ChangeLog @@ -1,3 +1,9 @@ +2003-03-04 Ken Raeburn <raeburn@mit.edu> + + * des_stringtokey.c (krb5int_des_string_to_key): Renamed from + krb5_... and added s2k-params argument which must be null. + * old.h: Updated. + 2003-01-10 Ken Raeburn <raeburn@mit.edu> * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag. diff --git a/src/lib/crypto/old/des_stringtokey.c b/src/lib/crypto/old/des_stringtokey.c index ee3e1d065..fd3440bda 100644 --- a/src/lib/crypto/old/des_stringtokey.c +++ b/src/lib/crypto/old/des_stringtokey.c @@ -34,11 +34,14 @@ extern krb5_error_code mit_des_string_to_key_int const krb5_data * salt); krb5_error_code -krb5_des_string_to_key(enc, string, salt, key) +krb5int_des_string_to_key(enc, string, salt, parm, key) const struct krb5_enc_provider *enc; const krb5_data *string; const krb5_data *salt; + const krb5_data *parm; krb5_keyblock *key; { + if (parm != NULL) + return KRB5_ERR_BAD_S2K_PARAMS; return(mit_des_string_to_key_int(key, string, salt)); } diff --git a/src/lib/crypto/old/old.h b/src/lib/crypto/old/old.h index b22b1684d..94ee6421e 100644 --- a/src/lib/crypto/old/old.h +++ b/src/lib/crypto/old/old.h @@ -45,7 +45,8 @@ krb5_error_code krb5_old_decrypt const krb5_data *ivec, const krb5_data *input, krb5_data *arg_output); -krb5_error_code krb5_des_string_to_key +krb5_error_code krb5int_des_string_to_key (const struct krb5_enc_provider *enc, - const krb5_data *string, const krb5_data *salt, + const krb5_data *string, const krb5_data *salt, + const krb5_data *params, krb5_keyblock *key); |