Pullup ticket #4563 - requested by spz

lang/mono2: security patch

Revisions pulled up:
- lang/mono2/Makefile                                           1.15 via patch
- lang/mono2/distinfo                                           1.6
- lang/mono2/patches/patch-CVE-2012-3382                        1.1
- lang/mono2/patches/patch-mcs_class_System.Web_System.Web.UI_Page.cs 1.1
- lang/mono2/patches/patch-mcs_class_System.Web_System.Web.Util_SecureHashCodeProvider.cs 1.1
- lang/mono2/patches/patch-mcs_class_System.Web_System.Web.dll.sources 1.1
- lang/mono2/patches/patch-mcs_class_System.Web_System.Web_WebROCollection.cs 1.1

---
   Module Name:	pkgsrc
   Committed By:	spz
   Date:		Sun Nov 30 21:51:44 UTC 2014

   Modified Files:
   	pkgsrc/lang/mono2: Makefile distinfo
   Added Files:
   	pkgsrc/lang/mono2/patches: patch-CVE-2012-3382
   	    patch-mcs_class_System.Web_System.Web.UI_Page.cs
   	    patch-mcs_class_System.Web_System.Web.Util_SecureHashCodeProvider.cs
   	    patch-mcs_class_System.Web_System.Web.dll.sources
   	    patch-mcs_class_System.Web_System.Web_WebROCollection.cs

   Log Message:
   add patches for CVE-2012-3543 and CVE-2012-3382 from upstream

1 files changed, 140 insertions, 0 deletions

diff --git a/lang/mono2/patches/patch-mcs_class_System.Web_System.Web.Util_SecureHashCodeProvider.cs b/lang/mono2/patches/patch-mcs_class_System.Web_System.Web.Util_SecureHashCodeProvider.cs
new file mode 100644
index 00000000000..e07aabd4e53
--- /dev/null
+++ b/lang/mono2/patches/patch-mcs_class_System.Web_System.Web.Util_SecureHashCodeProvider.cs
@@ -0,0 +1,140 @@
+$NetBSD: patch-mcs_class_System.Web_System.Web.Util_SecureHashCodeProvider.cs,v 1.1.2.2 2014/12/02 22:59:51 tron Exp $
+
+patch for CVE-2012-3543 taken from
+https://github.com/mono/mono/commit/2ab1a051058fee5ea3aec2e071fba7000b693488
+part 1
+
+--- mcs/class/System.Web/System.Web.Util/SecureHashCodeProvider.cs.orig	2014-11-29 12:16:37.000000000 +0000
++++ mcs/class/System.Web/System.Web.Util/SecureHashCodeProvider.cs
+@@ -0,0 +1,131 @@
++//
++// System.Collections.SecureHashCodeProvider.cs
++//
++// Authors:
++// Sergey Chaban (serge@wildwestsoftware.com)
++// Andreas Nahr (ClassDevelopment@A-SoftTech.com)
++// Sebastien Pouliot <sebastien@ximian.com>
++//
++// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
++// Copyright 2012 Xamarin, Inc (http://xamarin.com)
++//
++// Permission is hereby granted, free of charge, to any person obtaining
++// a copy of this software and associated documentation files (the
++// "Software"), to deal in the Software without restriction, including
++// without limitation the rights to use, copy, modify, merge, publish,
++// distribute, sublicense, and/or sell copies of the Software, and to
++// permit persons to whom the Software is furnished to do so, subject to
++// the following conditions:
++//
++// The above copyright notice and this permission notice shall be
++// included in all copies or substantial portions of the Software.
++//
++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
++// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
++// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
++// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++//
++using System;
++using System.Collections;
++using System.Globalization;
++
++namespace System.Web.Util
++{
++	class SecureHashCodeProvider : IHashCodeProvider
++	{
++		static readonly SecureHashCodeProvider singletonInvariant = new SecureHashCodeProvider (CultureInfo.InvariantCulture);
++		static SecureHashCodeProvider singleton;
++		static readonly object sync = new object ();
++		static readonly int seed;
++
++		TextInfo m_text; // must match MS name for serialization
++
++		public static SecureHashCodeProvider Default {
++			get {
++				lock (sync) {
++					if (singleton == null) {
++						singleton = new SecureHashCodeProvider ();
++					} else if (singleton.m_text == null) {
++						if (!AreEqual (CultureInfo.CurrentCulture, CultureInfo.InvariantCulture))
++							singleton = new SecureHashCodeProvider ();
++					} else if (!AreEqual (singleton.m_text, CultureInfo.CurrentCulture)) {
++						singleton = new SecureHashCodeProvider ();
++					}
++					return singleton;
++				}
++			}
++		}
++
++		public static SecureHashCodeProvider DefaultInvariant {
++			get { return singletonInvariant; }
++		}
++
++		static SecureHashCodeProvider ()
++		{
++			// It should be enough to fend off the attack described in
++			// https://bugzilla.novell.com/show_bug.cgi?id=739119
++			// In order to predict value of the seed, the attacker would have to know the exact time when
++			// the server process started and since it's a remote attack, this is next to impossible.
++			// Using milliseconds instead of ticks here would make it easier for the attackers since there
++			// would only be as many as 1000 possible values
++			seed = (int)DateTime.UtcNow.Ticks;
++		}
++
++		// Public instance constructor
++		public SecureHashCodeProvider ()
++		{
++			CultureInfo culture = CultureInfo.CurrentCulture;
++			if (!AreEqual (culture, CultureInfo.InvariantCulture))
++				m_text = CultureInfo.CurrentCulture.TextInfo;
++		}
++
++		public SecureHashCodeProvider (CultureInfo culture)
++		{
++			if (culture == null)
++				throw new ArgumentNullException ("culture");
++			if (!AreEqual (culture, CultureInfo.InvariantCulture))
++				m_text = culture.TextInfo;
++		}
++
++		static bool AreEqual (CultureInfo a, CultureInfo b)
++		{
++			return a.LCID == b.LCID;
++		}
++
++		static bool AreEqual (TextInfo info, CultureInfo culture)
++		{
++			return info.LCID == culture.LCID;
++		}
++
++		public int GetHashCode (object obj)
++		{
++			if (obj == null)
++				throw new ArgumentNullException ("obj");
++
++			string str = obj as string;
++
++			if (str == null)
++				return obj.GetHashCode ();
++
++			int h = seed;
++			char c;
++
++			if ((m_text != null) && !AreEqual (m_text, CultureInfo.InvariantCulture)) {
++				str = m_text.ToLower (str);
++				for (int i = 0; i < str.Length; i++) {
++					c = str [i];
++					h = h * 31 + c;
++				}
++			} else {
++				for (int i = 0; i < str.Length; i++) {
++					c = Char.ToLower (str [i], CultureInfo.InvariantCulture);
++					h = h * 31 + c;
++				}
++			}
++			return h;
++		}
++	}
++}