Use httpclient version matching zts-client

Also remove hostnameverifier adapter that is no longer needed.

1 files changed, 1 insertions, 5 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzIdentityVerifier.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzIdentityVerifier.java
index 6f8ebc4c5db..764ba9c2104 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzIdentityVerifier.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzIdentityVerifier.java
@@ -29,16 +29,12 @@ public class AthenzIdentityVerifier implements HostnameVerifier {
     public boolean verify(String hostname, SSLSession session) {
         try {
             X509Certificate cert = (X509Certificate) session.getPeerCertificates()[0];
-            return isTrusted(AthenzUtils.createAthenzIdentity(cert));
+            return allowedIdentities.contains(AthenzUtils.createAthenzIdentity(cert));
         } catch (SSLPeerUnverifiedException e) {
             log.log(Level.WARNING, "Unverified client: " + hostname);
             return false;
         }
     }
 
-    public boolean isTrusted(AthenzIdentity identity) {
-        return allowedIdentities.contains(identity);
-    }
-
 }