From f4489554769f449b2c72a5b2cd41d74b7ce1bf99 Mon Sep 17 00:00:00 2001
From: Goetz Lindenmaier <goetz@openjdk.org>
Date: Mon, 11 Nov 2024 09:02:04 +0000
Subject: [PATCH] 8330278: Have SSLSocketTemplate.doClientSide use loopback
address
Backport-of: 0eff492e4107abc5624f0c3445877bf38629a980
---
test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java | 4 ++--
test/jdk/javax/net/ssl/templates/TLSBase.java | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java b/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java
index fa6cccbcdcf..631577fd63c 100644
--- a/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java
+++ b/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -273,7 +273,7 @@ public class SSLSocketTemplate extends SSLContextTemplate {
configureClientSocket(sslSocket);
InetAddress serverAddress = this.serverAddress;
InetSocketAddress connectAddress = serverAddress == null
- ? new InetSocketAddress("localhost", serverPort)
+ ? new InetSocketAddress(InetAddress.getLoopbackAddress(), serverPort)
: new InetSocketAddress(serverAddress, serverPort);
sslSocket.connect(connectAddress, 15000);
} catch (IOException ioe) {
diff --git a/test/jdk/javax/net/ssl/templates/TLSBase.java b/test/jdk/javax/net/ssl/templates/TLSBase.java
index bcddb1147c8..22b13fb494f 100644
--- a/test/jdk/javax/net/ssl/templates/TLSBase.java
+++ b/test/jdk/javax/net/ssl/templates/TLSBase.java
@@ -31,6 +31,7 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
+import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.util.Arrays;
import java.util.concurrent.ConcurrentHashMap;
@@ -222,7 +223,7 @@ abstract public class TLSBase {
try {
sslContext = SSLContext.getDefault();
sock = (SSLSocket)sslContext.getSocketFactory().createSocket();
- sock.connect(new InetSocketAddress("localhost", serverPort));
+ sock.connect(new InetSocketAddress(InetAddress.getLoopbackAddress(), serverPort));
System.err.println("Client connected using port " +
sock.getLocalPort());
name = "client(" + sock.toString() + ")";
--
GitLab