Skip to content
Merged
Changes from all commits
Commits
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
37 changes: 26 additions & 11 deletions Xamarin.MacDev/Keychain.cs
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,7 @@ public IList<AppleCodeSigningIdentity> GetAllSigningIdentities ()
if (SecIdentityCopyCertificate (itemRef, out certRef) == OSStatus.Ok) {
var data = SecCertificateCopyData (certRef);
var rawData = CFDataGetBytes (data);
CFRelease (data);

if (rawData != null) {
try {
Expand Down Expand Up @@ -520,6 +521,7 @@ public IList<X509Certificate2> GetAllSigningCertificates ()
if (SecIdentityCopyCertificate (itemRef, out certRef) == OSStatus.Ok) {
var data = SecCertificateCopyData (certRef);
var rawData = CFDataGetBytes (data);
CFRelease (data);

if (rawData != null) {
try {
Expand Down Expand Up @@ -935,9 +937,14 @@ public unsafe Tuple<string, string> FindInternetUserNameAndPassword (Uri uri)
if (result != OSStatus.Ok)
return null;

var username = GetUsernameFromKeychainItemRef (item);

return Tuple.Create (username, Marshal.PtrToStringAuto (passwordData, (int) passwordLength));
try {
var username = GetUsernameFromKeychainItemRef (item);
var password = Marshal.PtrToStringAuto (passwordData, (int) passwordLength);
return Tuple.Create (username, password);
} finally {
SecKeychainItemFreeContent (IntPtr.Zero, passwordData);
CFRelease (item);
}
}

public unsafe Tuple<string, string> FindInternetPassword (string serverName = "", string securityDomain = "", string accountName = "", string path = "", ushort port = 0)
Expand All @@ -961,9 +968,14 @@ public unsafe Tuple<string, string> FindInternetPassword (string serverName = ""
if (result != OSStatus.Ok)
return null;

var username = GetUsernameFromKeychainItemRef (item);

return Tuple.Create (username, Marshal.PtrToStringAuto (passwordData, (int) passwordLength));
try {
var username = GetUsernameFromKeychainItemRef (item);
var password = Marshal.PtrToStringAuto (passwordData, (int) passwordLength);
return Tuple.Create (username, password);
} finally {
SecKeychainItemFreeContent (IntPtr.Zero, passwordData);
CFRelease (item);
}
}

public string FindInternetPassword (Uri uri)
Expand All @@ -988,12 +1000,15 @@ public string FindInternetPassword (Uri uri)
(uint) user.Length, user, (uint) path.Length, path, (ushort) uri.Port,
0, auth, out passwordLength, out passwordData, ref item);

CFRelease (item);

if (result != OSStatus.Ok)
return null;
try {
if (result != OSStatus.Ok)
return null;

return Marshal.PtrToStringAuto (passwordData, (int) passwordLength);
return Marshal.PtrToStringAuto (passwordData, (int) passwordLength);
} finally {
SecKeychainItemFreeContent (IntPtr.Zero, passwordData);
CFRelease (item);
}
}
}

Expand Down
Loading