JTReg tests #32

The jtreg tests identified an issue with ConfidentialityStrength constraints. Fixed.
pfirmstone · Jul 8, 2020 · 380c6d8 · 380c6d8
1 parent 0431728
commit 380c6d8
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/JGDMS/jgdms-jeri/src/main/java/net/jini/jeri/ssl/ConnectionContext.java b/JGDMS/jgdms-jeri/src/main/java/net/jini/jeri/ssl/ConnectionContext.java
@@ -279,11 +279,11 @@ private long supported(InvocationConstraint constraint) {
 	    return ok(doesEncryption(cipherSuite) ==
 		      (constraint == Confidentiality.YES));
 	} else if (constraint instanceof ConfidentialityStrength) {
-            if (constraint == ConfidentialityStrength.WEAK && (doesEncryption(cipherSuite)))
-                return OK;
-            if (constraint == ConfidentialityStrength.STRONG && hasStrongKeyCipherAlgorithms(cipherSuite))
-                return OK;
-	    return NOT_SUPPORTED;
+            return ok((constraint == ConfidentialityStrength.WEAK && 
+                        doesEncryption(cipherSuite) && 
+                        !hasStrongKeyCipherAlgorithms(cipherSuite))
+                    ||(constraint == ConfidentialityStrength.STRONG && 
+                        hasStrongKeyCipherAlgorithms(cipherSuite)));
 	} else if (constraint instanceof ClientAuthentication) {
 	    return ok((constraint == ClientAuthentication.YES));
 	} else if (constraint instanceof ClientMinPrincipalType) {