You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2011/05/15 16:15:22 UTC
svn commit: r1103385 -
/httpd/httpd/trunk/modules/session/mod_session_crypto.c
Author: minfrin
Date: Sun May 15 14:15:22 2011
New Revision: 1103385
URL: http://svn.apache.org/viewvc?rev=1103385&view=rev
Log:
Remove the references to apr_crypto_t where apr_crypto_block_t is already
present.
Modified:
httpd/httpd/trunk/modules/session/mod_session_crypto.c
Modified: httpd/httpd/trunk/modules/session/mod_session_crypto.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/session/mod_session_crypto.c?rev=1103385&r1=1103384&r2=1103385&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/session/mod_session_crypto.c (original)
+++ httpd/httpd/trunk/modules/session/mod_session_crypto.c Sun May 15 14:15:22 2011
@@ -189,8 +189,7 @@ static apr_status_t encrypt_string(reque
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(reque
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(reque
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(reque
&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(reque
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(reque
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