svn commit: r1127665 - /apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c

[mi...@apache.org]

Author: minfrin
Date: Wed May 25 20:07:08 2011
New Revision: 1127665

URL: http://svn.apache.org/viewvc?rev=1127665&view=rev
Log:
apr_crypto: Correct the variables passed in the API, fix build breakage
for the nss implementation.

Modified:
    apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c

Modified: apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c?rev=1127665&r1=1127664&r2=1127665&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c (original)
+++ apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c Wed May 25 20:07:08 2011
@@ -488,8 +488,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;
     }
 
@@ -521,7 +521,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;
@@ -572,7 +572,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;
@@ -649,8 +649,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;
     }