Index: /trunk/eraser6/Eraser.Manager/EntropySource.cs =================================================================== --- /trunk/eraser6/Eraser.Manager/EntropySource.cs (revision 1831) +++ /trunk/eraser6/Eraser.Manager/EntropySource.cs (revision 1832) @@ -271,10 +271,4 @@ //Ticks since start up result.AddRange(StructToBuffer(Environment.TickCount)); - - //CryptGenRandom - byte[] cryptGenRandom = new byte[160]; - if (Security.Randomise(cryptGenRandom)) - result.AddRange(cryptGenRandom); - return result.ToArray(); } @@ -293,47 +287,20 @@ result.AddRange(netApiStats); -#if false - //Get disk I/O statistics for all the hard drives - try - { - for (int drive = 0; ; ++drive) - { - //Try to open the drive. - StreamInfo info = new StreamInfo(string.Format(CultureInfo.InvariantCulture, - "\\\\.\\PhysicalDrive{0}", drive)); - using (FileStream stream = info.Open(FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) - { - SafeFileHandle device = stream.SafeFileHandle; - KernelApi.DiskPerformanceInfo diskPerformance = - KernelApi.QueryDiskPerformanceInfo(device); - if (diskPerformance != null) - { - result.AddRange(StructToBuffer(diskPerformance.BytesRead)); - result.AddRange(StructToBuffer(diskPerformance.BytesWritten)); - result.AddRange(StructToBuffer(diskPerformance.IdleTime)); - result.AddRange(StructToBuffer(diskPerformance.QueryTime)); - result.AddRange(StructToBuffer(diskPerformance.QueueDepth)); - result.AddRange(StructToBuffer(diskPerformance.ReadCount)); - result.AddRange(StructToBuffer(diskPerformance.ReadTime)); - result.AddRange(StructToBuffer(diskPerformance.SplitCount)); - result.AddRange(StructToBuffer(diskPerformance.StorageDeviceNumber)); - result.AddRange(Encoding.UTF8.GetBytes(diskPerformance.StorageManagerName)); - result.AddRange(StructToBuffer(diskPerformance.WriteCount)); - result.AddRange(StructToBuffer(diskPerformance.WriteTime)); - } - } - } - } - catch (FileNotFoundException) - { - } - catch (UnauthorizedAccessException) - { +#false + foreach (VolumeInfo info in VolumeInfo.Volumes) + { + /*DiskPerformanceInfo performance = info.Performance; + result.AddRange(StructToBuffer(performance.BytesRead)); + result.AddRange(StructToBuffer(performance.BytesWritten)); + result.AddRange(StructToBuffer(performance.IdleTime)); + result.AddRange(StructToBuffer(performance.QueryTime)); + result.AddRange(StructToBuffer(performance.QueueDepth)); + result.AddRange(StructToBuffer(performance.ReadCount)); + result.AddRange(StructToBuffer(performance.ReadTime)); + result.AddRange(StructToBuffer(performance.SplitCount)); + result.AddRange(StructToBuffer(performance.WriteCount)); + result.AddRange(StructToBuffer(performance.WriteTime));*/ } #endif - //Finally, our good friend CryptGenRandom() - byte[] cryptGenRandom = new byte[1536]; - if (Security.Randomise(cryptGenRandom)) - result.AddRange(cryptGenRandom); return result.ToArray(); Index: unk/eraser6/Eraser.Util/NativeMethods/AdvApi.cs =================================================================== --- /trunk/eraser6/Eraser.Util/NativeMethods/AdvApi.cs (revision 1831) +++ (revision ) @@ -1,164 +1,0 @@ -/* - * $Id$ - * Copyright 2008-2010 The Eraser Project - * Original Author: Joel Low - * Modified By: - * - * This file is part of Eraser. - * - * Eraser is free software: you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation, either version 3 of the License, or (at your option) any later - * version. - * - * Eraser is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - * A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * A copy of the GNU General Public License can be found at - * . - */ - -using System; -using System.Collections.Generic; -using System.Text; -using System.Runtime.InteropServices; - -namespace Eraser.Util -{ - internal static partial class NativeMethods - { - /// - /// The CryptAcquireContext function is used to acquire a handle to a - /// particular key container within a particular cryptographic service - /// provider (CSP). This returned handle is used in calls to CryptoAPI - /// functions that use the selected CSP. - /// - /// This function first attempts to find a CSP with the characteristics - /// described in the dwProvType and pszProvider parameters. If the CSP - /// is found, the function attempts to find a key container within the - /// CSP that matches the name specified by the pszContainer parameter. - /// To acquire the context and the key container of a private key - /// associated with the public key of a certificate, use - /// CryptAcquireCertificatePrivateKey. - /// - /// With the appropriate setting of dwFlags, this function can also create - /// and destroy key containers and can provide access to a CSP with a - /// temporary key container if access to a private key is not required. - /// - /// A pointer to a handle of a CSP. When you have - /// finished using the CSP, release the handle by calling the - /// CryptReleaseContext function. - /// The key container name. This is a - /// null-terminated string that identifies the key container to the CSP. - /// This name is independent of the method used to store the keys. - /// Some CSPs store their key containers internally (in hardware), - /// some use the system registry, and others use the file system. When - /// dwFlags is set to CRYPT_VERIFYCONTEXT, pszContainer must be set to NULL. - /// - /// When pszContainer is NULL, a default key container name is used. For - /// example, the Microsoft Base Cryptographic Provider uses the logon name - /// of the currently logged on user as the key container name. Other CSPs - /// can also have default key containers that can be acquired in this way. - /// - /// Applications must not use the default key container to store private - /// keys. When multiple applications use the same container, one application - /// can change or destroy the keys that another application needs to have - /// available. If applications use key containers linked to the application, - /// the risk is reduced of other applications tampering with keys necessary - /// for proper function. - /// - /// An application can obtain the name of the key container in use by - /// reading the PP_CONTAINER value with the CryptGetProvParam function. - /// A null-terminated string that specifies the - /// name of the CSP to be used. - /// - /// If this parameter is NULL, the user default provider is used. For more - /// information, see Cryptographic Service Provider Contexts. For a list - /// of available cryptographic providers, see Cryptographic Provider Names. - /// - /// An application can obtain the name of the CSP in use by using the - /// CryptGetProvParam function to read the PP_NAME CSP value in the dwParam - /// parameter. - /// - /// Due to changing export control restrictions, the default CSP can change - /// between operating system releases. To ensure interoperability on - /// different operating system platforms, the CSP should be explicitly - /// set by using this parameter instead of using the default CSP. - /// Specifies the type of provider to acquire. - /// Defined provider types are discussed in Cryptographic Provider Types. - /// Flag values. This parameter is usually set to zero, - /// but some applications set one or more flags. - /// If the function succeeds, the function returns nonzero (TRUE). - /// If the function fails, it returns zero (FALSE). For extended error - /// information, call Marshal.GetLastWin32Error. - [DllImport("Advapi32.dll", SetLastError = true, CharSet = CharSet.Unicode)] - [return: MarshalAs(UnmanagedType.Bool)] - public static extern bool CryptAcquireContext(out SafeCryptHandle phProv, - string pszContainer, string pszProvider, uint dwProvType, uint dwFlags); - - /// - /// The CryptGenRandom function fills a buffer with cryptographically random bytes. - /// - /// Handle of a cryptographic service provider (CSP) - /// created by a call to CryptAcquireContext. - /// Number of bytes of random data to be generated. - /// Buffer to receive the returned data. This buffer - /// must be at least dwLen bytes in length. - /// - /// Optionally, the application can fill this buffer with data to use as - /// an auxiliary random seed. - [DllImport("Advapi32.dll", SetLastError = true)] - [return: MarshalAs(UnmanagedType.Bool)] - public static extern bool CryptGenRandom(SafeCryptHandle hProv, uint dwLen, - byte[] pbBuffer); - - /// - /// The CryptReleaseContext function releases the handle of a cryptographic - /// service provider (CSP) and a key container. At each call to this function, - /// the reference count on the CSP is reduced by one. When the reference - /// count reaches zero, the context is fully released and it can no longer - /// be used by any function in the application. - /// - /// An application calls this function after finishing the use of the CSP. - /// After this function is called, the released CSP handle is no longer - /// valid. This function does not destroy key containers or key pairs - /// Handle of a cryptographic service provider (CSP) - /// created by a call to CryptAcquireContext. - /// Reserved for future use and must be zero. If - /// dwFlags is not set to zero, this function returns FALSE but the CSP - /// is released. - /// If the function succeeds, the return value is nonzero (TRUE). - /// - /// If the function fails, the return value is zero (FALSE). For extended - /// error information, call Marshal.GetLastWin32Error. - [DllImport("Advapi32.dll", SetLastError = true)] - [return: MarshalAs(UnmanagedType.Bool)] - public static extern bool CryptReleaseContext(IntPtr hProv, uint dwFlags); - - public const uint PROV_RSA_FULL = 1; - public const uint PROV_RSA_SIG = 2; - public const uint PROV_DSS = 3; - public const uint PROV_FORTEZZA = 4; - public const uint PROV_MS_EXCHANGE = 5; - public const uint PROV_SSL = 6; - public const uint PROV_RSA_SCHANNEL = 12; - public const uint PROV_DSS_DH = 13; - public const uint PROV_EC_ECDSA_SIG = 14; - public const uint PROV_EC_ECNRA_SIG = 15; - public const uint PROV_EC_ECDSA_FULL = 16; - public const uint PROV_EC_ECNRA_FULL = 17; - public const uint PROV_DH_SCHANNEL = 18; - public const uint PROV_SPYRUS_LYNKS = 20; - public const uint PROV_RNG = 21; - public const uint PROV_INTEL_SEC = 22; - - public const int NTE_BAD_KEYSET = unchecked((int)0x80090016); - - public const uint CRYPT_VERIFYCONTEXT = 0xF0000000; - public const uint CRYPT_NEWKEYSET = 0x00000008; - public const uint CRYPT_DELETEKEYSET = 0x00000010; - public const uint CRYPT_MACHINE_KEYSET = 0x00000020; - public const uint CRYPT_SILENT = 0x00000040; - } -} Index: /trunk/eraser6/Eraser.Util/Security.cs =================================================================== --- /trunk/eraser6/Eraser.Util/Security.cs (revision 1831) +++ /trunk/eraser6/Eraser.Util/Security.cs (revision 1832) @@ -92,115 +92,4 @@ out wasVerified) && wasVerified; } - - /// - /// Randomises the provided buffer using CryptGenRandom. - /// - /// The buffer which receives the random - /// data. The contents of this buffer can also be used as a random - /// seed. - /// True if the operation suceeded. - public static bool Randomise(byte[] buffer) - { - return CryptApi.CryptGenRandom(buffer); - } - } - - internal sealed class CryptApi : IDisposable - { - /// - /// Constructor. - /// - private CryptApi() - { - /* Intel i8xx (82802 Firmware Hub Device) hardware random number generator */ - const string IntelDefaultProvider = "Intel Hardware Cryptographic Service Provider"; - - handle = new SafeCryptHandle(); - if (NativeMethods.CryptAcquireContext(out handle, null, - IntelDefaultProvider, NativeMethods.PROV_INTEL_SEC, 0)) - { - return; - } - else if (NativeMethods.CryptAcquireContext(out handle, null, - null, NativeMethods.PROV_RSA_FULL, 0)) - { - return; - } - else if (Marshal.GetLastWin32Error() == NativeMethods.NTE_BAD_KEYSET) - { - //Default keyset doesn't exist, attempt to create a new one - if (NativeMethods.CryptAcquireContext(out handle, null, null, - NativeMethods.PROV_RSA_FULL, NativeMethods.CRYPT_NEWKEYSET)) - { - return; - } - } - - throw new NotSupportedException("Unable to acquire a cryptographic service provider."); - } - - #region IDisposable Members - ~CryptApi() - { - Dispose(false); - } - - private void Dispose(bool disposing) - { - //If we already have run Dispose, then handle will be null. - if (handle == null) - return; - - if (disposing) - handle.Close(); - - //Don't run Dispose again. - handle = null; - } - - public void Dispose() - { - Dispose(true); - GC.SuppressFinalize(this); - } - #endregion - - /// - /// The GenRandom function fills a buffer with cryptographically random bytes. - /// - /// Buffer to receive the returned data. This buffer - /// must be at least dwLen bytes in length. - /// - /// Optionally, the application can fill this buffer with data to use as - /// an auxiliary random seed. - public static bool CryptGenRandom(byte[] buffer) - { - return NativeMethods.CryptGenRandom(instance.handle, (uint)buffer.Length, buffer); - } - - /// - /// The HCRYPTPROV handle. - /// - private SafeCryptHandle handle; - - /// - /// The global CryptAPI instance. - /// - private static CryptApi instance = new CryptApi(); - } - - internal class SafeCryptHandle : SafeHandleZeroOrMinusOneIsInvalid - { - public SafeCryptHandle() - : base(true) - { - } - - protected override bool ReleaseHandle() - { - NativeMethods.CryptReleaseContext(handle, 0u); - handle = IntPtr.Zero; - return true; - } } } Index: /trunk/eraser6/Eraser.Util/Eraser.Util.csproj =================================================================== --- /trunk/eraser6/Eraser.Util/Eraser.Util.csproj (revision 1831) +++ /trunk/eraser6/Eraser.Util/Eraser.Util.csproj (revision 1832) @@ -76,5 +76,4 @@ -