Skip to content

update osxkeychain to work with go 1.11 version. #93

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

Merged
merged 1 commit into from
Jan 15, 2019
Merged

update osxkeychain to work with go 1.11 version. #93

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
2 changes: 1 addition & 1 deletion osxkeychain/osxkeychain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ func FindAndValidateIdentity(identityLabel string) (*IdentityWithRefModel, error
// you can use the ReleaseIdentityWithRefList method to do that
func FindIdentity(identityLabel string) ([]IdentityWithRefModel, error) {

queryDict := C.CFDictionaryCreateMutable(nil, 0, nil, nil)
queryDict := C.CFDictionaryCreateMutable(C.kCFAllocatorDefault, 0, nil, nil)
Copy link
Contributor

@viktorbenei viktorbenei Jan 14, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reference/docs why C.kCFAllocatorDefault?

Copy link
Contributor

@viktorbenei viktorbenei Jan 14, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So the change was based on keybase/go-keychain#31 where it was explained:

golang/go@94076fe made C type checking stricter.
This caused problems where we were passing in nil for CFAllocatorRef, as Go 1.11
will require those to be 0 instead.

Use the typed constant kCFAllocatorDefault to avoid this problem.

Also add a .travis.yml config and test on various Go versions, including master.

This PR is based on code from #30 by
@kevinburkeomg.

defer C.CFRelease(C.CFTypeRef(queryDict))
C.CFDictionaryAddValue(queryDict, unsafe.Pointer(C.kSecClass), unsafe.Pointer(C.kSecClassIdentity))
C.CFDictionaryAddValue(queryDict, unsafe.Pointer(C.kSecMatchLimit), unsafe.Pointer(C.kSecMatchLimitAll))
Expand Down