From 2276ba3fd642fb76d3e62f06a96a0643d5e8fa34 Mon Sep 17 00:00:00 2001 From: smaguin <smaguin@localhost> Date: Mon, 02 Jul 2007 12:53:48 +0000 Subject: [PATCH] Fixed SSL configuration files for the functional tests for Issue 1680. --- opends/tests/functional-tests/shared/data/security/jks/teardown/disable_startTLS.ldif | 33 +++++++++++++++++++++++++++++++++ opends/tests/functional-tests/shared/data/security/jks/teardown/disable_key_mgr_provider.ldif | 1 - opends/tests/functional-tests/shared/data/security/jks/teardown/disable_trust_mgr_provider.ldif | 5 +---- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_key_mgr_provider.ldif b/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_key_mgr_provider.ldif index 8e538bd..0c63bc5 100644 --- a/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_key_mgr_provider.ldif +++ b/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_key_mgr_provider.ldif @@ -27,4 +27,3 @@ changetype: modify replace: ds-cfg-key-manager-provider-enabled ds-cfg-key-manager-provider-enabled: false - diff --git a/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_startTLS.ldif b/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_startTLS.ldif new file mode 100644 index 0000000..f936581 --- /dev/null +++ b/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_startTLS.ldif @@ -0,0 +1,33 @@ +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# You can obtain a copy of the license at +# trunk/opends/resource/legal-notices/OpenDS.LICENSE +# or https://OpenDS.dev.java.net/OpenDS.LICENSE. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at +# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable, +# add the following below this CDDL HEADER, with the fields enclosed +# by brackets "[]" replaced with your own identifying information: +# Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Portions Copyright 2006-2007 Sun Microsystems, Inc. +# + +dn: cn=LDAP Connection Handler,cn=Connection Handlers,cn=config +changetype: modify +replace: ds-cfg-allow-start-tls +ds-cfg-allow-start-tls: false +- +delete: ds-cfg-trust-manager-provider-dn +- +delete: ds-cfg-key-manager-provider-dn \ No newline at end of file diff --git a/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_trust_mgr_provider.ldif b/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_trust_mgr_provider.ldif index 3028672..f942502 100644 --- a/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_trust_mgr_provider.ldif +++ b/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_trust_mgr_provider.ldif @@ -23,11 +23,8 @@ # Portions Copyright 2006-2007 Sun Microsystems, Inc. # -dn: cn=JKS,cn=Trust Manager Providers,cn=config +dn: cn=Blind Trust,cn=Trust Manager Providers,cn=config changetype: modify -replace: ds-cfg-trust-manager-provider-class -ds-cfg-trust-manager-provider-class: org.opends.server.extensions.FileBasedTrustManagerProvider -- replace: ds-cfg-trust-manager-provider-enabled ds-cfg-trust-manager-provider-enabled: false -- Gitblit v1.10.0