Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update SecureStringHelper.cs #3

Merged
merged 1 commit into from
Apr 29, 2023
Merged

Update SecureStringHelper.cs #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions source/CoreSharp/Utilities/SecureStringHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@ namespace AndreasReitberger.Core.Utilities
{
public static class SecureStringHelper
{
public static string ConvertToString(SecureString secureString)
#nullable enable
public static string ConvertToString(SecureString? secureString)
{
if (secureString == null) return string.Empty;
IntPtr valuePtr = IntPtr.Zero;
try
{
valuePtr = Marshal.SecureStringToGlobalAllocUnicode(secureString);
return Marshal.PtrToStringUni(valuePtr);
return Marshal.PtrToStringUni(valuePtr) ?? string.Empty;
}
finally
{
Marshal.ZeroFreeGlobalAllocUnicode(valuePtr);
}
}

public static SecureString ConvertToSecureString(string clearText)
public static SecureString ConvertToSecureString(string? clearText)
{
if (clearText == null)
throw new ArgumentNullException(nameof(clearText));

var securePassword = new SecureString();
clearText ??= string.Empty;
SecureString securePassword = new();

foreach (var c in clearText)
securePassword.AppendChar(c);

securePassword.MakeReadOnly();
return securePassword;
}
#nullable disable
}
}