diff options
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs | 10 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/Capabilities/Caps.cs | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs b/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs index 1b3e70d..038c591 100644 --- a/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs +++ b/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs | |||
@@ -163,8 +163,11 @@ namespace OpenSim.Framework.Communications.Cache | |||
163 | passwordIterations); | 163 | passwordIterations); |
164 | 164 | ||
165 | // Use the password to generate pseudo-random bytes for the encryption | 165 | // Use the password to generate pseudo-random bytes for the encryption |
166 | // key. Specify the size of the key in bytes (instead of bits). | 166 | // key. Specify the size of the key in bytes (instead |
167 | // of bits). | ||
168 | #pragma warning disable 0618 | ||
167 | byte[] keyBytes = password.GetBytes(keySize / 8); | 169 | byte[] keyBytes = password.GetBytes(keySize / 8); |
170 | #pragma warning restore 0618 | ||
168 | 171 | ||
169 | // Create uninitialized Rijndael encryption object. | 172 | // Create uninitialized Rijndael encryption object. |
170 | RijndaelManaged symmetricKey = new RijndaelManaged(); | 173 | RijndaelManaged symmetricKey = new RijndaelManaged(); |
@@ -276,8 +279,11 @@ namespace OpenSim.Framework.Communications.Cache | |||
276 | passwordIterations); | 279 | passwordIterations); |
277 | 280 | ||
278 | // Use the password to generate pseudo-random bytes for the encryption | 281 | // Use the password to generate pseudo-random bytes for the encryption |
279 | // key. Specify the size of the key in bytes (instead of bits). | 282 | // key. Specify the size of the key in bytes (instead |
283 | // of bits). | ||
284 | #pragma warning disable 0618 | ||
280 | byte[] keyBytes = password.GetBytes(keySize / 8); | 285 | byte[] keyBytes = password.GetBytes(keySize / 8); |
286 | #pragma warning restore 0618 | ||
281 | 287 | ||
282 | // Create uninitialized Rijndael encryption object. | 288 | // Create uninitialized Rijndael encryption object. |
283 | RijndaelManaged symmetricKey = new RijndaelManaged(); | 289 | RijndaelManaged symmetricKey = new RijndaelManaged(); |
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index a370eea..25a69f7 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs | |||
@@ -35,7 +35,7 @@ using log4net; | |||
35 | using OpenSim.Framework.Communications.Cache; | 35 | using OpenSim.Framework.Communications.Cache; |
36 | using OpenSim.Framework.Servers; | 36 | using OpenSim.Framework.Servers; |
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Region.Interfaces; | 38 | // using OpenSim.Region.Framework.Interfaces; |
39 | 39 | ||
40 | namespace OpenSim.Framework.Communications.Capabilities | 40 | namespace OpenSim.Framework.Communications.Capabilities |
41 | { | 41 | { |