www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Work around crypto API incompatibilities.

Browse Source 
The API in APR 2 is different from the API in APU 1.4/1.5.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951870 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Rainer Jung
2010-06-06 14:47:11 +00:00
parent 6c696580ea
commit afd39cbd25
1 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
modules/session/mod_session_crypto.c
View File

@@ -31,6 +31,12 @@
#else #else
#if APR_MAJOR_VERSION < 2
#define CRYPTO_VERSION 104
#else
#define CRYPTO_VERSION 200
#endif
#include "apr_crypto.h" /* for apr_*_crypt et al */ #include "apr_crypto.h" /* for apr_*_crypt et al */
#define LOG_PREFIX "mod_session_crypto: " #define LOG_PREFIX "mod_session_crypto: "
@@ -98,7 +104,11 @@ static apr_status_t crypt_init(request_rec * r, const apr_crypto_driver_t *drive
} }
if (APR_SUCCESS == res) { if (APR_SUCCESS == res) {
#if CRYPTO_VERSION < 200
res = apr_crypto_passphrase(driver, r->pool, *f, dconf->passphrase, res = apr_crypto_passphrase(driver, r->pool, *f, dconf->passphrase,
#else
res = apr_crypto_passphrase(r->pool, *f, dconf->passphrase,
#endif
strlen(dconf->passphrase), strlen(dconf->passphrase),
(unsigned char *) salt, salt ? sizeof(apr_uuid_t) : 0, dconf->cipher, (unsigned char *) salt, salt ? sizeof(apr_uuid_t) : 0, dconf->cipher,
MODE_CBC, 1, 4096, key, ivSize); MODE_CBC, 1, 4096, key, ivSize);
@@ -163,7 +173,11 @@ static apr_status_t encrypt_string(request_rec * r, const apr_crypto_driver_t *d
return res; return res;
} }
#if CRYPTO_VERSION < 200
res = apr_crypto_block_encrypt_init(driver, r->pool, f, key, &iv, &block, res = apr_crypto_block_encrypt_init(driver, r->pool, f, key, &iv, &block,
#else
res = apr_crypto_block_encrypt_init(r->pool, f, key, &iv, &block,
#endif
&blockSize); &blockSize);
if (APR_SUCCESS != res) { if (APR_SUCCESS != res) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, res, r, LOG_PREFIX ap_log_rerror(APLOG_MARK, APLOG_ERR, res, r, LOG_PREFIX
@@ -172,14 +186,22 @@ static apr_status_t encrypt_string(request_rec * r, const apr_crypto_driver_t *d
} }
/* encrypt the given string */ /* encrypt the given string */
#if CRYPTO_VERSION < 200
res = apr_crypto_block_encrypt(driver, block, &encrypt, res = apr_crypto_block_encrypt(driver, block, &encrypt,
#else
res = apr_crypto_block_encrypt(f, block, &encrypt,
#endif
&encryptlen, (unsigned char *)in, strlen(in)); &encryptlen, (unsigned char *)in, strlen(in));
if (APR_SUCCESS != res) { if (APR_SUCCESS != res) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, res, r, LOG_PREFIX ap_log_rerror(APLOG_MARK, APLOG_ERR, res, r, LOG_PREFIX
"apr_crypto_block_encrypt failed"); "apr_crypto_block_encrypt failed");
return res; return res;
} }
#if CRYPTO_VERSION < 200
res = apr_crypto_block_encrypt_finish(driver, block, encrypt + encryptlen, res = apr_crypto_block_encrypt_finish(driver, block, encrypt + encryptlen,
#else
res = apr_crypto_block_encrypt_finish(f, block, encrypt + encryptlen,
#endif
&tlen); &tlen);
if (APR_SUCCESS != res) { if (APR_SUCCESS != res) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, res, r, LOG_PREFIX ap_log_rerror(APLOG_MARK, APLOG_ERR, res, r, LOG_PREFIX
@@ -244,7 +266,11 @@ static apr_status_t decrypt_string(request_rec * r, const apr_crypto_driver_t *d
decoded += sizeof(apr_uuid_t); decoded += sizeof(apr_uuid_t);
decodedlen -= sizeof(apr_uuid_t); decodedlen -= sizeof(apr_uuid_t);
#if CRYPTO_VERSION < 200
res = apr_crypto_block_decrypt_init(driver, r->pool, f, key, (unsigned char *)decoded, &block, res = apr_crypto_block_decrypt_init(driver, r->pool, f, key, (unsigned char *)decoded, &block,
#else
res = apr_crypto_block_decrypt_init(r->pool, f, key, (unsigned char *)decoded, &block,
#endif
&blockSize); &blockSize);
if (APR_SUCCESS != res) { if (APR_SUCCESS != res) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, res, r, LOG_PREFIX ap_log_rerror(APLOG_MARK, APLOG_ERR, res, r, LOG_PREFIX
@@ -257,7 +283,11 @@ static apr_status_t decrypt_string(request_rec * r, const apr_crypto_driver_t *d
decodedlen -= ivSize; decodedlen -= ivSize;
/* decrypt the given string */ /* decrypt the given string */
#if CRYPTO_VERSION < 200
res = apr_crypto_block_decrypt(driver, block, &decrypted, res = apr_crypto_block_decrypt(driver, block, &decrypted,
#else
res = apr_crypto_block_decrypt(f, block, &decrypted,
#endif
&decryptedlen, (unsigned char *)decoded, decodedlen); &decryptedlen, (unsigned char *)decoded, decodedlen);
if (res) { if (res) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, res, r, LOG_PREFIX ap_log_rerror(APLOG_MARK, APLOG_ERR, res, r, LOG_PREFIX
@@ -266,7 +296,11 @@ static apr_status_t decrypt_string(request_rec * r, const apr_crypto_driver_t *d
} }
*out = (char *) decrypted; *out = (char *) decrypted;
#if CRYPTO_VERSION < 200
res = apr_crypto_block_decrypt_finish(driver, block, decrypted + decryptedlen, res = apr_crypto_block_decrypt_finish(driver, block, decrypted + decryptedlen,
#else
res = apr_crypto_block_decrypt_finish(f, block, decrypted + decryptedlen,
#endif
&tlen); &tlen);
if (APR_SUCCESS != res) { if (APR_SUCCESS != res) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, res, r, LOG_PREFIX ap_log_rerror(APLOG_MARK, APLOG_ERR, res, r, LOG_PREFIX