From commits-return-11389-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Sun Jul 25 19:18:17 2010 Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 25228 invoked from network); 25 Jul 2010 19:18:17 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 25 Jul 2010 19:18:17 -0000 Received: (qmail 58922 invoked by uid 500); 25 Jul 2010 19:18:17 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 58877 invoked by uid 500); 25 Jul 2010 19:18:16 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 58870 invoked by uid 99); 25 Jul 2010 19:18:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Jul 2010 19:18:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Jul 2010 19:18:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4E71A2388903; Sun, 25 Jul 2010 19:17:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r979092 - in /apr/apr-util/branches/1.4.x/crypto: apr_crypto_nss.c apr_crypto_openssl.c Date: Sun, 25 Jul 2010 19:17:21 -0000 To: commits@apr.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100725191721.4E71A2388903@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rjung Date: Sun Jul 25 19:17:20 2010 New Revision: 979092 URL: http://svn.apache.org/viewvc?rev=979092&view=rev Log: Fix order of elements in struct. Was broken by reordering in struct definition (r900091). Backport of r979076 from apr trunk resp. r979091 from the 1.5.x apr-util branch. Modified: apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c apr/apr-util/branches/1.4.x/crypto/apr_crypto_openssl.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=979092&r1=979091&r2=979092&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 Sun Jul 25 19:17:20 2010 @@ -770,12 +770,11 @@ static apr_status_t crypto_block_decrypt } /** - * OpenSSL module. + * NSS module. */ APU_MODULE_DECLARE_DATA const apr_crypto_driver_t apr_crypto_nss_driver = { "nss", crypto_init, - crypto_error, crypto_make, crypto_passphrase, crypto_block_encrypt_init, @@ -786,7 +785,8 @@ APU_MODULE_DECLARE_DATA const apr_crypto crypto_block_decrypt_finish, crypto_block_cleanup, crypto_cleanup, - crypto_shutdown + crypto_shutdown, + crypto_error }; #endif Modified: apr/apr-util/branches/1.4.x/crypto/apr_crypto_openssl.c URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/crypto/apr_crypto_openssl.c?rev=979092&r1=979091&r2=979092&view=diff ============================================================================== --- apr/apr-util/branches/1.4.x/crypto/apr_crypto_openssl.c (original) +++ apr/apr-util/branches/1.4.x/crypto/apr_crypto_openssl.c Sun Jul 25 19:17:20 2010 @@ -648,10 +648,10 @@ static apr_status_t crypto_block_decrypt * OpenSSL module. */ APU_MODULE_DECLARE_DATA const apr_crypto_driver_t apr_crypto_openssl_driver = { - "openssl", crypto_init, crypto_error, crypto_make, crypto_passphrase, + "openssl", crypto_init, crypto_make, crypto_passphrase, crypto_block_encrypt_init, crypto_block_encrypt, crypto_block_encrypt_finish, crypto_block_decrypt_init, crypto_block_decrypt, crypto_block_decrypt_finish, - crypto_block_cleanup, crypto_cleanup, crypto_shutdown }; + crypto_block_cleanup, crypto_cleanup, crypto_shutdown, crypto_error}; #endif