You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by mi...@apache.org on 2011/05/25 21:39:37 UTC
svn commit: r1127649 - /apr/apr/trunk/crypto/apr_crypto_nss.c
Author: minfrin
Date: Wed May 25 19:39:36 2011
New Revision: 1127649
URL: http://svn.apache.org/viewvc?rev=1127649&view=rev
Log:
apr_crypto: Correct the variables passed in the API, fix build breakage
for the nss implementation.
Modified:
apr/apr/trunk/crypto/apr_crypto_nss.c
Modified: apr/apr/trunk/crypto/apr_crypto_nss.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_crypto_nss.c?rev=1127649&r1=1127648&r2=1127649&view=diff
==============================================================================
--- apr/apr/trunk/crypto/apr_crypto_nss.c (original)
+++ apr/apr/trunk/crypto/apr_crypto_nss.c Wed May 25 19:39:36 2011
@@ -489,8 +489,8 @@ static apr_status_t crypto_block_encrypt
/* did an error occur? */
perr = PORT_GetError();
if (perr || !block->ctx) {
- f->result->rc = perr;
- f->result->msg = PR_ErrorToName(perr);
+ key->f->result->rc = perr;
+ key->f->result->msg = PR_ErrorToName(perr);
return APR_EINIT;
}
@@ -522,7 +522,7 @@ static apr_status_t crypto_block_encrypt
*/
static apr_status_t crypto_block_encrypt(unsigned char **out,
apr_size_t *outlen, const unsigned char *in, apr_size_t inlen,
- apr_crypto_block_t *ctx)
+ apr_crypto_block_t *block)
{
unsigned char *buffer;
@@ -573,7 +573,7 @@ static apr_status_t crypto_block_encrypt
* @return APR_ENOTIMPL if not implemented.
*/
static apr_status_t crypto_block_encrypt_finish(unsigned char *out,
- apr_size_t *outlen, apr_crypto_block_t *ctx)
+ apr_size_t *outlen, apr_crypto_block_t *block)
{
apr_status_t rv = APR_SUCCESS;
@@ -650,8 +650,8 @@ static apr_status_t crypto_block_decrypt
/* did an error occur? */
perr = PORT_GetError();
if (perr || !block->ctx) {
- f->result->rc = perr;
- f->result->msg = PR_ErrorToName(perr);
+ key->f->result->rc = perr;
+ key->f->result->msg = PR_ErrorToName(perr);
return APR_EINIT;
}