You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by rj...@apache.org on 2010/07/25 21:13:17 UTC
svn commit: r979091 - in /apr/apr-util/branches/1.5.x/crypto:
apr_crypto_nss.c apr_crypto_openssl.c
Author: rjung
Date: Sun Jul 25 19:13:17 2010
New Revision: 979091
URL: http://svn.apache.org/viewvc?rev=979091&view=rev
Log:
Fix order of elements in struct.
Was broken by reordering in struct definition (r900090).
Backport of r979076 from apr trunk.
Modified:
apr/apr-util/branches/1.5.x/crypto/apr_crypto_nss.c
apr/apr-util/branches/1.5.x/crypto/apr_crypto_openssl.c
Modified: apr/apr-util/branches/1.5.x/crypto/apr_crypto_nss.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/crypto/apr_crypto_nss.c?rev=979091&r1=979090&r2=979091&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/crypto/apr_crypto_nss.c (original)
+++ apr/apr-util/branches/1.5.x/crypto/apr_crypto_nss.c Sun Jul 25 19:13:17 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.5.x/crypto/apr_crypto_openssl.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/crypto/apr_crypto_openssl.c?rev=979091&r1=979090&r2=979091&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/crypto/apr_crypto_openssl.c (original)
+++ apr/apr-util/branches/1.5.x/crypto/apr_crypto_openssl.c Sun Jul 25 19:13:17 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