Fix for Issue 1272.

el_kaboing

26.10.2007 da66c74ebe53d9ca5f4179f01e9be179404c2cef

Fix for Issue 1272.

 opends/tests/functional-tests/shared/data/security/jks/setup/enable_TLS.ldif

@@ -20,7 +20,7 @@
#
# CDDL HEADER END
#
#      Portions Copyright 2006 Sun Microsystems, Inc.
#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
#

dn: cn=LDAP Connection Handler,cn=Connection Handlers,cn=config

 opends/tests/functional-tests/shared/data/security/jks/setup/enable_key_mgr_provider.ldif

@@ -20,17 +20,16 @@
#
# CDDL HEADER END
#
#      Portions Copyright 2006 Sun Microsystems, Inc.
#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
#

dn: cn=Key Manager Provider,cn=SSL,cn=config
dn: cn=JKS,cn=Key Manager Providers,cn=config
changetype: modify
replace: ds-cfg-key-manager-provider-enabled
ds-cfg-key-manager-provider-enabled: true
-
add: ds-cfg-key-store-type
ds-cfg-key-store-type: JKS
-
add: ds-cfg-key-store-pin
replace: ds-cfg-key-store-pin
ds-cfg-key-store-pin: servercert
-
delete: ds-cfg-key-store-pin-file


 opends/tests/functional-tests/shared/data/security/jks/setup/enable_ldaps_conn_handler.ldif

@@ -1,47 +1,7 @@
# 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 Sun Microsystems, Inc.
#

dn: cn=LDAPS Connection Handler,cn=Connection Handlers,cn=config
objectclass: top
objectclass: ds-cfg-connection-handler
objectclass: ds-cfg-ldap-connection-handler
cn: LDAPS Connection Handler
ds-cfg-connection-handler-class: org.opends.server.protocols.ldap.LDAPConnectionHandler
ds-cfg-connection-handler-enabled: true
ds-cfg-listen-address: 0.0.0.0
ds-cfg-listen-port: 1636
ds-cfg-allow-ldapv2: true
ds-cfg-keep-stats: true
ds-cfg-use-tcp-keepalive: true
ds-cfg-use-tcp-nodelay: true
ds-cfg-allow-tcp-reuse-address: true
ds-cfg-send-rejection-notice: true
ds-cfg-max-request-size: 5 mb
ds-cfg-num-request-handlers: 2
ds-cfg-allow-start-tls: false
ds-cfg-use-ssl: true
ds-cfg-ssl-client-auth-policy: optional
ds-cfg-ssl-cert-nickname: server-cert

changetype: modify
replace: ds-cfg-trust-manager-provider-dn
ds-cfg-trust-manager-provider-dn: cn=JKS,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

 opends/tests/functional-tests/shared/data/security/jks/setup/enable_trust_mgr_provider.ldif

@@ -20,13 +20,14 @@
#
# CDDL HEADER END
#
#      Portions Copyright 2006 Sun Microsystems, Inc.
#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
#

dn: cn=Trust Manager Provider,cn=SSL,cn=config
objectClass: top
objectclass: ds-cfg-trust-manager-provider
cn: Trust Manager Provider
dn: cn=JKS,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.BlindTrustManagerProvider
-
replace: ds-cfg-trust-manager-provider-enabled
ds-cfg-trust-manager-provider-enabled: true


 opends/tests/functional-tests/shared/data/security/jks/teardown/disable_key_mgr_provider.ldif

@@ -20,15 +20,11 @@
#
# CDDL HEADER END
#
#      Portions Copyright 2006 Sun Microsystems, Inc.
#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
#

dn: cn=Key Manager Provider,cn=SSL,cn=config
dn: cn=JKS,cn=Key Manager Providers,cn=config
changetype: modify
replace: ds-cfg-key-manager-provider-enabled
ds-cfg-key-manager-provider-enabled: false
-
delete: ds-cfg-key-store-type
-
delete: ds-cfg-key-store-pin


 opends/tests/functional-tests/shared/data/security/jks/teardown/disable_ldaps_conn_handler.ldif

@@ -20,8 +20,11 @@
#
# CDDL HEADER END
#
#      Portions Copyright 2006 Sun Microsystems, Inc.
#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
#

dn: cn=LDAPS Connection Handler,cn=Connection Handlers,cn=config
changetype: delete
changetype: modify
replace: ds-cfg-connection-handler-enabled
ds-cfg-connection-handler-enabled: false


 opends/tests/functional-tests/shared/data/security/pkcs12/setup/enable_key_mgr_provider.ldif

@@ -20,17 +20,19 @@
#
# CDDL HEADER END
#
#      Portions Copyright 2006 Sun Microsystems, Inc.
#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
#

dn: cn=Key Manager Provider,cn=SSL,cn=config
dn: cn=PKCS12,cn=Key Manager Providers,cn=config
changetype: modify
replace: ds-cfg-key-manager-provider-enabled
ds-cfg-key-manager-provider-enabled: true
-
add: ds-cfg-key-store-type
ds-cfg-key-store-type: PKCS12
-
add: ds-cfg-key-store-pin
replace: ds-cfg-key-store-pin
ds-cfg-key-store-pin: servercert
-
replace: ds-cfg-key-store-file
ds-cfg-key-store-file: config/keystore
-
delete: ds-cfg-key-store-pin-file


 opends/tests/functional-tests/shared/data/security/pkcs12/setup/enable_ldaps_conn_handler.ldif

@@ -1,47 +1,7 @@
# 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 Sun Microsystems, Inc.
#

dn: cn=LDAPS Connection Handler,cn=Connection Handlers,cn=config
objectclass: top
objectclass: ds-cfg-connection-handler
objectclass: ds-cfg-ldap-connection-handler
cn: LDAPS Connection Handler
ds-cfg-connection-handler-class: org.opends.server.protocols.ldap.LDAPConnectionHandler
ds-cfg-connection-handler-enabled: true
ds-cfg-listen-address: 0.0.0.0
ds-cfg-listen-port: 1636
ds-cfg-allow-ldapv2: true
ds-cfg-keep-stats: true
ds-cfg-use-tcp-keepalive: true
ds-cfg-use-tcp-nodelay: true
ds-cfg-allow-tcp-reuse-address: true
ds-cfg-send-rejection-notice: true
ds-cfg-max-request-size: 5 mb
ds-cfg-num-request-handlers: 2
ds-cfg-allow-start-tls: false
ds-cfg-use-ssl: true
ds-cfg-ssl-client-auth-policy: optional
ds-cfg-ssl-cert-nickname: server-cert

changetype: modify
replace: ds-cfg-trust-manager-provider-dn
ds-cfg-trust-manager-provider-dn: cn=PKCS12,cn=Trust Manager Providers,cn=config
-
replace: ds-cfg-key-manager-provider-dn
ds-cfg-key-manager-provider-dn: cn=PKCS12,cn=Key Manager Providers,cn=config

 opends/tests/functional-tests/shared/data/security/pkcs12/setup/enable_trust_mgr_provider.ldif

@@ -20,13 +20,14 @@
#
# CDDL HEADER END
#
#      Portions Copyright 2006 Sun Microsystems, Inc.
#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
#

dn: cn=Trust Manager Provider,cn=SSL,cn=config
objectClass: top
objectclass: ds-cfg-trust-manager-provider
cn: Trust Manager Provider
dn: cn=PKCS12,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.BlindTrustManagerProvider
-
replace: ds-cfg-trust-manager-provider-enabled
ds-cfg-trust-manager-provider-enabled: true


 opends/tests/functional-tests/shared/data/security/pkcs12/teardown/disable_key_mgr_provider.ldif

@@ -20,15 +20,11 @@
#
# CDDL HEADER END
#
#      Portions Copyright 2006 Sun Microsystems, Inc.
#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
#

dn: cn=Key Manager Provider,cn=SSL,cn=config
dn: cn=PKCS12,cn=Key Manager Providers,cn=config
changetype: modify
replace: ds-cfg-key-manager-provider-enabled
ds-cfg-key-manager-provider-enabled: false
-
delete: ds-cfg-key-store-type
-
delete: ds-cfg-key-store-pin


 opends/tests/functional-tests/shared/data/security/pkcs12/teardown/disable_ldaps_conn_handler.ldif

@@ -20,8 +20,11 @@
#
# CDDL HEADER END
#
#      Portions Copyright 2006 Sun Microsystems, Inc.
#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
#

dn: cn=LDAPS Connection Handler,cn=Connection Handlers,cn=config
changetype: delete
changetype: modify
replace: ds-cfg-connection-handler-enabled
ds-cfg-connection-handler-enabled: false


 opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_key_mgr_provider.ldif

@@ -20,17 +20,16 @@
#
# CDDL HEADER END
#
#      Portions Copyright 2006 Sun Microsystems, Inc.
#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
#

dn: cn=Key Manager Provider,cn=SSL,cn=config
dn: cn=JKS,cn=Key Manager Providers,cn=config
changetype: modify
replace: ds-cfg-key-manager-provider-enabled
ds-cfg-key-manager-provider-enabled: true
-
add: ds-cfg-key-store-type
ds-cfg-key-store-type: JKS
-
add: ds-cfg-key-store-pin
replace: ds-cfg-key-store-pin
ds-cfg-key-store-pin: servercert
-
delete: ds-cfg-key-store-pin-file


 opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_startTLS.ldif

@@ -20,11 +20,17 @@
#
# CDDL HEADER END
#
#      Portions Copyright 2006 Sun Microsystems, Inc.
#      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
-
replace: ds-cfg-trust-manager-provider-dn
ds-cfg-trust-manager-provider-dn: cn=JKS,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


 opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_trust_mgr_provider.ldif

@@ -20,13 +20,14 @@
#
# CDDL HEADER END
#
#      Portions Copyright 2006 Sun Microsystems, Inc.
#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
#

dn: cn=Trust Manager Provider,cn=SSL,cn=config
objectClass: top
objectclass: ds-cfg-trust-manager-provider
cn: Trust Manager Provider
dn: cn=JKS,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.BlindTrustManagerProvider
-
replace: ds-cfg-trust-manager-provider-enabled
ds-cfg-trust-manager-provider-enabled: true


 opends/tests/functional-tests/shared/data/security/startTLS/teardown/disable_key_mgr_provider.ldif

@@ -20,15 +20,11 @@
#
# CDDL HEADER END
#
#      Portions Copyright 2006 Sun Microsystems, Inc.
#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
#

dn: cn=Key Manager Provider,cn=SSL,cn=config
dn: cn=JKS,cn=Key Manager Providers,cn=config
changetype: modify
replace: ds-cfg-key-manager-provider-enabled
ds-cfg-key-manager-provider-enabled: false
-
delete: ds-cfg-key-store-type
-
delete: ds-cfg-key-store-pin


 opends/tests/functional-tests/shared/data/security/startTLS/teardown/disable_startTLS.ldif

@@ -20,7 +20,7 @@
#
# CDDL HEADER END
#
#      Portions Copyright 2006 Sun Microsystems, Inc.
#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
#

dn: cn=LDAP Connection Handler,cn=Connection Handlers,cn=config

 opends/tests/functional-tests/shared/data/security/startTLS/teardown/disable_trust_mgr_provider.ldif

New file
@@ -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=JKS,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