8000 Remove workaround for go 1.10.0→1.10.3 by btoews · Pull Request #6 · github/certstore · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Oct 5, 2021. It is now read-only.

Remove workaround for go 1.10.0→1.10.3 #6

Merged
merged 1 commit into from
Sep 4, 2018
Merged

Remove workaround for go 1.10.0→1.10.3 #6

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
23 changes: 6 additions & 17 deletions certstore_darwin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@ import (
"unsafe"
)

// work around https://github.com/golang/go/issues/24161
var (
_ C.CFBooleanRef
_ C.SecPolicyRef
)

// work around https://golang.org/doc/go1.10#cgo
// in go>=1.10 CFTypeRefs are translated to uintptrs instead of pointers.
var (
Expand All @@ -35,6 +29,7 @@ var (
nilCFStringRef C.CFStringRef
nilSecIdentityRef C.SecIdentityRef
nilSecKeyRef C.SecKeyRef
nilCFAllocatorRef C.CFAllocatorRef
)

// macStore is a bogus type. We have to explicitly open/close the store on
Expand Down Expand Up @@ -210,7 +205,7 @@ func (i *macIdentity) Signer() (crypto.Signer, error) {
func (i *macIdentity) Delete() error {
itemList := []C.SecIdentityRef{i.ref}
itemListPtr := (*unsafe.Pointer)(unsafe.Pointer(&itemList[0]))
citemList := C.CFArrayCreate(nil, itemListPtr, 1, nil)
citemList := C.CFArrayCreate(nilCFAllocatorRef, itemListPtr, 1, nil)
if citemList == nilCFArrayRef {
return errors.New("error creating CFArray")
}
Expand Down Expand Up @@ -284,15 +279,9 @@ func (i *macIdentity) Sign(rand io.Reader, digest []byte, opts crypto.SignerOpts
return nil, err
}

// Hack — algos is a SecKeyAlgorithm and SecKeyCreateSignature takes a
// SecKeyAlgorithm as its second argument. The compiler insists though that
// algos is a CFStringRef and that SecKeyCreateSignature wants a
// *C.struct___CFString as its second argument.
algoHack := (*C.struct___CFString)(unsafe.Pointer(algo))

// sign the digest
var cerr C.CFErrorRef
csig := C.SecKeyCreateSignature(kref, algoHack, cdigest, &cerr)
csig := C.SecKeyCreateSignature(kref, algo, cdigest, &cerr)

if err := cfErrorError(cerr); err != nil {
defer C.CFRelease(C.CFTypeRef(cerr))
Expand Down Expand Up @@ -406,7 +395,7 @@ func stringToCFString(gostr string) C.CFStringRef {
cstr := C.CString(gostr)
defer C.free(unsafe.Pointer(cstr))

return C.CFStringCreateWithCString(nil, cstr, C.kCFStringEncodingUTF8)
return C.CFStringCreateWithCString(nilCFAllocatorRef, cstr, C.kCFStringEncodingUTF8)
}

// mapToCFDictionary converts a Go map[C.CFTypeRef]C.CFTypeRef to a
< 76E3 svg aria-hidden="true" height="16" viewBox="0 0 16 16" version="1.1" width="16" data-view-component="true" class="octicon octicon-unfold"> Expand All @@ -423,7 +412,7 @@ func mapToCFDictionary(gomap map[C.CFTypeRef]C.CFTypeRef) C.CFDictionaryRef {
values = append(values, unsafe.Pointer(v))
}

return C.CFDictionaryCreate(nil, &keys[0], &values[0], C.CFIndex(n), nil, nil)
return C.CFDictionaryCreate(nilCFAllocatorRef, &keys[0], &values[0], C.CFIndex(n), nil, nil)
}

// cfDataToBytes converts a CFDataRef to a Go byte slice.
Expand All @@ -444,7 +433,7 @@ func bytesToCFData(gobytes []byte) (C.CFDataRef, error) {
cptr = (*C.UInt8)(&gobytes[0])
}

cdata := C.CFDataCreate(nil, cptr, clen)
cdata := C.CFDataCreate(nilCFAllocatorRef, cptr, clen)
if cdata == nilCFDataRef {
return nilCFDataRef, errors.New("error creatin cfdata")
}
Expand Down
0