You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/10/21 16:43:47 UTC
svn commit: r1534184 - in /subversion/trunk/subversion: libsvn_subr/auth.c
tests/libsvn_subr/auth-test.c
Author: rhuijben
Date: Mon Oct 21 14:43:47 2013
New Revision: 1534184
URL: http://svn.apache.org/r1534184
Log:
Following up on r1534153, fix initializing the ssl provider for server
certificates and the code that tests the platform specific handling.
The reason this wasn't detected is that in general certificates are now
accepted via the root authority, instead of per certificate.
* subversion/libsvn_subr/auth.c
(svn_auth_get_platform_specific_client_providers): Store provider in list.
* subversion/tests/libsvn_subr/auth-test.c
(test_platform_specific_auth_providers): Update assumption and error message.
Modified:
subversion/trunk/subversion/libsvn_subr/auth.c
subversion/trunk/subversion/tests/libsvn_subr/auth-test.c
Modified: subversion/trunk/subversion/libsvn_subr/auth.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/auth.c?rev=1534184&r1=1534183&r2=1534184&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/auth.c (original)
+++ subversion/trunk/subversion/libsvn_subr/auth.c Mon Oct 21 14:43:47 2013
@@ -665,6 +665,7 @@ svn_auth_get_platform_specific_client_pr
"windows",
"ssl_server_trust",
pool));
+ SVN__MAYBE_ADD_PROVIDER(*providers, provider);
/* The windows ssl authority certificate CRYPTOAPI provider. */
SVN_ERR(svn_auth_get_platform_specific_provider(&provider,
Modified: subversion/trunk/subversion/tests/libsvn_subr/auth-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/auth-test.c?rev=1534184&r1=1534183&r2=1534184&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/auth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/auth-test.c Mon Oct 21 14:43:47 2013
@@ -63,13 +63,14 @@ test_platform_specific_auth_providers(ap
number_of_providers += 2;
#endif
#if defined(WIN32) && !defined(__MINGW32__)
- number_of_providers += 2;
+ number_of_providers += 4;
#endif
if (providers->nelts != number_of_providers)
return svn_error_createf
(SVN_ERR_TEST_FAILED, NULL,
"svn_auth_get_platform_specific_client_providers should return " \
- "an array of %d providers", number_of_providers);
+ "an array of %d providers, but returned %d providers",
+ number_of_providers, providers->nelts);
/* Test Keychain auth providers */
#ifdef SVN_HAVE_KEYCHAIN_SERVICES