Merge pull request libgit2#4444 from tiennou/fix/4440

pks-t · web-flow · commit c342c1313239 · 2017-12-15T04:01:13.000-06:00
stransport: provide error message on trust failures
diff --git a/src/streams/stransport.c b/src/streams/stransport.c
@@ -83,8 +83,10 @@ static int stransport_connect(git_stream *stream)
 	}
 
 	if (sec_res == kSecTrustResultDeny || sec_res == kSecTrustResultRecoverableTrustFailure ||
-	    sec_res == kSecTrustResultFatalTrustFailure)
+	    sec_res == kSecTrustResultFatalTrustFailure) {
+		giterr_set(GITERR_SSL, "untrusted connection error");
 		return GIT_ECERTIFICATE;
+	}
 
 	return 0;
 

Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,10 @@ static int stransport_connect(git_stream *stream)`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`if (sec_res == kSecTrustResultDeny \|\| sec_res == kSecTrustResultRecoverableTrustFailure \|\|`
`86`		`- sec_res == kSecTrustResultFatalTrustFailure)`
	`86`	`+ sec_res == kSecTrustResultFatalTrustFailure) {`
	`87`	`+ giterr_set(GITERR_SSL, "untrusted connection error");`
`87`	`88`	`return GIT_ECERTIFICATE;`
	`89`	`+ }`
`88`	`90`
`89`	`91`	`return 0;`
`90`	`92`