diff options
| author | Jose <jose@zeroc.com> | 2015-04-01 14:49:36 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-04-01 14:49:36 +0200 |
| commit | eb5749bee9ea0fc46211d365f1e21a6b460bc30d (patch) | |
| tree | a5f44b79782cb2997e89dc6e3aafb0397f554afe /csharp/test | |
| parent | SSL fixes (bis) (diff) | |
| download | ice-eb5749bee9ea0fc46211d365f1e21a6b460bc30d.tar.bz2 ice-eb5749bee9ea0fc46211d365f1e21a6b460bc30d.tar.xz ice-eb5749bee9ea0fc46211d365f1e21a6b460bc30d.zip | |
ICE-6383 - Update crypt password usage
Added new script to create crypt passwords using passlib
scripts/cryptpasswd.py
Remove tests passwords files they are now generated using
cryptpasswd script
Update CryptPermissionsVerifierI to support PBKDF2 password schemes
in Windows and OS X, and MD5/SHA256/SHA512 crypt in Linux, on other
systems fallback to DES_crypt from openssl
Diffstat (limited to 'csharp/test')
| -rw-r--r-- | csharp/test/Glacier2/router/passwords | 1 | ||||
| -rwxr-xr-x | csharp/test/Glacier2/router/run.py | 5 | ||||
| -rw-r--r-- | csharp/test/Glacier2/sessionHelper/passwords | 1 | ||||
| -rwxr-xr-x | csharp/test/Glacier2/sessionHelper/run.py | 5 |
4 files changed, 10 insertions, 2 deletions
diff --git a/csharp/test/Glacier2/router/passwords b/csharp/test/Glacier2/router/passwords deleted file mode 100644 index a1527dec2b9..00000000000 --- a/csharp/test/Glacier2/router/passwords +++ /dev/null @@ -1 +0,0 @@ -userid xxMqsnnDcK8tw
\ No newline at end of file diff --git a/csharp/test/Glacier2/router/run.py b/csharp/test/Glacier2/router/run.py index 4b88f3f882a..c32b3873c0c 100755 --- a/csharp/test/Glacier2/router/run.py +++ b/csharp/test/Glacier2/router/run.py @@ -22,6 +22,11 @@ import TestUtil router = os.path.join(TestUtil.getCppBinDir(), "glacier2router") +# +# Generate the crypt passwords file +# +TestUtil.cryptPasswords(os.path.join(os.getcwd(), "passwords"), {"userid": "abc123"}) + args = ' --Ice.Warn.Dispatch=0' + \ ' --Ice.Warn.Connections=0' + \ ' --Glacier2.Filter.Category.Accept="c1 c2"' + \ diff --git a/csharp/test/Glacier2/sessionHelper/passwords b/csharp/test/Glacier2/sessionHelper/passwords deleted file mode 100644 index a1527dec2b9..00000000000 --- a/csharp/test/Glacier2/sessionHelper/passwords +++ /dev/null @@ -1 +0,0 @@ -userid xxMqsnnDcK8tw
\ No newline at end of file diff --git a/csharp/test/Glacier2/sessionHelper/run.py b/csharp/test/Glacier2/sessionHelper/run.py index 1565361b923..4bfc2a41224 100755 --- a/csharp/test/Glacier2/sessionHelper/run.py +++ b/csharp/test/Glacier2/sessionHelper/run.py @@ -20,6 +20,11 @@ if len(path) == 0: sys.path.append(os.path.join(path[0], "scripts")) import TestUtil +# +# Generate the crypt passwords file +# +TestUtil.cryptPasswords(os.path.join(os.getcwd(), "passwords"), {"userid": "abc123"}) + router = os.path.join(TestUtil.getCppBinDir(), "glacier2router") args = ' --Ice.Warn.Dispatch=0' + \ |