diff options
author | Adam Frisby | 2008-10-14 08:54:46 +0000 |
---|---|---|
committer | Adam Frisby | 2008-10-14 08:54:46 +0000 |
commit | 54d7be8a49cbbd47217df84c131221b19e66f0e3 (patch) | |
tree | 0c29dd79163dda99da1855d523e4c8c0b70c32f0 /OpenSim/Region | |
parent | * Cleaned up tons of code duplication in ODEPrim (diff) | |
download | opensim-SC-54d7be8a49cbbd47217df84c131221b19e66f0e3.zip opensim-SC-54d7be8a49cbbd47217df84c131221b19e66f0e3.tar.gz opensim-SC-54d7be8a49cbbd47217df84c131221b19e66f0e3.tar.bz2 opensim-SC-54d7be8a49cbbd47217df84c131221b19e66f0e3.tar.xz |
* Adding CrytoGridAssetClient support - allows encrypting assets that are stored on a potentially hostile grid. This is not DRM, not should be relied on until after it's been security audited. I'll write a blog post on this explaining how/why/when you should use this, and what it does.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 7598e16..eff2422 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -418,6 +418,16 @@ namespace OpenSim | |||
418 | { | 418 | { |
419 | assetServer = new GridAssetClient(m_networkServersInfo.AssetURL); | 419 | assetServer = new GridAssetClient(m_networkServersInfo.AssetURL); |
420 | } | 420 | } |
421 | else if (m_assetStorage == "cryptogrid") // Decrypt-Only | ||
422 | { | ||
423 | assetServer = new CryptoGridAssetClient(m_networkServersInfo.AssetURL, | ||
424 | Environment.CurrentDirectory, true); | ||
425 | } | ||
426 | else if (m_assetStorage == "cryptogrid_eou") // Encrypts All Assets | ||
427 | { | ||
428 | assetServer = new CryptoGridAssetClient(m_networkServersInfo.AssetURL, | ||
429 | Environment.CurrentDirectory, false); | ||
430 | } | ||
421 | else if (m_assetStorage == "file") | 431 | else if (m_assetStorage == "file") |
422 | { | 432 | { |
423 | assetServer = new FileAssetClient(m_networkServersInfo.AssetURL); | 433 | assetServer = new FileAssetClient(m_networkServersInfo.AssetURL); |