Merge pull request #149 from github/combine-pull-request

Combine pull request

Author: rzhade3

certstore/certstore_darwin.go

@@ -160,8 +160,9 @@ func (i *macIdentity) CertificateChain() ([]*x509.Certificate, error) {
 	}
 	defer C.CFRelease(C.CFTypeRef(trustRef))
 
-	var status C.SecTrustResultType
-	if err := osStatusError(C.SecTrustEvaluate(trustRef, &status)); err != nil {
+	var cfError C.CFErrorRef
+	if C.SecTrustEvaluateWithError(trustRef, &cfError) {
+		err := cfErrorError(cfError)
 		return nil, err
 	}
 
@@ -171,18 +172,22 @@ func (i *macIdentity) CertificateChain() ([]*x509.Certificate, error) {
 	)
 
 	for i := C.CFIndex(0); i < nchain; i++ {
-		// TODO: do we need to release these?
-		chainCertref := C.SecTrustGetCertificateAtIndex(trustRef, i)
-		if chainCertref == nilSecCertificateRef {
-			return nil, errors.New("nil certificate in chain")
+		chainCertCpy := C.SecTrustCopyCertificateChain(trustRef)
+
+		if C.CFArrayRef(chainCertCpy) == nilCFArrayRef {
+			return nil, errors.New("nil certificate in the chain")
 		}
 
-		chainCert, err := exportCertRef(chainCertref)
+		chainCertRef := C.SecCertificateRef(C.CFArrayGetValueAtIndex(chainCertCpy, i))
+
+		chainCert, err := exportCertRef(chainCertRef)
 		if err != nil {
 			return nil, err
 		}
 
 		chain = append(chain, chainCert)
+
+		C.CFRelease(C.CFTypeRef(chainCertCpy))
 	}
 
 	i.chain = chain

certstore/certstore_windows.go

@@ -637,7 +637,7 @@ func (c errCode) Error() string {
 	if cmsg == nil {
 		return fmt.Sprintf("Error %X", int(c))
 	}
-	defer C.LocalFree(C.HLOCAL(cmsg))
+	defer C.LocalFree(C.HLOCAL(unsafe.Pointer(cmsg)))
 
 	gomsg := C.GoString(cmsg)
 

ietf-cms/verify_test.go

@@ -133,6 +133,8 @@ func TestVerifyOpenSSLDetached(t *testing.T) {
 }
 
 func TestVerifyOutlookDetached(t *testing.T) {
+	t.Skip("Test fails. See https://github.com/github/smimesign/issues/150")
+
 	sd, err := ParseSignedData(fixtureSignatureOutlookDetached)
 	if err != nil {
 		t.Fatal(err)
@@ -144,6 +146,8 @@ func TestVerifyOutlookDetached(t *testing.T) {
 }
 
 func TestVerifySmimesignAttachedWithTimestamp(t *testing.T) {
+	t.Skip("Test fails. See https://github.com/github/smimesign/issues/150")
+
 	sd, err := ParseSignedData(fixtureSmimesignAttachedWithTimestamp)
 	if err != nil {
 		t.Fatal(err)