summaryrefslogtreecommitdiff
path: root/include/private
diff options
context:
space:
mode:
authorGraham Leggett <minfrin@apache.org>2011-05-15 14:07:20 +0000
committerGraham Leggett <minfrin@apache.org>2011-05-15 14:07:20 +0000
commit9d62d9d6b31a193fac30d4c08355a171624440fa (patch)
tree69bbc9221ac1c359029a6e055d9a3fb6b0d3b7b5 /include/private
parent9c3184200005aaf899a86154253cc2d24d37e5f0 (diff)
downloadapr-9d62d9d6b31a193fac30d4c08355a171624440fa.tar.gz
Remove the apr_crypto_t context from calls where the apr_crypto_block_t is
passed. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1103382 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/private')
-rw-r--r--include/private/apr_crypto_internal.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/private/apr_crypto_internal.h b/include/private/apr_crypto_internal.h
index 1511cc82b..d32af2972 100644
--- a/include/private/apr_crypto_internal.h
+++ b/include/private/apr_crypto_internal.h
@@ -101,7 +101,6 @@ struct apr_crypto_driver_t {
* used.
* @param key The key structure.
* @param blockSize The block size of the cipher.
- * @param f The block context to use.
* @param p The pool to use.
* @return Returns APR_ENOIV if an initialisation vector is required but not specified.
* Returns APR_EINIT if the backend failed to initialise the context. Returns
@@ -109,7 +108,7 @@ struct apr_crypto_driver_t {
*/
apr_status_t (*block_encrypt_init)(apr_crypto_block_t **ctx,
const unsigned char **iv, const apr_crypto_key_t *key,
- apr_size_t *blockSize, const apr_crypto_t *f, apr_pool_t *p);
+ apr_size_t *blockSize, apr_pool_t *p);
/**
* @brief Encrypt data provided by in, write it to out.
@@ -163,7 +162,6 @@ struct apr_crypto_driver_t {
* an IV will be created at random, in space allocated from the pool.
* If the buffer is not NULL, the IV in the buffer will be used.
* @param key The key structure.
- * @param f The block context to use.
* @param p The pool to use.
* @return Returns APR_ENOIV if an initialisation vector is required but not specified.
* Returns APR_EINIT if the backend failed to initialise the context. Returns
@@ -171,7 +169,7 @@ struct apr_crypto_driver_t {
*/
apr_status_t (*block_decrypt_init)(apr_crypto_block_t **ctx,
apr_size_t *blockSize, const unsigned char *iv,
- const apr_crypto_key_t *key, const apr_crypto_t *f, apr_pool_t *p);
+ const apr_crypto_key_t *key, apr_pool_t *p);
/**
* @brief Decrypt data provided by in, write it to out.