Merge pull request #3968 from BrzVlad/fix-monitor-exception

[mono.git] / data / net_4_0 / machine.config

diff --git a/data/net_4_0/machine.config b/data/net_4_0/machine.config
index 2957a3cc33ea42622483cbab5dd9c07f40f1f59a..30bc2105f3afba38b6ccfc3e99991b770ea41f30 100644 (file)
--- a/data/net_4_0/machine.config
+++ b/data/net_4_0/machine.config
@@ -135,9 +135,6 @@
                        <add prefix="file" type="System.Net.FileWebRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
                        <add prefix="ftp" type="System.Net.FtpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
                </webRequestModules>
-               <settings>
-                       <ipv6 enabled="false"/>
-               </settings>
        </system.net>
        
        <system.runtime.remoting>
@@ -214,12 +211,16 @@
                        <cryptoNameMapping>
                                <cryptoClasses>
                                        <cryptoClass monoMD2="Mono.Security.Cryptography.MD2Managed, Mono.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+                                       <cryptoClass monoMD4="Mono.Security.Cryptography.MD4Managed, Mono.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
                                </cryptoClasses>
                                <nameEntry name="MD2" class="monoMD2" />
+                               <nameEntry name="MD4" class="monoMD4" />
                        </cryptoNameMapping>
                        <oidMap>
                                <oidEntry OID="1.2.840.113549.2.2" name="MD2" />
                                <oidEntry OID="1.2.840.113549.2.2" name="Mono.Security.Cryptography.MD2Managed" />
+                               <oidEntry OID="1.2.840.113549.2.4" name="MD4" />
+                               <oidEntry OID="1.2.840.113549.2.4" name="Mono.Security.Cryptography.MD4Managed" />
                        </oidMap>
                </cryptographySettings>
        </mscorlib>