You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by co...@apache.org on 2024/07/30 09:08:01 UTC
(directory-kerby) branch trunk updated: Excluding gss-api module on JDK > 8
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/directory-kerby.git
The following commit(s) were added to refs/heads/trunk by this push:
new aa59ee2a Excluding gss-api module on JDK > 8
aa59ee2a is described below
commit aa59ee2ab8ef6a9d09529ade2b9864be7ae17f73
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Jul 30 09:34:22 2024 +0100
Excluding gss-api module on JDK > 8
---
.../kerb/admin/server/PasswordCallbackHandler.java | 5 +----
kerby-kerb/pom.xml | 14 +++++++++++++-
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/kerby-kerb/kerb-admin-server/src/test/java/org/apache/kerby/kerberos/kerb/admin/server/PasswordCallbackHandler.java b/kerby-kerb/kerb-admin-server/src/test/java/org/apache/kerby/kerberos/kerb/admin/server/PasswordCallbackHandler.java
index 07132abb..33849525 100644
--- a/kerby-kerb/kerb-admin-server/src/test/java/org/apache/kerby/kerberos/kerb/admin/server/PasswordCallbackHandler.java
+++ b/kerby-kerb/kerb-admin-server/src/test/java/org/apache/kerby/kerberos/kerb/admin/server/PasswordCallbackHandler.java
@@ -19,13 +19,10 @@
*/
package org.apache.kerby.kerberos.kerb.admin.server;
-import sun.security.util.Password;
-
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.callback.UnsupportedCallbackException;
-import java.io.ByteArrayInputStream;
import java.io.IOException;
public class PasswordCallbackHandler implements CallbackHandler {
@@ -40,7 +37,7 @@ public class PasswordCallbackHandler implements CallbackHandler {
for (Callback callback : callbacks) {
if (callback instanceof PasswordCallback) {
PasswordCallback pc = (PasswordCallback) callback;
- pc.setPassword(Password.readPassword(new ByteArrayInputStream(password.getBytes()), pc.isEchoOn()));
+ pc.setPassword(password.toCharArray());
} else {
throw new UnsupportedCallbackException(
callback, "Only support PasswordCallback");
diff --git a/kerby-kerb/pom.xml b/kerby-kerb/pom.xml
index 83f2d234..d33f2a24 100644
--- a/kerby-kerb/pom.xml
+++ b/kerby-kerb/pom.xml
@@ -42,6 +42,18 @@
<module>kerb-simplekdc</module>
<module>kerb-client-api-all</module>
<module>kerb-server-api-all</module>
- <module>kerb-gssapi</module>
</modules>
+
+ <profiles>
+ <profile>
+ <id>jdk18</id>
+ <activation>
+ <jdk>1.8</jdk>
+ </activation>
+ <modules>
+ <module>kerb-gssapi</module>
+ </modules>
+ </profile>
+ </profiles>
+
</project>