diff options
| author | Christina Fu <cfu@redhat.com> | 2015-07-10 11:41:22 -0700 |
|---|---|---|
| committer | Christina Fu <cfu@redhat.com> | 2015-07-13 18:21:22 -0700 |
| commit | e62b40b9249d0f0b394275da35fa7c2ee99842b5 (patch) | |
| tree | 51267f762c56cb74c603c6ddc682982f18d82a13 /base/console/src | |
| parent | 8c9e59cfaff9ecda1483c07238ad0b58ea4f5f73 (diff) | |
| download | pki-e62b40b9249d0f0b394275da35fa7c2ee99842b5.tar.gz pki-e62b40b9249d0f0b394275da35fa7c2ee99842b5.tar.xz pki-e62b40b9249d0f0b394275da35fa7c2ee99842b5.zip | |
Ticket 1459 Dogtag clients cannot connect when CS is configured with ECC
clients are: cli, HttpClient, and java console
Diffstat (limited to 'base/console/src')
| -rw-r--r-- | base/console/src/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java | 5 |
2 files changed, 14 insertions, 1 deletions
diff --git a/base/console/src/CMakeLists.txt b/base/console/src/CMakeLists.txt index 3dc0f5d41..c1a86b7c4 100644 --- a/base/console/src/CMakeLists.txt +++ b/base/console/src/CMakeLists.txt @@ -17,6 +17,14 @@ find_file(PKI_CERTSRV_JAR /usr/share/java/pki ) +find_file(PKI_CMSUTIL_JAR + NAMES + pki-cmsutil.jar + PATHS + ${JAVA_LIB_INSTALL_DIR} + /usr/share/java/pki +) + # '/usr/share/java' jars find_file(BASE_JAR @@ -92,7 +100,7 @@ javac(pki-console-classes ${CMAKE_BINARY_DIR}/classes ${BASE_JAR} ${LDAPJDK_JAR} ${MMC_JAR} ${MMC_EN_JAR} ${NMCLF_JAR} ${NMCLF_EN_JAR} - ${PKI_NSUTIL_JAR} ${PKI_CERTSRV_JAR} + ${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR} ${PKI_CERTSRV_JAR} ${JSS_JAR} ${COMMONS_CODEC_JAR} OUTPUT_DIR ${CMAKE_BINARY_DIR}/classes diff --git a/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java b/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java index 43d1c234b..6908ed992 100644 --- a/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java +++ b/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java @@ -34,6 +34,8 @@ import org.mozilla.jss.pkcs11.*; import javax.swing.*; import java.awt.*; +import com.netscape.cmsutil.crypto.CryptoUtil; + /** * JSSConnection deals with establishing a connection to * a server, sending requests and reading responses. @@ -113,6 +115,9 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac SSLSocket.setSSLVersionRangeDefault( org.mozilla.jss.ssl.SSLSocket.SSLProtocolVariant.DATA_GRAM, datagram_range); + + CryptoUtil.setClientCiphers(); + s = new SSLSocket(host, port, null, 0, this, this); // Initialze Http Input and Output Streams |