diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SpkiPinningClientTlsStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SpkiPinningClientTlsStrategy.java index 99c91a1311..46bb4377b4 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SpkiPinningClientTlsStrategy.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SpkiPinningClientTlsStrategy.java @@ -121,15 +121,17 @@ private static final class Rule { } final String norm; try { - norm = IDN.toASCII(pattern).toLowerCase(Locale.ROOT); + // Normalize before validating so that "*.com." is rejected like "*.com". + norm = stripRootDot(IDN.toASCII(pattern).toLowerCase(Locale.ROOT)); } catch (final IllegalArgumentException e) { throw new IllegalArgumentException("Invalid IDN host pattern: " + pattern, e); } if (norm.isEmpty()) { throw new IllegalArgumentException("Empty host pattern"); } - final boolean wc = norm.startsWith("*."); - if (wc && norm.indexOf('.', 2) < 0) { // require "*.