From 91b46555d137dcdf73a534ba5fa10e07510eb0f9 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Tue, 19 Jul 2022 14:45:41 +0200 Subject: Merge Java package 'c.y.s.tls.{auth,json,policy}' into 'c.y.s.tls' Facilitate improved encapsulation of Vespa mTLS related classes --- jrt/src/com/yahoo/jrt/Connection.java | 2 +- jrt/src/com/yahoo/jrt/CryptoSocket.java | 2 +- jrt/src/com/yahoo/jrt/MaybeTlsCryptoSocket.java | 2 +- jrt/src/com/yahoo/jrt/Target.java | 2 +- jrt/src/com/yahoo/jrt/TlsCryptoSocket.java | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'jrt/src') diff --git a/jrt/src/com/yahoo/jrt/Connection.java b/jrt/src/com/yahoo/jrt/Connection.java index 644e2ef4ff3..5f40acad192 100644 --- a/jrt/src/com/yahoo/jrt/Connection.java +++ b/jrt/src/com/yahoo/jrt/Connection.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jrt; -import com.yahoo.security.tls.authz.ConnectionAuthContext; +import com.yahoo.security.tls.ConnectionAuthContext; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/jrt/src/com/yahoo/jrt/CryptoSocket.java b/jrt/src/com/yahoo/jrt/CryptoSocket.java index aac91362405..d7dac8d1023 100644 --- a/jrt/src/com/yahoo/jrt/CryptoSocket.java +++ b/jrt/src/com/yahoo/jrt/CryptoSocket.java @@ -2,7 +2,7 @@ package com.yahoo.jrt; -import com.yahoo.security.tls.authz.ConnectionAuthContext; +import com.yahoo.security.tls.ConnectionAuthContext; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/jrt/src/com/yahoo/jrt/MaybeTlsCryptoSocket.java b/jrt/src/com/yahoo/jrt/MaybeTlsCryptoSocket.java index 42442289cd1..2b5d456da11 100644 --- a/jrt/src/com/yahoo/jrt/MaybeTlsCryptoSocket.java +++ b/jrt/src/com/yahoo/jrt/MaybeTlsCryptoSocket.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jrt; -import com.yahoo.security.tls.authz.ConnectionAuthContext; +import com.yahoo.security.tls.ConnectionAuthContext; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/jrt/src/com/yahoo/jrt/Target.java b/jrt/src/com/yahoo/jrt/Target.java index 239a71f53b3..8bca6069721 100644 --- a/jrt/src/com/yahoo/jrt/Target.java +++ b/jrt/src/com/yahoo/jrt/Target.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jrt; -import com.yahoo.security.tls.authz.ConnectionAuthContext; +import com.yahoo.security.tls.ConnectionAuthContext; import java.util.Optional; diff --git a/jrt/src/com/yahoo/jrt/TlsCryptoSocket.java b/jrt/src/com/yahoo/jrt/TlsCryptoSocket.java index ecd76e1eb17..5ef4d149c6c 100644 --- a/jrt/src/com/yahoo/jrt/TlsCryptoSocket.java +++ b/jrt/src/com/yahoo/jrt/TlsCryptoSocket.java @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jrt; -import com.yahoo.security.tls.authz.ConnectionAuthContext; -import com.yahoo.security.tls.authz.PeerAuthorizerTrustManager; +import com.yahoo.security.tls.ConnectionAuthContext; +import com.yahoo.security.tls.PeerAuthorizerTrustManager; import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLEngineResult; -- cgit v1.2.3