diff options
| author | Graham Leggett <minfrin@apache.org> | 2011-05-15 11:39:00 +0000 |
|---|---|---|
| committer | Graham Leggett <minfrin@apache.org> | 2011-05-15 11:39:00 +0000 |
| commit | 2a1e8f277bcec19d481895a756ad5293b3914b4b (patch) | |
| tree | 8e33e80613e296a75d6056838c2cadefb8213ea0 /modules/session | |
| parent | 66760617d0a703ae8e0557d9b2011033cc1fd6d8 (diff) | |
| download | httpd-2a1e8f277bcec19d481895a756ad5293b3914b4b.tar.gz | |
Use namespace protection on mode and type constants.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1103331 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/session')
| -rw-r--r-- | modules/session/mod_session_crypto.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/session/mod_session_crypto.c b/modules/session/mod_session_crypto.c index 4583fbf057..c378ec5cf6 100644 --- a/modules/session/mod_session_crypto.c +++ b/modules/session/mod_session_crypto.c @@ -115,7 +115,7 @@ static apr_status_t crypt_init(request_rec * r, #endif strlen(dconf->passphrase), (unsigned char *) salt, salt ? sizeof(apr_uuid_t) : 0, - dconf->cipher, MODE_CBC, 1, 4096, key, ivSize); + dconf->cipher, APR_MODE_CBC, 1, 4096, key, ivSize); } if (APR_STATUS_IS_ENOKEY(res)) { @@ -481,7 +481,7 @@ static void *create_session_crypto_dir_config(apr_pool_t * p, char *dummy) (session_crypto_dir_conf *) apr_pcalloc(p, sizeof(session_crypto_dir_conf)); /* default cipher AES256-SHA */ - new->cipher = KEY_AES_256; + new->cipher = APR_KEY_AES_256; return (void *) new; } @@ -595,11 +595,11 @@ static const char *set_crypto_passphrase(cmd_parms * cmd, void *config, const ch } else if (!strcasecmp(word, "cipher")) { if (!strcasecmp(val, "3des192")) { - dconf->cipher = KEY_3DES_192; + dconf->cipher = APR_KEY_3DES_192; dconf->cipher_set = 1; } else if (!strcasecmp(val, "aes256")) { - dconf->cipher = KEY_AES_256; + dconf->cipher = APR_KEY_AES_256; dconf->cipher_set = 1; } else { |