From 0a94268e2205db12173d4ed1b62288f57f6f232b Mon Sep 17 00:00:00 2001 From: smaguin <smaguin@localhost> Date: Mon, 02 Jul 2007 12:51:44 +0000 Subject: [PATCH] Fixed SSL configuration files for the functional tests for Issue 1680. --- opends/tests/functional-tests/shared/data/security/jks/setup/enable_ldaps_conn_handler.ldif | 2 +- opends/tests/functional-tests/shared/data/security/jks/setup/enable_key_mgr_provider.ldif | 3 +-- opends/tests/functional-tests/shared/data/security/jks/setup/enable_startTLS.ldif | 36 ++++++++++++++++++++++++++++++++++++ opends/tests/functional-tests/shared/data/security/jks/setup/enable_trust_mgr_provider.ldif | 3 +-- 4 files changed, 39 insertions(+), 5 deletions(-) diff --git a/opends/tests/functional-tests/shared/data/security/jks/setup/enable_key_mgr_provider.ldif b/opends/tests/functional-tests/shared/data/security/jks/setup/enable_key_mgr_provider.ldif index 1ade8cd..4915521 100644 --- a/opends/tests/functional-tests/shared/data/security/jks/setup/enable_key_mgr_provider.ldif +++ b/opends/tests/functional-tests/shared/data/security/jks/setup/enable_key_mgr_provider.ldif @@ -31,5 +31,4 @@ replace: ds-cfg-key-store-pin ds-cfg-key-store-pin: servercert - -delete: ds-cfg-key-store-pin-file - +delete: ds-cfg-key-store-pin-file \ No newline at end of file diff --git a/opends/tests/functional-tests/shared/data/security/jks/setup/enable_ldaps_conn_handler.ldif b/opends/tests/functional-tests/shared/data/security/jks/setup/enable_ldaps_conn_handler.ldif index b01296c..2157e58 100644 --- a/opends/tests/functional-tests/shared/data/security/jks/setup/enable_ldaps_conn_handler.ldif +++ b/opends/tests/functional-tests/shared/data/security/jks/setup/enable_ldaps_conn_handler.ldif @@ -4,4 +4,4 @@ ds-cfg-trust-manager-provider-dn: cn=Blind Trust,cn=Trust Manager Providers,cn=config - replace: ds-cfg-key-manager-provider-dn -ds-cfg-key-manager-provider-dn: cn=JKS,cn=Key Manager Providers,cn=config +ds-cfg-key-manager-provider-dn: cn=JKS,cn=Key Manager Providers,cn=config \ No newline at end of file diff --git a/opends/tests/functional-tests/shared/data/security/jks/setup/enable_startTLS.ldif b/opends/tests/functional-tests/shared/data/security/jks/setup/enable_startTLS.ldif new file mode 100644 index 0000000..400c9cf --- /dev/null +++ b/opends/tests/functional-tests/shared/data/security/jks/setup/enable_startTLS.ldif @@ -0,0 +1,36 @@ +# 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: true +- +add: ds-cfg-trust-manager-provider-dn +ds-cfg-trust-manager-provider-dn: cn=Blind Trust,cn=Trust Manager Providers,cn=config +- +add: ds-cfg-key-manager-provider-dn +ds-cfg-key-manager-provider-dn: cn=JKS,cn=Key Manager Providers,cn=config + diff --git a/opends/tests/functional-tests/shared/data/security/jks/setup/enable_trust_mgr_provider.ldif b/opends/tests/functional-tests/shared/data/security/jks/setup/enable_trust_mgr_provider.ldif index 8612090..c95f758 100644 --- a/opends/tests/functional-tests/shared/data/security/jks/setup/enable_trust_mgr_provider.ldif +++ b/opends/tests/functional-tests/shared/data/security/jks/setup/enable_trust_mgr_provider.ldif @@ -26,5 +26,4 @@ dn: cn=Blind Trust,cn=Trust Manager Providers,cn=config changetype: modify replace: ds-cfg-trust-manager-provider-enabled -ds-cfg-trust-manager-provider-enabled: true - +ds-cfg-trust-manager-provider-enabled: true \ No newline at end of file -- Gitblit v1.10.0