Author: minfrin
Date: Sat Jan  3 09:49:09 2009
New Revision: 731040

URL: http://svn.apache.org/viewvc?rev=731040&view=rev
Log:
Backport r731034 to the apr-util v1.4 branch

Modified:
    apr/apr-util/branches/1.4.x/   (props changed)
    apr/apr-util/branches/1.4.x/CHANGES
    apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c

Propchange: apr/apr-util/branches/1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan  3 09:49:09 2009
@@ -1 +1 @@
-/apr/apr-util/trunk:731033
+/apr/apr-util/trunk:731033-731034

Modified: apr/apr-util/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/CHANGES?rev=731040&r1=731039&r2=731040&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.4.x/CHANGES [utf-8] Sat Jan  3 09:49:09 2009
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR-util 1.4.0
 
+  *) Fix a bogus initialisation of the IV size in the NSS crypto driver.
+     [Graham Leggett]
+
   *) Make sure that the underlying result code during driver initialisation
      is exposed to the caller. [Graham Leggett]
 

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=731040&r1=731039&r2=731040&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 Sat Jan  3 09:49:09 2009
@@ -421,7 +421,6 @@
 {
     PRErrorCode perr;
     SECItem * secParam;
-    int usedIvSize;
     SECItem ivItem;
     unsigned char * usedIv;
     apr_crypto_block_t *block = *ctx;
@@ -457,7 +456,7 @@
              usedIv = (unsigned char *)*iv;
         }
         ivItem.data = usedIv;
-        ivItem.len = usedIvSize;
+        ivItem.len = key->ivSize;
         secParam = PK11_ParamFromIV(key->cipherMech, &ivItem);
     }
     else {