diff options
| author | Peter Dettman <peter.dettman@bouncycastle.org> | 2015-11-17 00:09:51 +0700 |
|---|---|---|
| committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2015-11-17 00:09:51 +0700 |
| commit | 07233d0041fd85754f6b84aaed8306ee10a2ae46 (patch) | |
| tree | 462ad3ced6d2fd6a31e54bb12663090c97d61ed4 | |
| parent | Merge branch 'master' of git.bouncycastle.org:bc-csharp into pcl (diff) | |
| parent | Add missing lock for PORTABLE (diff) | |
| download | BouncyCastle.NET-ed25519-07233d0041fd85754f6b84aaed8306ee10a2ae46.tar.xz | |
Merge branch 'master' of git.bouncycastle.org:bc-csharp into pcl
| -rw-r--r-- | crypto/crypto.csproj | 2 | ||||
| -rw-r--r-- | crypto/src/security/SecureRandom.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/crypto.csproj b/crypto/crypto.csproj index 0c6dba76c..395ea08df 100644 --- a/crypto/crypto.csproj +++ b/crypto/crypto.csproj @@ -11160,7 +11160,7 @@ BuildAction = "Compile" /> <File - RelPath = "test\src\crypto\prng\test\TestEntropySourcProvider.cs" + RelPath = "test\src\crypto\prng\test\TestEntropySourceProvider.cs" SubType = "Code" BuildAction = "Compile" /> diff --git a/crypto/src/security/SecureRandom.cs b/crypto/src/security/SecureRandom.cs index 875709e57..8683b4729 100644 --- a/crypto/src/security/SecureRandom.cs +++ b/crypto/src/security/SecureRandom.cs @@ -106,7 +106,7 @@ namespace Org.BouncyCastle.Security public static byte[] GetSeed(int length) { -#if NETCF_1_0 +#if NETCF_1_0 || PORTABLE lock (master) #endif return Master.GenerateSeed(length); |