summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2009-11-29 23:13:57 +0000
committerGreg Hudson <ghudson@mit.edu>2009-11-29 23:13:57 +0000
commit6af933667efaab3e74add5ffefd7f9691a362958 (patch)
tree3f1ad1526615193f9c8f6c846c8266328782f469 /src/include
parent78501c922b2da4ad025282f3713e12e04de19fb2 (diff)
downloadkrb5-6af933667efaab3e74add5ffefd7f9691a362958.tar.gz
krb5-6af933667efaab3e74add5ffefd7f9691a362958.tar.xz
krb5-6af933667efaab3e74add5ffefd7f9691a362958.zip
Remove the non-iov entry point introduced in r23378, since it's easy
to use the iov entry point at both call sites. Rename the iov entry point to remove the "_iov" suffix since it's no longer needed to disambiguate. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23381 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
-rw-r--r--src/include/k5-int.h18
1 files changed, 4 insertions, 14 deletions
diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 43d9d21fe5..19389145ac 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -756,13 +756,8 @@ krb5_error_code krb5int_pbkdf2_hmac_sha1(const krb5_data *, unsigned long,
krb5_error_code
krb5int_arcfour_gsscrypt(const krb5_keyblock *keyblock, krb5_keyusage usage,
- const krb5_data *kd_data, const krb5_data *input,
- krb5_data *output);
-
-krb5_error_code
-krb5int_arcfour_gsscrypt_iov(const krb5_keyblock *keyblock,
- krb5_keyusage usage, const krb5_data *kd_data,
- krb5_crypto_iov *data, size_t num_data);
+ const krb5_data *kd_data, krb5_crypto_iov *data,
+ size_t num_data);
/*
* Attempt to zero memory in a way that compilers won't optimize out.
@@ -2205,13 +2200,8 @@ typedef struct _krb5int_access {
krb5_error_code (*arcfour_gsscrypt)(const krb5_keyblock *keyblock,
krb5_keyusage usage,
const krb5_data *kd_data,
- const krb5_data *input,
- krb5_data *output);
- krb5_error_code (*arcfour_gsscrypt_iov)(const krb5_keyblock *keyblock,
- krb5_keyusage usage,
- const krb5_data *kd_data,
- krb5_crypto_iov *data,
- size_t num_data);
+ krb5_crypto_iov *data,
+ size_t num_data);
krb5_error_code (*auth_con_get_subkey_enctype)(krb5_context,
krb5_auth_context,