diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Servers/BaseHttpServer.cs | 6 | ||||
-rw-r--r-- | OpenSim/Framework/Util.cs | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index bde1f7e..264ffae 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs | |||
@@ -102,7 +102,7 @@ namespace OpenSim.Framework.Servers | |||
102 | m_port = port; | 102 | m_port = port; |
103 | if (m_ssl) | 103 | if (m_ssl) |
104 | { | 104 | { |
105 | bool result = SetupSsl((int)sslport, CN); | 105 | SetupSsl((int)sslport, CN); |
106 | m_sslport = sslport; | 106 | m_sslport = sslport; |
107 | } | 107 | } |
108 | } | 108 | } |
@@ -155,7 +155,7 @@ namespace OpenSim.Framework.Servers | |||
155 | } | 155 | } |
156 | catch (Exception e) | 156 | catch (Exception e) |
157 | { | 157 | { |
158 | m_log.WarnFormat("[HTTPS]: Automatic HTTPS setup failed. Do you have httpcfg.exe in your path? If not, you can download it in the windowsXP Service Pack 2 Support Tools, here: http://www.microsoft.com/downloads/details.aspx?FamilyID=49ae8576-9bb9-4126-9761-ba8011fabf38&displaylang=en. When you get it installed type, httpcfg {0}", httpcfgparams); | 158 | m_log.WarnFormat("[HTTPS]: Automatic HTTPS setup failed. Do you have httpcfg.exe in your path? If not, you can download it in the windowsXP Service Pack 2 Support Tools, here: http://www.microsoft.com/downloads/details.aspx?FamilyID=49ae8576-9bb9-4126-9761-ba8011fabf38&displaylang=en. When you get it installed type, httpcfg {0} - {1}", httpcfgparams, e); |
159 | return false; | 159 | return false; |
160 | } | 160 | } |
161 | } | 161 | } |
@@ -170,7 +170,7 @@ namespace OpenSim.Framework.Servers | |||
170 | } | 170 | } |
171 | catch (Exception e) | 171 | catch (Exception e) |
172 | { | 172 | { |
173 | m_log.WarnFormat("[HTTPS]: We didn't any certificates in your LocalMachine certificate store. Automatic HTTPS setup failed, you may have certificate errors. To fix this, make sure you generate a certificate request(CSR) using OpenSSL or the IIS snap-inwith the common name you specified in opensim.ini. Then get it signed by a certification authority or sign it yourself with OpenSSL and the junkCA. Finally, be sure to import the cert to the 'MY' store(StoreLocation.LocalMachine). The configured common name is {0}", searchCN); | 173 | m_log.WarnFormat("[HTTPS]: We didn't any certificates in your LocalMachine certificate store. Automatic HTTPS setup failed, you may have certificate errors. To fix this, make sure you generate a certificate request(CSR) using OpenSSL or the IIS snap-inwith the common name you specified in opensim.ini. Then get it signed by a certification authority or sign it yourself with OpenSSL and the junkCA. Finally, be sure to import the cert to the 'MY' store(StoreLocation.LocalMachine). The configured common name is {0} - {1}", searchCN, e); |
174 | return false; | 174 | return false; |
175 | } | 175 | } |
176 | finally | 176 | finally |
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 333ab81..ec03d25 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
@@ -116,10 +116,6 @@ namespace OpenSim.Framework | |||
116 | 116 | ||
117 | # endregion | 117 | # endregion |
118 | 118 | ||
119 | public Util() | ||
120 | { | ||
121 | } | ||
122 | |||
123 | public static Random RandomClass | 119 | public static Random RandomClass |
124 | { | 120 | { |
125 | get { return randomClass; } | 121 | get { return randomClass; } |
@@ -256,6 +252,11 @@ namespace OpenSim.Framework | |||
256 | return epoch.AddSeconds(seconds); | 252 | return epoch.AddSeconds(seconds); |
257 | } | 253 | } |
258 | 254 | ||
255 | /// <summary> | ||
256 | /// Return an md5 hash of the given string | ||
257 | /// </summary> | ||
258 | /// <param name="pass"></param> | ||
259 | /// <returns></returns> | ||
259 | public static string Md5Hash(string pass) | 260 | public static string Md5Hash(string pass) |
260 | { | 261 | { |
261 | MD5 md5 = MD5CryptoServiceProvider.Create(); | 262 | MD5 md5 = MD5CryptoServiceProvider.Create(); |