diff --git a/vendor/github.com/keybase/go-keychain/corefoundation_1.10.go b/vendor/github.com/keybase/go-keychain/corefoundation_1.10.go index 23756ee5c..0c5f5b800 100644 --- a/vendor/github.com/keybase/go-keychain/corefoundation_1.10.go +++ b/vendor/github.com/keybase/go-keychain/corefoundation_1.10.go @@ -52,7 +52,7 @@ func BytesToCFData(b []byte) (C.CFDataRef, error) { if len(b) > 0 { p = (*C.UInt8)(&b[0]) } - cfData := C.CFDataCreate(nil, p, C.CFIndex(len(b))) + cfData := C.CFDataCreate(C.kCFAllocatorDefault, p, C.CFIndex(len(b))) if cfData == 0 { return 0, fmt.Errorf("CFDataCreate failed") } @@ -78,7 +78,7 @@ func MapToCFDictionary(m map[C.CFTypeRef]C.CFTypeRef) (C.CFDictionaryRef, error) keysPointer = &keys[0] valuesPointer = &values[0] } - cfDict := C.CFDictionaryCreateSafe2(nil, keysPointer, valuesPointer, C.CFIndex(numValues), &C.kCFTypeDictionaryKeyCallBacks, &C.kCFTypeDictionaryValueCallBacks) + cfDict := C.CFDictionaryCreateSafe2(C.kCFAllocatorDefault, keysPointer, valuesPointer, C.CFIndex(numValues), &C.kCFTypeDictionaryKeyCallBacks, &C.kCFTypeDictionaryValueCallBacks) if cfDict == 0 { return 0, fmt.Errorf("CFDictionaryCreate failed") } @@ -115,7 +115,7 @@ func StringToCFString(s string) (C.CFStringRef, error) { if len(bytes) > 0 { p = (*C.UInt8)(&bytes[0]) } - return C.CFStringCreateWithBytes(nil, p, C.CFIndex(len(s)), C.kCFStringEncodingUTF8, C.false), nil + return C.CFStringCreateWithBytes(C.kCFAllocatorDefault, p, C.CFIndex(len(s)), C.kCFStringEncodingUTF8, C.false), nil } // CFStringToString converts a CFStringRef to a string. @@ -150,7 +150,7 @@ func ArrayToCFArray(a []C.CFTypeRef) C.CFArrayRef { if numValues > 0 { valuesPointer = &values[0] } - return C.CFArrayCreateSafe2(nil, valuesPointer, C.CFIndex(numValues), &C.kCFTypeArrayCallBacks) + return C.CFArrayCreateSafe2(C.kCFAllocatorDefault, valuesPointer, C.CFIndex(numValues), &C.kCFTypeArrayCallBacks) } // CFArrayToArray converts a CFArrayRef to an array of CFTypes. diff --git a/vendor/vendor.json b/vendor/vendor.json index 6b023a2fd..221b7c7e0 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -252,9 +252,9 @@ "revisionTime": "2016-09-29T23:03:56Z" }, { - "checksumSHA1": "9KGH+mjtBmc7T089X/OwDjtypao=", + "checksumSHA1": "SDnp6hhfnz8PkCZh1emnNz0ZVWA=", "path": "github.com/keybase/go-keychain", - "revision": "70b98e9c8d754db775c5bd3b2de3670cc76f1825", + "revision": "15d3657f24fc7e290714ab795239c5bb33b091ea", "revisionTime": "2018-03-06T22:15:04Z" }, {