Implement changes from code review

Signed-off-by: Andrew Pan <[email protected]>
C2SP · Aug 11, 2023 · 2be0e5b · 2be0e5b
1 parent 6bb7f75
commit 2be0e5b
Show file tree

Hide file tree

Showing 6 changed files with 284 additions and 253 deletions.
diff --git a/harness/gocryptox509/main.go b/harness/gocryptox509/main.go
@@ -152,6 +152,8 @@ func evaluateTestcase(testcase Testcase) (testcaseResult, error) {
 
 	switch testcase.ValidationKind {
 	case validationKindClient:
+		return testcaseSkipped, fmt.Errorf("unimplemented validationKindClient")
+	case validationKindServer:
 		var dnsName string
 		if peerName, ok := testcase.ExpectedPeerName.(map[string]interface{}); ok {
 			if peerName["kind"] != "DNS" {
@@ -195,8 +197,6 @@ func evaluateTestcase(testcase Testcase) (testcaseResult, error) {
 		} else if err == nil && !expectSuccess {
 			return testcaseFailed, fmt.Errorf("validation succeeded when failure was expected")
 		}
-	case validationKindServer:
-		return testcaseSkipped, fmt.Errorf("unimplemented validationKindServer")
 	}
 
 	return testcasePassed, nil

diff --git a/harness/openssl/main.cpp b/harness/openssl/main.cpp
@@ -85,9 +85,9 @@ json evaluate_testcase(const json &testcase)
     auto id = testcase["id"].template get<std::string>();
     std::cerr << "Evaluating case: " << id << std::endl;
 
-    if (testcase["validation_kind"] != "CLIENT")
+    if (testcase["validation_kind"] != "SERVER")
     {
-        return skip(id, "non-CLIENT testcases not supported yet");
+        return skip(id, "non-SERVER testcases not supported yet");
     }
 
     if (!testcase["signature_algorithms"].is_null())