diff options
| author | Graham Leggett <minfrin@apache.org> | 2011-05-15 16:15:22 +0200 |
|---|---|---|
| committer | Graham Leggett <minfrin@apache.org> | 2011-05-15 16:15:22 +0200 |
| commit | b9474fdfeb2afc72b2b052715d1a936700fe77fe (patch) | |
| tree | 350150fc84218d5bd0faefec4f81bad656bf041c /modules/session | |
| parent | Add API protection against the deprecated v1.4 apr_crypto API. (diff) | |
| download | apache2-b9474fdfeb2afc72b2b052715d1a936700fe77fe.tar.xz apache2-b9474fdfeb2afc72b2b052715d1a936700fe77fe.zip | |
Remove the references to apr_crypto_t where apr_crypto_block_t is already
present.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1103385 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/session')
| -rw-r--r-- | modules/session/mod_session_crypto.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/modules/session/mod_session_crypto.c b/modules/session/mod_session_crypto.c index a8d086d4ad..aa33653e96 100644 --- a/modules/session/mod_session_crypto.c +++ b/modules/session/mod_session_crypto.c @@ -189,8 +189,7 @@ static apr_status_t encrypt_string(request_rec * r, res = apr_crypto_block_encrypt_init(driver, r->pool, f, key, &iv, &block, &blockSize); #else - res = apr_crypto_block_encrypt_init(&block, &iv, key, - &blockSize, f, r->pool); + res = apr_crypto_block_encrypt_init(&block, &iv, key, &blockSize, r->pool); #endif if (APR_SUCCESS != res) { ap_log_rerror(APLOG_MARK, APLOG_ERR, res, r, LOG_PREFIX @@ -203,8 +202,8 @@ static apr_status_t encrypt_string(request_rec * r, res = apr_crypto_block_encrypt(driver, block, &encrypt, &encryptlen, (unsigned char *)in, strlen(in)); #else - res = apr_crypto_block_encrypt(&encrypt, - &encryptlen, (unsigned char *)in, strlen(in), f, block); + res = apr_crypto_block_encrypt(&encrypt, &encryptlen, (unsigned char *)in, + strlen(in), block); #endif if (APR_SUCCESS != res) { ap_log_rerror(APLOG_MARK, APLOG_ERR, res, r, LOG_PREFIX @@ -215,8 +214,7 @@ static apr_status_t encrypt_string(request_rec * r, res = apr_crypto_block_encrypt_finish(driver, block, encrypt + encryptlen, &tlen); #else - res = apr_crypto_block_encrypt_finish(encrypt + encryptlen, - &tlen, f, block); + res = apr_crypto_block_encrypt_finish(encrypt + encryptlen, &tlen, block); #endif if (APR_SUCCESS != res) { ap_log_rerror(APLOG_MARK, APLOG_ERR, res, r, LOG_PREFIX @@ -290,7 +288,7 @@ static apr_status_t decrypt_string(request_rec * r, &blockSize); #else res = apr_crypto_block_decrypt_init(&block, &blockSize, (unsigned char *)decoded, key, - f, r->pool); + r->pool); #endif if (APR_SUCCESS != res) { ap_log_rerror(APLOG_MARK, APLOG_ERR, res, r, LOG_PREFIX @@ -307,8 +305,8 @@ static apr_status_t decrypt_string(request_rec * r, res = apr_crypto_block_decrypt(driver, block, &decrypted, &decryptedlen, (unsigned char *)decoded, decodedlen); #else - res = apr_crypto_block_decrypt(&decrypted, - &decryptedlen, (unsigned char *)decoded, decodedlen, f, block); + res = apr_crypto_block_decrypt(&decrypted, &decryptedlen, + (unsigned char *)decoded, decodedlen, block); #endif if (res) { ap_log_rerror(APLOG_MARK, APLOG_ERR, res, r, LOG_PREFIX @@ -321,8 +319,7 @@ static apr_status_t decrypt_string(request_rec * r, res = apr_crypto_block_decrypt_finish(driver, block, decrypted + decryptedlen, &tlen); #else - res = apr_crypto_block_decrypt_finish(decrypted + decryptedlen, - &tlen, f, block); + res = apr_crypto_block_decrypt_finish(decrypted + decryptedlen, &tlen, block); #endif if (APR_SUCCESS != res) { ap_log_rerror(APLOG_MARK, APLOG_ERR, res, r, LOG_PREFIX |