commit e7abe7ea3a78e4cd69e59a7dcf200e95f3072854
author Ben Reser <breser@apache.org> Fri Jun 06 19:13:21 2014 +0000
committer Ben Reser <breser@apache.org> Fri Jun 06 19:13:21 2014 +0000
tree c2afd3d44cfcf18a940564b799b846702c499f35
parent 4620e9d031b7f5f968334f2bddb3df1ab97673b2

On the 1.7.x-md5-collision branch: Merge r1550691, r1550772, r1600909 from trunk.

svn_hash_gets(...) was changed to apr_hash_get(..., APR_HASH_KEY_STRING) since
the svn_hash_gets() macro was not available in 1.7.x.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-md5-collision@1600983 13f79535-47bb-0310-9956-ffa450edef68

subversion/libsvn_subr/config_auth.c

diff --git a/subversion/libsvn_subr/config_auth.c b/subversion/libsvn_subr/config_auth.c
index bdf8f2f..3e8f3b6 100644
--- a/subversion/libsvn_subr/config_auth.c
+++ b/subversion/libsvn_subr/config_auth.c
@@ -90,6 +90,7 @@
   if (kind == svn_node_file)
     {
       svn_stream_t *stream;
+      svn_string_t *stored_realm;
 
       SVN_ERR_W(svn_stream_open_readonly(&stream, auth_path, pool, pool),
                 _("Unable to open auth file for reading"));
@@ -100,6 +101,12 @@
                 apr_psprintf(pool, _("Error parsing '%s'"),
                              svn_dirent_local_style(auth_path, pool)));
 
+      stored_realm = apr_hash_get(*hash, SVN_CONFIG_REALMSTRING_KEY,
+                                  APR_HASH_KEY_STRING);
+
+      if (!stored_realm || strcmp(stored_realm->data, realmstring) != 0)
+        *hash = NULL; /* Hash collision, or somebody tampering with storage */
+
       SVN_ERR(svn_stream_close(stream));
     }