From 60f5dfd7eaa64aa931033c0e5266391ecbbc96fa Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 25 Sep 2013 07:31:13 +0000
Subject: [PATCH] Fix OPENDJ-18 - keystore import failes due to empty PIN Review CR-2353
---
opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn.properties | 1
opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_fr.properties | 1
opends/src/messages/messages/quicksetup_fr.properties | 3
opends/src/server/org/opends/server/util/CertificateManager.java | 6
opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_de.properties | 1
opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_ja.properties | 1
opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_fr.properties | 1
opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_ja.properties | 1
opends/src/messages/messages/quicksetup_es.properties | 2
opends/src/messages/messages/extension_ko.properties | 4
opends/tests/unit-tests-testng/src/server/org/opends/server/util/CertificateManagerTestCase.java | 13 +
opends/src/messages/messages/extension.properties | 16 --
opends/src/messages/messages/extension_zh_CN.properties | 4
opends/src/messages/messages/quicksetup_zh_TW.properties | 2
opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java | 27 +--
opends/src/messages/messages/extension_de.properties | 4
opends/src/server/org/opends/server/util/StaticUtils.java | 24 +++
opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_ko.properties | 1
opends/src/server/org/opends/server/tools/InstallDS.java | 59 ++++----
opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java | 15 ++
opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_zh_CN.properties | 1
opends/src/messages/messages/extension_ja.properties | 4
opends/src/messages/messages/quicksetup_zh_CN.properties | 2
opends/src/messages/messages/extension_zh_TW.properties | 4
opends/src/messages/messages/quicksetup_ko.properties | 2
opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_es.properties | 1
opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_ko.properties | 1
opends/src/messages/messages/quicksetup.properties | 5
opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_zh_TW.properties | 1
opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_de.properties | 1
opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_zh_CN.properties | 1
opends/src/messages/messages/extension_es.properties | 4
opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_zh_TW.properties | 1
opends/src/messages/messages/quicksetup_de.properties | 2
opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java | 26 ---
opends/src/messages/messages/quicksetup_ja.properties | 2
opends/src/admin/defn/org/opends/server/admin/std/PKCS11KeyManagerProviderConfiguration.xml | 20 --
opends/src/messages/messages/quicksetup_ca_ES.properties | 2
opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn.properties | 1
opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_es.properties | 1
opends/src/quicksetup/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java | 52 ++++---
opends/src/admin/defn/org/opends/server/admin/std/FileBasedKeyManagerProviderConfiguration.xml | 20 --
opends/src/messages/messages/extension_fr.properties | 4
opends/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java | 24 ---
44 files changed, 133 insertions(+), 235 deletions(-)
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/FileBasedKeyManagerProviderConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/FileBasedKeyManagerProviderConfiguration.xml
index 9a9b483..c0cb8fb 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/FileBasedKeyManagerProviderConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/FileBasedKeyManagerProviderConfiguration.xml
@@ -24,6 +24,7 @@
!
!
! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! Portions Copyright 2013 ForgeRock AS
! -->
<adm:managed-object name="file-based-key-manager-provider"
plural-name="file-based-key-manager-providers"
@@ -40,25 +41,6 @@
Multiple file formats may be supported, depending on the providers
supported by the underlying Java runtime environment.
</adm:description>
- <adm:constraint>
- <adm:synopsis>
- The key store pin must be specified using one of the key-store-pin
- properties when the
- <adm:user-friendly-name />
- is enabled.
- </adm:synopsis>
- <adm:condition>
- <adm:implies>
- <adm:contains property="enabled" value="true" />
- <adm:or>
- <adm:is-present property="key-store-pin-property" />
- <adm:is-present property="key-store-pin-environment-variable" />
- <adm:is-present property="key-store-pin-file" />
- <adm:is-present property="key-store-pin" />
- </adm:or>
- </adm:implies>
- </adm:condition>
- </adm:constraint>
<adm:profile name="ldap">
<ldap:object-class>
<ldap:name>ds-cfg-file-based-key-manager-provider</ldap:name>
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/PKCS11KeyManagerProviderConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/PKCS11KeyManagerProviderConfiguration.xml
index b47fec8..06b5ec9 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/PKCS11KeyManagerProviderConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/PKCS11KeyManagerProviderConfiguration.xml
@@ -24,6 +24,7 @@
!
!
! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! Portions Copyright 2013 ForgeRock AS
! -->
<adm:managed-object name="pkcs11-key-manager-provider"
plural-name="pkcs11-key-manager-providers"
@@ -40,25 +41,6 @@
This standard interface is used by cryptographic accelerators and
hardware security modules.
</adm:description>
- <adm:constraint>
- <adm:synopsis>
- The key store pin must be specified using one of the key-store-pin
- properties when the
- <adm:user-friendly-name />
- is enabled.
- </adm:synopsis>
- <adm:condition>
- <adm:implies>
- <adm:contains property="enabled" value="true" />
- <adm:or>
- <adm:is-present property="key-store-pin-property" />
- <adm:is-present property="key-store-pin-environment-variable" />
- <adm:is-present property="key-store-pin-file" />
- <adm:is-present property="key-store-pin" />
- </adm:or>
- </adm:implies>
- </adm:condition>
- </adm:constraint>
<adm:profile name="ldap">
<ldap:object-class>
<ldap:name>ds-cfg-pkcs11-key-manager-provider</ldap:name>
diff --git a/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn.properties b/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn.properties
index 94f6e74..1a31f85 100644
--- a/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn.properties
+++ b/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn.properties
@@ -2,7 +2,6 @@
user-friendly-plural-name=File Based Key Manager Providers
synopsis=The File Based Key Manager Provider can be used to obtain the server certificate from a key store file on the local file system.
description=Multiple file formats may be supported, depending on the providers supported by the underlying Java runtime environment.
-constraint.1.synopsis=The key store pin must be specified using one of the key-store-pin properties when the File Based Key Manager Provider is enabled.
property.enabled.synopsis=Indicates whether the File Based Key Manager Provider is enabled for use.
property.java-class.synopsis=The fully-qualified name of the Java class that provides the File Based Key Manager Provider implementation.
property.key-store-file.synopsis=Specifies the path to the file that contains the private key information. This may be an absolute path, or a path that is relative to the OpenDJ instance root.
diff --git a/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_de.properties b/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_de.properties
index 3efe038..f735fc3 100644
--- a/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_de.properties
+++ b/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_de.properties
@@ -2,7 +2,6 @@
user-friendly-plural-name=Dateigest\u00fctzte Schl\u00fcsselmanageranbieter
synopsis=Mit dem dateigest\u00fctzten Schl\u00fcsselmanageranbieter kann das Serverzertifikat von einer Schl\u00fcsselspeicherdatei auf dem lokalen Dateisystem abgerufen werden.
description=Es k\u00f6nnen mehrere Dateiformate unterst\u00fctzt werden, abh\u00e4ngig von den Anbietern, die von der zugrunde liegenden Java-Runtime-Umgebung unterst\u00fctzt werden.
-constraint.1.synopsis=Die Schl\u00fcsselspeicher-PIN muss mit einer der Schl\u00fcsselspeicher-PIN-Eigenschaften angegeben werden, wenn der dateigest\u00fctzte Schl\u00fcsselmanageranbieter aktiviert ist.
property.enabled.synopsis=Gibt an, ob der dateigest\u00fctzte Schl\u00fcsselmanageranbieter zur Verwendung aktiviert ist.
property.java-class.synopsis=Der vollqualifizierte Name der Java-Klasse, die den dateigest\u00fctzten Schl\u00fcsselmanageranbieter implementiert.
property.key-store-file.synopsis=Gibt den Pfad zur Datei an, die die Informationen zum privaten Schl\u00fcssel enth\u00e4lt. Dies kann ein absoluter Pfad, aber auch ein zum Directory-Server-Root relativer Pfad sein.
diff --git a/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_es.properties b/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_es.properties
index dd52d10..9b61587 100644
--- a/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_es.properties
+++ b/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_es.properties
@@ -2,7 +2,6 @@
user-friendly-plural-name=Proveedores de administradores de claves basados en archivos
synopsis=El proveedor del administrador de claves basado en archivos se puede utilizar para obtener el certificado del servidor desde un archivo de almac\u00e9n de claves del sistema de archivos local.
description=Se admiten varios formatos de archivo en funci\u00f3n de los proveedores compatibles con el entorno de ejecuci\u00f3n de Java subyacente.
-constraint.1.synopsis=Debe especificarse el PIN del almac\u00e9n de claves mediante una de las propiedades "key-store-pin" al habilitar el proveedor del administrador de claves basado en archivos.
property.enabled.synopsis=Indica si el proveedor del administrador de claves basado en archivos se ha habilitado para su uso.
property.java-class.synopsis=El nombre completo de la clase de Java que proporciona la implementaci\u00f3n del proveedor del administrador de claves basado en archivos.
property.key-store-file.synopsis=Especifica la ruta al archivo que contenga la informaci\u00f3n de clave privada. Puede ser una ruta absoluta o una relativa a la ra\u00edz de instancias de OpenDJ.
diff --git a/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_fr.properties b/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_fr.properties
index 50df174..5488cb3 100644
--- a/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_fr.properties
+++ b/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_fr.properties
@@ -2,7 +2,6 @@
user-friendly-plural-name=Fournisseurs de gestionnaire de cl\u00e9 de type fichier
synopsis=Le fournisseur de gestionnaire de cl\u00e9 de type fichier peut \u00eatre utilis\u00e9 pour obtenir le certificat du serveur \u00e0 partir d'un fichier keystore dans le syst\u00e8me de fichiers local.
description=De nombreux formats de fichiers peuvent \u00eatre pris en charge, selon les fournisseurs pris en charge par l'environnement d'ex\u00e9cution Java sous-jacent.
-constraint.1.synopsis=Le mot de passe de keystore doit \u00eatre sp\u00e9cifi\u00e9 en utilisant l'une de ses propri\u00e9t\u00e9s quand le fournisseur de gestionnaire de cl\u00e9 de type fichier est activ\u00e9.
property.enabled.synopsis=Indique si le fournisseur de gestionnaire de cl\u00e9 de type fichier est activ\u00e9 pour utilisation.
property.java-class.synopsis=Le nom complet de la classe Java qui fournit l'impl\u00e9mentation du fournisseur de gestionnaire de cl\u00e9 de type fichier.
property.key-store-file.synopsis=Sp\u00e9cifie le chemin vers le fichier qui contient les informations de cl\u00e9 priv\u00e9es. Ce peut \u00eatre un chemin absolu ou relatif \u00e0 la racine d'instance d'OpenDJ.
diff --git a/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_ja.properties b/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_ja.properties
index 3c57137..cd55353 100644
--- a/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_ja.properties
+++ b/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_ja.properties
@@ -2,7 +2,6 @@
user-friendly-plural-name=\u30d5\u30a1\u30a4\u30eb\u30d9\u30fc\u30b9\u9375\u30de\u30cd\u30fc\u30b8\u30e3\u30fc\u30d7\u30ed\u30d0\u30a4\u30c0
synopsis=\u30d5\u30a1\u30a4\u30eb\u30d9\u30fc\u30b9\u9375\u30de\u30cd\u30fc\u30b8\u30e3\u30fc\u30d7\u30ed\u30d0\u30a4\u30c0\u3092\u4f7f\u7528\u3059\u308b\u3068\u3001\u30ed\u30fc\u30ab\u30eb\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0\u306e\u9375\u30b9\u30c8\u30a2\u30d5\u30a1\u30a4\u30eb\u304b\u3089\u30b5\u30fc\u30d0\u30fc\u8a3c\u660e\u66f8\u3092\u53d6\u5f97\u3067\u304d\u307e\u3059\u3002
description=\u57fa\u672c Java \u5b9f\u884c\u74b0\u5883\u3067\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u308b\u30d7\u30ed\u30d0\u30a4\u30c0\u306b\u3088\u3063\u3066\u306f\u3001\u8907\u6570\u306e\u30d5\u30a1\u30a4\u30eb\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u304c\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u308b\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002
-constraint.1.synopsis=\u30d5\u30a1\u30a4\u30eb\u30d9\u30fc\u30b9\u9375\u30de\u30cd\u30fc\u30b8\u30e3\u30fc\u30d7\u30ed\u30d0\u30a4\u30c0\u304c\u4f7f\u7528\u53ef\u80fd\u306a\u5834\u5408\u306f\u3001\u3044\u305a\u308c\u304b\u306e key-store-pin \u30d7\u30ed\u30d1\u30c6\u30a3\u30fc\u3092\u4f7f\u7528\u3057\u3066\u3001\u9375\u30b9\u30c8\u30a2 PIN \u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
property.enabled.synopsis=\u30d5\u30a1\u30a4\u30eb\u30d9\u30fc\u30b9\u9375\u30de\u30cd\u30fc\u30b8\u30e3\u30fc\u30d7\u30ed\u30d0\u30a4\u30c0\u304c\u4f7f\u7528\u53ef\u80fd\u304b\u3069\u3046\u304b\u3092\u793a\u3057\u307e\u3059\u3002
property.java-class.synopsis=\u30d5\u30a1\u30a4\u30eb\u30d9\u30fc\u30b9\u9375\u30de\u30cd\u30fc\u30b8\u30e3\u30fc\u30d7\u30ed\u30d0\u30a4\u30c0\u306e\u5b9f\u88c5\u3092\u63d0\u4f9b\u3059\u308b Java \u30af\u30e9\u30b9\u306e\u5b8c\u5168\u6307\u5b9a\u540d\u3002
property.key-store-file.synopsis=\u975e\u516c\u958b\u9375\u60c5\u5831\u304c\u683c\u7d0d\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u306e\u30d1\u30b9\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002\u6307\u5b9a\u3067\u304d\u308b\u306e\u306f\u3001\u7d76\u5bfe\u30d1\u30b9\u3001\u307e\u305f\u306f OpenDJ \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u30eb\u30fc\u30c8\u306b\u5bfe\u3059\u308b\u76f8\u5bfe\u30d1\u30b9\u3067\u3059\u3002
diff --git a/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_ko.properties b/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_ko.properties
index d1ad255..0d18b02 100644
--- a/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_ko.properties
+++ b/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_ko.properties
@@ -2,7 +2,6 @@
user-friendly-plural-name=File Based Key Manager Providers
synopsis=The File Based Key Manager Provider can be used to obtain the server certificate from a key store file on the local file system.
description=Multiple file formats may be supported, depending on the providers supported by the underlying Java runtime environment.
-constraint.1.synopsis=The key store pin must be specified using one of the key-store-pin properties when the File Based Key Manager Provider is enabled.
property.enabled.synopsis=Indicates whether the File Based Key Manager Provider is enabled for use.
property.java-class.synopsis=The fully-qualified name of the Java class that provides the File Based Key Manager Provider implementation.
property.key-store-file.synopsis=Specifies the path to the file that contains the private key information. This may be an absolute path, or a path that is relative to the OpenDJ instance root.
diff --git a/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_zh_CN.properties b/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_zh_CN.properties
index 91ce609..a1ec810 100644
--- a/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_zh_CN.properties
+++ b/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_zh_CN.properties
@@ -2,7 +2,6 @@
user-friendly-plural-name=\u57fa\u4e8e\u6587\u4ef6\u7684\u5bc6\u94a5\u7ba1\u7406\u5668\u63d0\u4f9b\u7a0b\u5e8f
synopsis=\u57fa\u4e8e\u6587\u4ef6\u7684\u5bc6\u94a5\u7ba1\u7406\u5668\u63d0\u4f9b\u7a0b\u5e8f\u53ef\u4ee5\u7528\u4e8e\u4ece\u672c\u5730\u6587\u4ef6\u7cfb\u7edf\u4e0a\u7684\u5bc6\u94a5\u5e93\u6587\u4ef6\u4e2d\u83b7\u53d6\u670d\u52a1\u5668\u8bc1\u4e66\u3002
description=\u53ef\u4ee5\u652f\u6301\u591a\u79cd\u6587\u4ef6\u683c\u5f0f\uff0c\u5177\u4f53\u53d6\u51b3\u4e8e\u57fa\u7840 Java \u8fd0\u884c\u65f6\u73af\u5883\u6240\u652f\u6301\u7684\u63d0\u4f9b\u7a0b\u5e8f\u3002
-constraint.1.synopsis=\u542f\u7528\u57fa\u4e8e\u6587\u4ef6\u7684\u5bc6\u94a5\u7ba1\u7406\u5668\u63d0\u4f9b\u7a0b\u5e8f\u540e\uff0c\u5fc5\u987b\u4f7f\u7528\u4e00\u4e2a key-store-pin \u5c5e\u6027\u6307\u5b9a\u5bc6\u94a5\u5e93\u7684\u4e2a\u4eba\u8bc6\u522b\u7801\u3002
property.enabled.synopsis=\u6307\u793a\u662f\u5426\u542f\u7528\u57fa\u4e8e\u6587\u4ef6\u7684\u5bc6\u94a5\u7ba1\u7406\u5668\u63d0\u4f9b\u7a0b\u5e8f\u4ee5\u8fdb\u884c\u4f7f\u7528\u3002
property.java-class.synopsis=\u63d0\u4f9b\u57fa\u4e8e\u6587\u4ef6\u7684\u5bc6\u94a5\u7ba1\u7406\u5668\u63d0\u4f9b\u7a0b\u5e8f\u5b9e\u73b0\u7684 Java \u7c7b\u7684\u5168\u9650\u5b9a\u540d\u3002
property.key-store-file.synopsis=\u6307\u5b9a\u5305\u542b\u79c1\u94a5\u4fe1\u606f\u7684\u6587\u4ef6\u7684\u8def\u5f84\u3002\u5b83\u53ef\u4ee5\u662f\u7edd\u5bf9\u8def\u5f84\uff0c\u4e5f\u53ef\u4ee5\u662f\u76f8\u5bf9\u4e8e OpenDJ \u5b9e\u4f8b\u6839\u76ee\u5f55\u7684\u8def\u5f84\u3002
diff --git a/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_zh_TW.properties b/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_zh_TW.properties
index 913e6ad..067eeae 100644
--- a/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_zh_TW.properties
+++ b/opends/src/admin/messages/FileBasedKeyManagerProviderCfgDefn_zh_TW.properties
@@ -2,7 +2,6 @@
user-friendly-plural-name=File Based Key Manager Providers
synopsis=The File Based Key Manager Provider can be used to obtain the server certificate from a key store file on the local file system.
description=Multiple file formats may be supported, depending on the providers supported by the underlying Java runtime environment.
-constraint.1.synopsis=The key store pin must be specified using one of the key-store-pin properties when the File Based Key Manager Provider is enabled.
property.enabled.synopsis=Indicates whether the File Based Key Manager Provider is enabled for use.
property.java-class.synopsis=The fully-qualified name of the Java class that provides the File Based Key Manager Provider implementation.
property.key-store-file.synopsis=Specifies the path to the file that contains the private key information. This may be an absolute path, or a path that is relative to the OpenDJ instance root.
diff --git a/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn.properties b/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn.properties
index 2cf098a..cd1260c 100644
--- a/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn.properties
+++ b/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn.properties
@@ -2,7 +2,6 @@
user-friendly-plural-name=PKCS11 Key Manager Providers
synopsis=The PKCS11 Key Manager Provider enables the server to access the private key information through the PKCS11 interface.
description=This standard interface is used by cryptographic accelerators and hardware security modules.
-constraint.1.synopsis=The key store pin must be specified using one of the key-store-pin properties when the PKCS11 Key Manager Provider is enabled.
property.enabled.synopsis=Indicates whether the PKCS11 Key Manager Provider is enabled for use.
property.java-class.synopsis=The fully-qualified name of the Java class that provides the PKCS11 Key Manager Provider implementation.
property.key-store-pin.synopsis=Specifies the clear-text PIN needed to access the PKCS11 Key Manager Provider .
diff --git a/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_de.properties b/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_de.properties
index 75dd9b0..6ae7458 100644
--- a/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_de.properties
+++ b/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_de.properties
@@ -2,7 +2,6 @@
user-friendly-plural-name=PKCS11-Schl\u00fcsselmanageranbieter
synopsis=Der PKCS11-Schl\u00fcsselmanageranbieter erm\u00f6glicht es dem Server, \u00fcber die PKCS11-Schnittstelle auf private Schl\u00fcsselinformationen zuzugreifen.
description=Diese standardm\u00e4\u00dfige Schnittstelle wird von kryptographischen Beschleunigern und Hardware-Sicherheitsmodulen verwendet.
-constraint.1.synopsis=Die Schl\u00fcssel-Store-PIN muss mit einer der Schl\u00fcssel-Store-PIN-Eigenschaften angegeben werden, wenn der PKCS11-Schl\u00fcsselmanageranbieter aktiviert ist.
property.enabled.synopsis=Gibt an, ob der PKCS11-Schl\u00fcsselmanageranbieter aktiviert ist.
property.java-class.synopsis=Der vollst\u00e4ndig qualifizierte Name der Java-Klasse, die den PKCS11-Schl\u00fcsselmanageranbieter implementiert.
property.key-store-pin.synopsis=Gibt die Klartext-PIN an, die f\u00fcr den Zugriff auf den PKCS11-Schl\u00fcsselmanageranbieter ben\u00f6tigt wird.
diff --git a/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_es.properties b/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_es.properties
index b09e3e1..d1b588b 100644
--- a/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_es.properties
+++ b/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_es.properties
@@ -2,7 +2,6 @@
user-friendly-plural-name=Proveedores de administradores de claves PKCS11
synopsis=El proveedor de administradores de claves PKCS11 permite al servidor acceder a la informaci\u00f3n de clave privada a trav\u00e9s de la interfaz PKCS11.
description=Esta interfaz est\u00e1ndar la utilizan aceleradores criptogr\u00e1ficos y m\u00f3dulos de seguridad de hardware.
-constraint.1.synopsis=El pin de almacenamiento de clave debe especificarse utilizando una de las propiedades de pin de almacenamiento de clave cuando est\u00e1 habilitado el proveedor de administradores de claves PKCS11.
property.enabled.synopsis=Indica si est\u00e1 habilitado el proveedor de administradores de claves PKCS11 para su uso.
property.java-class.synopsis=El nombre completo de la clase de Java que proporciona la implementaci\u00f3n del proveedor de administradores de claves PKCS11.
property.key-store-pin.synopsis=Especifica el PIN no cifrado necesario para acceder al proveedor de administradores de claves PKCS11.
diff --git a/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_fr.properties b/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_fr.properties
index a608394..0cde9bf 100644
--- a/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_fr.properties
+++ b/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_fr.properties
@@ -2,7 +2,6 @@
user-friendly-plural-name=Fournisseurs de gestionnaire de cl\u00e9 PKCS11
synopsis=Le fournisseur de gestionnaire de cl\u00e9 PKCS11 permet au serveur d'acc\u00e9der aux informations de cl\u00e9 priv\u00e9e via l'interface PKCS11.
description=Cette interface standard est utilis\u00e9e par des acc\u00e9l\u00e9rateurs de chiffrement et des modules de s\u00e9curit\u00e9 de mat\u00e9riel.
-constraint.1.synopsis=Le mot de passe du keystore doit \u00eatre sp\u00e9cifi\u00e9 lors de l'utilisation des propri\u00e9t\u00e9s key-store-pin quand le fournisseur de gestionnaire de cl\u00e9 PKCS11 est activ\u00e9.
property.enabled.synopsis=Indique si le fournisseur de gestionnaire de cl\u00e9 PKCS11 est activ\u00e9 pour utilisation.
property.java-class.synopsis=Le nom complet de la classe Java qui fournit l'impl\u00e9mentation du fournisseur de gestionnaire de cl\u00e9 PKCS11.
property.key-store-pin.synopsis=Sp\u00e9cifie le num\u00e9ro d'identification personnel en texte clair n\u00e9cessaire \u00e0 l'ouverture du gestionnaire de cl\u00e9s PKCS11.
diff --git a/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_ja.properties b/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_ja.properties
index ee79a98..c6af23f 100644
--- a/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_ja.properties
+++ b/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_ja.properties
@@ -2,7 +2,6 @@
user-friendly-plural-name=PKCS11 \u30ad\u30fc\u30de\u30cd\u30fc\u30b8\u30e3\u30fc\u30d7\u30ed\u30d0\u30a4\u30c0
synopsis=PKCS11 \u30ad\u30fc\u30de\u30cd\u30fc\u30b8\u30e3\u30fc\u30d7\u30ed\u30d0\u30a4\u30c0\u306f\u3001\u30b5\u30fc\u30d0\u30fc\u304c PKCS11 \u30a4\u30f3\u30bf\u30d5\u30a7\u30fc\u30b9\u304b\u3089\u975e\u516c\u958b\u9375\u60c5\u5831\u306b\u30a2\u30af\u30bb\u30b9\u3067\u304d\u308b\u3088\u3046\u306b\u3057\u307e\u3059\u3002
description=\u3053\u306e\u6a19\u6e96\u30a4\u30f3\u30bf\u30d5\u30a7\u30fc\u30b9\u306f\u3001\u6697\u53f7\u5316\u30a2\u30af\u30bb\u30e9\u30ec\u30fc\u30bf\u3068\u30cf\u30fc\u30c9\u30a6\u30a7\u30a2\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fc\u30e2\u30b8\u30e5\u30fc\u30eb\u306b\u3088\u3063\u3066\u4f7f\u7528\u3055\u308c\u307e\u3059\u3002
-constraint.1.synopsis=\u9375\u30b9\u30c8\u30a2\u306e PIN \u306f\u3001PKCS11 \u30ad\u30fc\u30de\u30cd\u30fc\u30b8\u30e3\u30fc\u30d7\u30ed\u30d0\u30a4\u30c0\u304c\u6709\u52b9\u306b\u306a\u3063\u3066\u3044\u308b\u3068\u304d\u306b key-store-pin \u5c5e\u6027\u306e\u3044\u305a\u308c\u304b\u3092\u4f7f\u7528\u3057\u3066\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
property.enabled.synopsis=PKCS11 \u30ad\u30fc\u30de\u30cd\u30fc\u30b8\u30e3\u30fc\u30d7\u30ed\u30d0\u30a4\u30c0\u304c\u4f7f\u7528\u3067\u304d\u308b\u3088\u3046\u306b\u306a\u3063\u3066\u3044\u308b\u304b\u3069\u3046\u304b\u3092\u793a\u3057\u307e\u3059\u3002
property.java-class.synopsis=PKCS11 \u30ad\u30fc\u30de\u30cd\u30fc\u30b8\u30e3\u30fc\u30d7\u30ed\u30d0\u30a4\u30c0\u306e\u5b9f\u88c5\u3092\u63d0\u4f9b\u3059\u308b Java \u30af\u30e9\u30b9\u306e\u5b8c\u5168\u6307\u5b9a\u540d\u3002
property.key-store-pin.synopsis=PKCS11 \u30ad\u30fc\u30de\u30cd\u30fc\u30b8\u30e3\u30fc\u30d7\u30ed\u30d0\u30a4\u30c0\u3078\u306e\u30a2\u30af\u30bb\u30b9\u306b\u5fc5\u8981\u306a\u5e73\u6587 PIN \u3092\u6307\u5b9a\u3057\u307e\u3059\u3002
diff --git a/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_ko.properties b/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_ko.properties
index 2cf098a..cd1260c 100644
--- a/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_ko.properties
+++ b/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_ko.properties
@@ -2,7 +2,6 @@
user-friendly-plural-name=PKCS11 Key Manager Providers
synopsis=The PKCS11 Key Manager Provider enables the server to access the private key information through the PKCS11 interface.
description=This standard interface is used by cryptographic accelerators and hardware security modules.
-constraint.1.synopsis=The key store pin must be specified using one of the key-store-pin properties when the PKCS11 Key Manager Provider is enabled.
property.enabled.synopsis=Indicates whether the PKCS11 Key Manager Provider is enabled for use.
property.java-class.synopsis=The fully-qualified name of the Java class that provides the PKCS11 Key Manager Provider implementation.
property.key-store-pin.synopsis=Specifies the clear-text PIN needed to access the PKCS11 Key Manager Provider .
diff --git a/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_zh_CN.properties b/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_zh_CN.properties
index a3ad240..fc9fde2 100644
--- a/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_zh_CN.properties
+++ b/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_zh_CN.properties
@@ -2,7 +2,6 @@
user-friendly-plural-name=PKCS11 \u5bc6\u94a5\u7ba1\u7406\u5668\u63d0\u4f9b\u7a0b\u5e8f
synopsis=PKCS11 \u5bc6\u94a5\u7ba1\u7406\u5668\u63d0\u4f9b\u7a0b\u5e8f\u4f7f\u670d\u52a1\u5668\u53ef\u4ee5\u901a\u8fc7 PKCS11 \u63a5\u53e3\u8bbf\u95ee\u79c1\u94a5\u4fe1\u606f\u3002
description=\u6b64\u6807\u51c6\u63a5\u53e3\u7531\u52a0\u5bc6\u52a0\u901f\u5668\u548c\u786c\u4ef6\u5b89\u5168\u6a21\u5757\u4f7f\u7528\u3002
-constraint.1.synopsis=\u542f\u7528\u4e86 PKCS11 \u5bc6\u94a5\u7ba1\u7406\u5668\u63d0\u4f9b\u7a0b\u5e8f\u540e\uff0c\u5fc5\u987b\u4f7f\u7528\u4e00\u4e2a key-store-pin \u5c5e\u6027\u6307\u5b9a\u5bc6\u94a5\u5b58\u50a8\u6307\u9488\u3002
property.enabled.synopsis=\u6307\u793a\u662f\u5426\u542f\u7528 PKCS11 \u5bc6\u94a5\u7ba1\u7406\u5668\u63d0\u4f9b\u7a0b\u5e8f\u3002
property.java-class.synopsis=\u5b9e\u73b0 PKCS11 \u5bc6\u94a5\u7ba1\u7406\u5668\u63d0\u4f9b\u7a0b\u5e8f\u529f\u80fd\u7684 Java \u7c7b\u7684\u5b8c\u5168\u9650\u5b9a\u540d\u79f0\u3002
property.key-store-pin.synopsis=\u6307\u5b9a\u8bbf\u95ee PKCS11 \u5bc6\u94a5\u7ba1\u7406\u5668\u63d0\u4f9b\u7a0b\u5e8f\u6240\u9700\u7684\u660e\u6587\u4e2a\u4eba\u8bc6\u522b\u7801\u3002
diff --git a/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_zh_TW.properties b/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_zh_TW.properties
index 2cf098a..cd1260c 100644
--- a/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_zh_TW.properties
+++ b/opends/src/admin/messages/PKCS11KeyManagerProviderCfgDefn_zh_TW.properties
@@ -2,7 +2,6 @@
user-friendly-plural-name=PKCS11 Key Manager Providers
synopsis=The PKCS11 Key Manager Provider enables the server to access the private key information through the PKCS11 interface.
description=This standard interface is used by cryptographic accelerators and hardware security modules.
-constraint.1.synopsis=The key store pin must be specified using one of the key-store-pin properties when the PKCS11 Key Manager Provider is enabled.
property.enabled.synopsis=Indicates whether the PKCS11 Key Manager Provider is enabled for use.
property.java-class.synopsis=The fully-qualified name of the Java class that provides the PKCS11 Key Manager Provider implementation.
property.key-store-pin.synopsis=Specifies the clear-text PIN needed to access the PKCS11 Key Manager Provider .
diff --git a/opends/src/messages/messages/extension.properties b/opends/src/messages/messages/extension.properties
index ecc6d0d..4b30b1c 100644
--- a/opends/src/messages/messages/extension.properties
+++ b/opends/src/messages/messages/extension.properties
@@ -21,7 +21,7 @@
# CDDL HEADER END
#
# Copyright 2006-2010 Sun Microsystems, Inc.
-# Portions Copyright 2011-2012 ForgeRock AS
+# Portions Copyright 2011-2013 ForgeRock AS
@@ -135,13 +135,6 @@
SEVERE_ERR_FILE_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR_60=An unexpected \
error occurred while trying to determine the value of configuration attribute \
ds-cfg-key-store-pin in configuration entry %s: %s
-SEVERE_ERR_FILE_KEYMANAGER_NO_PIN_61=Configuration entry %s does not specify \
- a means of determining the PIN needed to access the contents of the \
- file-based key manager. The PIN may be specified in a Java property (named \
- by attribute ds-cfg-key-store-pin-property), an environment variable (named \
- by attribute ds-cfg-key-store-pin-environment-variable), a text file (named \
- by attribute ds-cfg-key-store-pin-file), or directly in the entry using \
- attribute ds-cfg-key-store-pin
SEVERE_ERR_FILE_KEYMANAGER_CANNOT_LOAD_62=An error occurred while trying to \
load the keystore contents from file %s: %s
SEVERE_ERR_FILE_KEYMANAGER_INVALID_TYPE_63=The keystore type %s specified in \
@@ -167,13 +160,6 @@
SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR_79=An unexpected \
error occurred while trying to determine the value of configuration attribute \
ds-cfg-key-store-pin in configuration entry %s: %s
-SEVERE_ERR_PKCS11_KEYMANAGER_NO_PIN_80=Configuration entry %s does not \
- specify a means of determining the PIN needed to access the contents of the \
- PKCS#11 key manager. The PIN may be specified in a Java property (named by \
- attribute ds-cfg-key-store-pin-property), an environment variable (named by \
- attribute ds-cfg-key-store-pin-environment-variable), a text file (named by \
- attribute ds-cfg-key-store-pin-file), or directly in the entry using \
- attribute ds-cfg-key-store-pin
SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_LOAD_81=An error occurred while trying to \
access the PKCS#11 key manager: %s
SEVERE_ERR_FILE_KEYMANAGER_CANNOT_CREATE_FACTORY_83=An error occurred while \
diff --git a/opends/src/messages/messages/extension_de.properties b/opends/src/messages/messages/extension_de.properties
index e51c785..25e1002 100644
--- a/opends/src/messages/messages/extension_de.properties
+++ b/opends/src/messages/messages/extension_de.properties
@@ -21,7 +21,7 @@
# CDDL HEADER END
#
# Copyright 2006-2010 Sun Microsystems, Inc.
-# Portions Copyright 2011-2012 ForgeRock AS
+# Portions Copyright 2011-2013 ForgeRock AS
@@ -79,7 +79,6 @@
SEVERE_ERR_FILE_KEYMANAGER_PIN_FILE_CANNOT_READ_57=Fehler beim Versuch, die Schl\u00fcsselspeicher-PIN aus Datei %s, die in Konfigurationsattribut ds-cfg-key-store-pin-file des Konfigurationseintrags %s spezifiziert ist, zu lesen: %s
SEVERE_ERR_FILE_KEYMANAGER_PIN_FILE_EMPTY_58=Datei %s, die in Attribut ds-cfg-key-store-pin-file des Konfigurationseintrags %s angegeben ist, sollte die f\u00fcr den Zugriff auf den dateibasierten Schl\u00fcsselmanager erforderliche PIN enthalten, aber die Datei ist leer
SEVERE_ERR_FILE_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR_60=Unerwarteter Fehler beim Versuch, den Wert des Konfigurationsattributs ds-cfg-key-store-pin in Konfigurationseintrag %s festzulegen: %s
-SEVERE_ERR_FILE_KEYMANAGER_NO_PIN_61=Konfigurationseintrag %s gibt keine M\u00f6glichkeit zur Festlegung der PIN an, die f\u00fcr den Zugriff auf den Inhalt des dateibasierten Schl\u00fcsselmanagers erforderlich ist. Die PIN kann in einer Java-Eigenschaft (benannt durch Attribut ds-cfg-key-store-pin-property), einer Umgebungsvariablen (benannt durch Attribut ds-cfg-key-store-pin-environment-variable), einer Textdatei (benannt durch Attribut ds-cfg-key-store-pin-file) oder direkt in dem Eintrag mithilfe von Attribut ds-cfg-key-store-pin angegeben werden
SEVERE_ERR_FILE_KEYMANAGER_CANNOT_LOAD_62=Fehler beim Versuch, den Schl\u00fcsselspeicherinhalt aus Datei %s zu laden: %s
SEVERE_ERR_FILE_KEYMANAGER_INVALID_TYPE_63=Der Schl\u00fcsselspeichertyp %s, der in Attribut ds-cfg-key-store-type des Konfigurationseintrags %s angegeben ist, ist ung\u00fcltig: %s
SEVERE_ERR_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET_68=Java-Eigenschaft %s, die in Attribut ds-cfg-key-store-pin-property des Konfigurationseintrags %s angegeben ist, sollte die f\u00fcr den Zugriff auf den PKCS#11-Schl\u00fcsselmanager erforderliche PIN enthalten, aber diese Eigenschaft ist nicht angegeben
@@ -88,7 +87,6 @@
SEVERE_ERR_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ_75=Fehler beim Versuch, die Schl\u00fcsselspeicher-PIN aus Datei %s, die in Konfigurationsattribut ds-cfg-key-store-pin-file des Konfigurationseintrags %s spezifiziert ist, zu lesen: %s
SEVERE_ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY_76=Datei %s, die in Attribut ds-cfg-key-store-pin-file des Konfigurationseintrags %s angegeben ist, sollte die f\u00fcr den Zugriff auf den PKCS#11-Schl\u00fcsselmanager erforderliche PIN enthalten, aber die Datei ist leer
SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR_79=Unerwarteter Fehler beim Versuch, den Wert des Konfigurationsattributs ds-cfg-key-store-pin in Konfigurationseintrag %s festzulegen: %s
-SEVERE_ERR_PKCS11_KEYMANAGER_NO_PIN_80=Konfigurationseintrag %s gibt keine M\u00f6glichkeit zur Festlegung der PIN an, die f\u00fcr den Zugriff auf den Inhalt des PKCS#11-Schl\u00fcsselmanagers erforderlich ist. Die PIN kann in einer Java-Eigenschaft (benannt durch Attribut ds-cfg-key-store-pin-property), einer Umgebungsvariablen (benannt durch Attribut ds-cfg-key-store-pin-environment-variable), einer Textdatei (benannt durch Attribut ds-cfg-key-store-pin-file) oder direkt in dem Eintrag mithilfe von Attribut ds-cfg-key-store-pin angegeben werden
SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_LOAD_81=Fehler beim Versuch, auf den PKCS#11-Schl\u00fcsselmanager zuzugreifen: %s
SEVERE_ERR_FILE_KEYMANAGER_CANNOT_CREATE_FACTORY_83=Fehler beim Versuch, eine Schl\u00fcsselmanager-Factory zu erstellen, um auf den Inhalt der Schl\u00fcsselspeicherdatei %s zuzugreifen: %s
SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_CREATE_FACTORY_84=Fehler beim Versuch, eine Schl\u00fcsselmanager-Factory zu erstellen, um auf den Inhalt des PKCS#11-Schl\u00fcsselspeichers zuzugreifen: %s
diff --git a/opends/src/messages/messages/extension_es.properties b/opends/src/messages/messages/extension_es.properties
index a066f39..f027ed7 100644
--- a/opends/src/messages/messages/extension_es.properties
+++ b/opends/src/messages/messages/extension_es.properties
@@ -21,7 +21,7 @@
# CDDL HEADER END
#
# Copyright 2006-2010 Sun Microsystems, Inc.
-# Portions Copyright 2011-2012 ForgeRock AS
+# Portions Copyright 2011-2013 ForgeRock AS
@@ -79,7 +79,6 @@
SEVERE_ERR_FILE_KEYMANAGER_PIN_FILE_CANNOT_READ_57=Se ha producido un error al tratar de leer el PIN del almac\u00e9n de claves desde el archivo %s especificado en el atributo de configuraci\u00f3n ds-cfg-key-store-pin-file de la entrada de configuraci\u00f3n %s: %s
SEVERE_ERR_FILE_KEYMANAGER_PIN_FILE_EMPTY_58=El archivo %s especificado en el atributo ds-cfg-key-store-pin-file de la entrada de configuraci\u00f3n %s deber\u00eda contener el PIN necesario para acceder al administrador de claves basado en archivo, pero este archivo est\u00e1 vac\u00edo
SEVERE_ERR_FILE_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR_60=Se ha producido un error inesperado al tratar de determinar el valor del atributo de configuraci\u00f3n ds-cfg-key-store-pin en la entrada de configuraci\u00f3n %s: %s
-SEVERE_ERR_FILE_KEYMANAGER_NO_PIN_61=La entrada de configuraci\u00f3n %s no especifica un medio de determinar el PIN necesario para acceder al contenido del administrador de claves basado en archivo. El PIN puede especificarse en una propiedad Java (nombrada por el atributo ds-cfg-key-store-pin-property), en una variable de entorno (nombrada por el atributo ds-cfg-key-store-pin-environment-variable), en un archivo de texto (nombrado por el atributo ds-cfg-key-store-pin-file) o directamente en la entrada con el atributo ds-cfg-key-store-pin
SEVERE_ERR_FILE_KEYMANAGER_CANNOT_LOAD_62=Se ha producido un error al tratar de cargar el contenido del almac\u00e9n de claves desde el archivo %s: %s
SEVERE_ERR_FILE_KEYMANAGER_INVALID_TYPE_63=El tipo de almac\u00e9n de claves %s especificado en el atributo ds-cfg-key-store-type de la entrada de configuraci\u00f3n %s no es v\u00e1lido: %s
SEVERE_ERR_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET_68=La propiedad Java %s que est\u00e1 especificada en el atributo ds-cfg-key-store-pin-property de la entrada de configuraci\u00f3n %s deber\u00eda contener el PIN necesario para acceder al administrador de claves PKCS#11, pero esta propiedad no est\u00e1 definida
@@ -88,7 +87,6 @@
SEVERE_ERR_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ_75=Se ha producido un error al tratar de leer el PIN del almac\u00e9n de claves desde el archivo %s especificado en el atributo de configuraci\u00f3n ds-cfg-key-store-pin-file de la entrada de configuraci\u00f3n %s: %s
SEVERE_ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY_76=El archivo %s especificado en el atributo ds-cfg-key-store-pin-file de la entrada de configuraci\u00f3n %s deber\u00eda contener el PIN necesario para acceder al administrador de claves PKCS#11, pero este archivo est\u00e1 vac\u00edo
SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR_79=Se ha producido un error inesperado al tratar de determinar el valor del atributo de configuraci\u00f3n ds-cfg-key-store-pin en la entrada de configuraci\u00f3n %s: %s
-SEVERE_ERR_PKCS11_KEYMANAGER_NO_PIN_80=La entrada de configuraci\u00f3n %s no especifica un medio de determinar el PIN necesario para acceder al contenido del administrador de claves PKCS#11. El PIN puede especificarse en una propiedad Java (nombrada por el atributo ds-cfg-key-store-pin-property), en una variable de entorno (nombrada por el atributo ds-cfg-key-store-pin-environment-variable), en un archivo de texto (nombrado por el atributo ds-cfg-key-store-pin-file) o directamente en la entrada con el atributo ds-cfg-key-store-pin
SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_LOAD_81=Se ha producido un error al tratar de acceder al administrador de claves PKCS#11: %s
SEVERE_ERR_FILE_KEYMANAGER_CANNOT_CREATE_FACTORY_83=Se ha producido un error al tratar de crear una f\u00e1brica de administrador de claves para acceder al contenido del archivo de almac\u00e9n de claves %s: %s
SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_CREATE_FACTORY_84=Se ha producido un error al tratar de crear una f\u00e1brica de administrador de claves para acceder al contenido del almac\u00e9n de claves PKCS#11: %s
diff --git a/opends/src/messages/messages/extension_fr.properties b/opends/src/messages/messages/extension_fr.properties
index af1c90c..54486f2 100644
--- a/opends/src/messages/messages/extension_fr.properties
+++ b/opends/src/messages/messages/extension_fr.properties
@@ -21,7 +21,7 @@
# CDDL HEADER END
#
# Copyright 2006-2010 Sun Microsystems, Inc.
-# Portions Copyright 2011-2012 ForgeRock AS
+# Portions Copyright 2011-2013 ForgeRock AS
@@ -79,7 +79,6 @@
SEVERE_ERR_FILE_KEYMANAGER_PIN_FILE_CANNOT_READ_57=Une erreur s\u2019est produite lors de la tentative de lecture du NIP de magasin de cl\u00e9s depuis le fichier %s sp\u00e9cifi\u00e9 dans l\u2019attribut de configuration ds-cfg-key-store-pin-file de l\u2019entr\u00e9e de configuration %s\u00a0: %s
SEVERE_ERR_FILE_KEYMANAGER_PIN_FILE_EMPTY_58=Le fichier %s, sp\u00e9cifi\u00e9 dans l\u2019attribut ds-cfg-key-store-pin-file de l\u2019entr\u00e9e de configuration %s, doit contenir le code NIP n\u00e9cessaire \u00e0 l\u2019acc\u00e8s au gestionnaire de cl\u00e9 de type fichier, mais ce fichier est vide
SEVERE_ERR_FILE_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR_60=Une erreur inattendue s\u2019est produite lors de la tentative de d\u00e9termination de la valeur de l\u2019attribut de configuration ds-cfg-key-store-pin dans l\u2019entr\u00e9e de configuration %s\u00a0: %s
-SEVERE_ERR_FILE_KEYMANAGER_NO_PIN_61=L\u2019entr\u00e9e de configuration %s ne sp\u00e9cifie aucun moyen de d\u00e9terminer le code NIP n\u00e9cessaire \u00e0 l\u2019acc\u00e8s au contenu du gestionnaire de cl\u00e9 de type fichier. Le code NIP peut \u00eatre sp\u00e9cifi\u00e9 dans une propri\u00e9t\u00e9 Java (nomm\u00e9e dans l\u2019attribut ds-cfg-key-store-pin-property), une variable d\u2019environnement (nomm\u00e9e dans l\u2019attribut ds-cfg-key-store-pin-environment-variable), un fichier texte (nomm\u00e9 dans l\u2019attribut ds-cfg-key-store-pin-file) ou directement dans l\u2019entr\u00e9e avec l\u2019attribut ds-cfg-key-store-pin
SEVERE_ERR_FILE_KEYMANAGER_CANNOT_LOAD_62=Une erreur s\u2019est produite lors de la tentative de chargement du contenu du magasin de cl\u00e9s depuis le fichier %s\u00a0: %s
SEVERE_ERR_FILE_KEYMANAGER_INVALID_TYPE_63=Le type de magasin de cl\u00e9s %s, indiqu\u00e9 dans l\u2019attribut ds-cfg-key-store-type de l\u2019entr\u00e9e de configuration %s, n\u2019est pas valide\u00a0: %s
SEVERE_ERR_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET_68=La propri\u00e9t\u00e9 Java %s, sp\u00e9cifi\u00e9e dans l\u2019attribut ds-cfg-key-store-pin-property de l\u2019entr\u00e9e de configuration %s, doit contenir le code NIP n\u00e9cessaire \u00e0 l\u2019acc\u00e8s au gestionnaire de cl\u00e9 PKCS#11, mais cette propri\u00e9t\u00e9 n\u2019est pas d\u00e9finie
@@ -88,7 +87,6 @@
SEVERE_ERR_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ_75=Une erreur s\u2019est produite lors de la tentative de lecture du NIP de magasin de cl\u00e9s depuis le fichier %s sp\u00e9cifi\u00e9 dans l\u2019attribut de configuration ds-cfg-key-store-pin-file de l\u2019entr\u00e9e de configuration %s\u00a0: %s
SEVERE_ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY_76=Le fichier %s, sp\u00e9cifi\u00e9 dans l\u2019attribut ds-cfg-key-store-pin-file de l\u2019entr\u00e9e de configuration %s, doit contenir le code NIP n\u00e9cessaire \u00e0 l\u2019acc\u00e8s au gestionnaire de cl\u00e9 PKCS#11, mais ce fichier est vide
SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR_79=Une erreur inattendue s\u2019est produite lors de la tentative de d\u00e9termination de la valeur de l\u2019attribut de configuration ds-cfg-key-store-pin dans l\u2019entr\u00e9e de configuration %s\u00a0: %s
-SEVERE_ERR_PKCS11_KEYMANAGER_NO_PIN_80=L\u2019entr\u00e9e de configuration %s ne sp\u00e9cifie aucun moyen de d\u00e9terminer le code NIP n\u00e9cessaire \u00e0 l\u2019acc\u00e8s au contenu du gestionnaire de cl\u00e9 PKCS#11. Le code NIP peut \u00eatre sp\u00e9cifi\u00e9 dans une propri\u00e9t\u00e9 Java (nomm\u00e9e dans l\u2019attribut ds-cfg-key-store-pin-property), une variable d\u2019environnement (nomm\u00e9e dans l\u2019attribut ds-cfg-key-store-pin-environment-variable), un fichier texte (nomm\u00e9 dans l\u2019attribut ds-cfg-key-store-pin-file) ou directement dans l\u2019entr\u00e9e avec l\u2019attribut ds-cfg-key-store-pin
SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_LOAD_81=Une erreur s\u2019est produite lors de la tentative d\u2019acc\u00e8s au gestionnaire de cl\u00e9 PKCS#11\u00a0: %s
SEVERE_ERR_FILE_KEYMANAGER_CANNOT_CREATE_FACTORY_83=Une erreur s\u2019est produite lors de la tentative de cr\u00e9ation d\u2019une fabrique de gestionnaire de cl\u00e9 pour acc\u00e9der au contenu du fichier de magasin de cl\u00e9 %s\u00a0: %s
SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_CREATE_FACTORY_84=Une erreur s\u2019est produite lors de la tentative de cr\u00e9ation d\u2019une fabrique de gestionnaire de cl\u00e9 pour acc\u00e9der au contenu du magasin de cl\u00e9 PKCS#11\u00a0: %s
diff --git a/opends/src/messages/messages/extension_ja.properties b/opends/src/messages/messages/extension_ja.properties
index 2380674..e96957d 100644
--- a/opends/src/messages/messages/extension_ja.properties
+++ b/opends/src/messages/messages/extension_ja.properties
@@ -21,7 +21,7 @@
# CDDL HEADER END
#
# Copyright 2006-2010 Sun Microsystems, Inc.
-# Portions copyright 2012 ForgeRock AS.
+# Portions copyright 2012-2013 ForgeRock AS.
@@ -79,7 +79,6 @@
SEVERE_ERR_FILE_KEYMANAGER_PIN_FILE_CANNOT_READ_57=\u69cb\u6210\u30a8\u30f3\u30c8\u30ea %2$s \u306e ds-cfg-key-store-pin-file \u5c5e\u6027\u306b\u6307\u5b9a\u3055\u308c\u3066\u3044\u308b\u30d5\u30a1\u30a4\u30eb %1$s \u304b\u3089\u30ad\u30fc\u30b9\u30c8\u30a2 PIN \u3092\u8aad\u307f\u53d6\u308a\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %3$s
SEVERE_ERR_FILE_KEYMANAGER_PIN_FILE_EMPTY_58=\u69cb\u6210\u30a8\u30f3\u30c8\u30ea %2$s \u306e ds-cfg-key-store-pin-file \u5c5e\u6027\u306b\u6307\u5b9a\u3055\u308c\u3066\u3044\u308b\u30d5\u30a1\u30a4\u30eb %1$s \u306b\u306f\u3001\u30d5\u30a1\u30a4\u30eb\u30d9\u30fc\u30b9\u306e\u30ad\u30fc\u30de\u30cd\u30fc\u30b8\u30e3\u30fc\u3078\u306e\u30a2\u30af\u30bb\u30b9\u306b\u5fc5\u8981\u306a PIN \u304c\u542b\u307e\u308c\u3066\u3044\u308b\u306f\u305a\u3067\u3059\u304c\u3001\u30d5\u30a1\u30a4\u30eb\u304c\u7a7a\u3067\u3059
SEVERE_ERR_FILE_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR_60=\u69cb\u6210\u30a8\u30f3\u30c8\u30ea %s \u306e ds-cfg-key-store-pin \u8a2d\u5b9a\u5c5e\u6027\u306e\u5024\u3092\u5224\u65ad\u4e2d\u306b\u3001\u4e88\u671f\u3057\u306a\u3044\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
-SEVERE_ERR_FILE_KEYMANAGER_NO_PIN_61=\u69cb\u6210\u30a8\u30f3\u30c8\u30ea %s \u306b\u3001\u30d5\u30a1\u30a4\u30eb\u30d9\u30fc\u30b9\u30ad\u30fc\u30de\u30cd\u30fc\u30b8\u30e3\u30fc\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u3078\u306e\u30a2\u30af\u30bb\u30b9\u306b\u5fc5\u8981\u306a PIN \u3092\u5224\u65ad\u3059\u308b\u65b9\u6cd5\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002PIN \u306f\u3001Java \u30d7\u30ed\u30d1\u30c6\u30a3\u30fc\u5185 (ds-cfg-key-store-pin-property \u5c5e\u6027\u3067\u547d\u540d)\u3001\u74b0\u5883\u5909\u6570\u5185 (ds-cfg-key-store-pin-environment-variable \u5c5e\u6027\u3067\u547d\u540d)\u3001\u30c6\u30ad\u30b9\u30c8\u30d5\u30a1\u30a4\u30eb\u5185 (attribute ds-cfg-key-store-pin-file \u5c5e\u6027\u3067\u547d\u540d)\u3001\u307e\u305f\u306f ds-cfg-key-store-pin \u5c5e\u6027\u3092\u4f7f\u7528\u3057\u3066\u76f4\u63a5\u30a8\u30f3\u30c8\u30ea\u5185\u3067\u6307\u5b9a\u3067\u304d\u307e\u3059\u3002
SEVERE_ERR_FILE_KEYMANAGER_CANNOT_LOAD_62=\u30d5\u30a1\u30a4\u30eb %s \u304b\u3089\u30ad\u30fc\u30b9\u30c8\u30a2\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u3092\u8aad\u307f\u8fbc\u307f\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
SEVERE_ERR_FILE_KEYMANAGER_INVALID_TYPE_63=\u69cb\u6210\u30a8\u30f3\u30c8\u30ea %2$s \u306e ds-cfg-key-store-type \u5c5e\u6027\u306b\u6307\u5b9a\u3055\u308c\u3066\u3044\u308b\u30ad\u30fc\u30b9\u30c8\u30a2\u30bf\u30a4\u30d7 %1$s \u304c\u6709\u52b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093: %3$s
SEVERE_ERR_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET_68=\u69cb\u6210\u30a8\u30f3\u30c8\u30ea %2$s \u306e ds-cfg-key-store-pin-property \u5c5e\u6027\u306b\u6307\u5b9a\u3055\u308c\u3066\u3044\u308b Java \u30d7\u30ed\u30d1\u30c6\u30a3\u30fc %1$s \u306b\u306f\u3001PKCS#11 \u30ad\u30fc\u30de\u30cd\u30fc\u30b8\u30e3\u30fc\u3078\u306e\u30a2\u30af\u30bb\u30b9\u306b\u5fc5\u8981\u306a PIN \u304c\u542b\u307e\u308c\u3066\u3044\u308b\u306f\u305a\u3067\u3059\u304c\u3001\u3053\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u30fc\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093
@@ -88,7 +87,6 @@
SEVERE_ERR_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ_75=\u69cb\u6210\u30a8\u30f3\u30c8\u30ea %2$s \u306e ds-cfg-key-store-pin-file \u5c5e\u6027\u306b\u6307\u5b9a\u3055\u308c\u3066\u3044\u308b\u30d5\u30a1\u30a4\u30eb %1$s \u304b\u3089\u30ad\u30fc\u30b9\u30c8\u30a2 PIN \u3092\u8aad\u307f\u53d6\u308a\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %3$s
SEVERE_ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY_76=\u69cb\u6210\u30a8\u30f3\u30c8\u30ea %2$s \u306e ds-cfg-key-store-pin-file \u5c5e\u6027\u306b\u6307\u5b9a\u3055\u308c\u3066\u3044\u308b\u30d5\u30a1\u30a4\u30eb %1$s \u306b\u306f\u3001PKCS#11 \u30ad\u30fc\u30de\u30cd\u30fc\u30b8\u30e3\u30fc\u3078\u306e\u30a2\u30af\u30bb\u30b9\u306b\u5fc5\u8981\u306a PIN \u304c\u542b\u307e\u308c\u3066\u3044\u308b\u306f\u305a\u3067\u3059\u304c\u3001\u30d5\u30a1\u30a4\u30eb\u304c\u7a7a\u3067\u3059
SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR_79=\u69cb\u6210\u30a8\u30f3\u30c8\u30ea %s \u306e ds-cfg-key-store-pin \u8a2d\u5b9a\u5c5e\u6027\u306e\u5024\u3092\u5224\u65ad\u4e2d\u306b\u3001\u4e88\u671f\u3057\u306a\u3044\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
-SEVERE_ERR_PKCS11_KEYMANAGER_NO_PIN_80=\u69cb\u6210\u30a8\u30f3\u30c8\u30ea %s \u306b\u3001PKCS#11 \u30ad\u30fc\u30de\u30cd\u30fc\u30b8\u30e3\u30fc\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u3078\u306e\u30a2\u30af\u30bb\u30b9\u306b\u5fc5\u8981\u306a PIN \u3092\u5224\u65ad\u3059\u308b\u65b9\u6cd5\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002PIN \u306f\u3001Java \u30d7\u30ed\u30d1\u30c6\u30a3\u30fc\u5185 (ds-cfg-key-store-pin-property \u5c5e\u6027\u3067\u547d\u540d)\u3001\u74b0\u5883\u5909\u6570\u5185 (ds-cfg-key-store-pin-environment-variable \u5c5e\u6027\u3067\u547d\u540d)\u3001\u30c6\u30ad\u30b9\u30c8\u30d5\u30a1\u30a4\u30eb\u5185 (attribute ds-cfg-key-store-pin-file \u5c5e\u6027\u3067\u547d\u540d)\u3001\u307e\u305f\u306f ds-cfg-key-store-pin \u5c5e\u6027\u3092\u4f7f\u7528\u3057\u3066\u76f4\u63a5\u30a8\u30f3\u30c8\u30ea\u5185\u3067\u6307\u5b9a\u3067\u304d\u307e\u3059\u3002
SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_LOAD_81=PKCS#11 \u30ad\u30fc\u30de\u30cd\u30fc\u30b8\u30e3\u30fc\u3078\u306e\u30a2\u30af\u30bb\u30b9\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
SEVERE_ERR_FILE_KEYMANAGER_CANNOT_CREATE_FACTORY_83=\u30ad\u30fc\u30b9\u30c8\u30a2\u30d5\u30a1\u30a4\u30eb %s \u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u306b\u30a2\u30af\u30bb\u30b9\u3059\u308b\u305f\u3081\u306e\u30ad\u30fc\u30de\u30cd\u30fc\u30b8\u30e3\u30fc\u30d5\u30a1\u30af\u30c8\u30ea\u3092\u4f5c\u6210\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_CREATE_FACTORY_84=PKCS#11 \u30ad\u30fc\u30b9\u30c8\u30a2\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u306b\u30a2\u30af\u30bb\u30b9\u3059\u308b\u305f\u3081\u306e\u30ad\u30fc\u30de\u30cd\u30fc\u30b8\u30e3\u30fc\u30d5\u30a1\u30af\u30c8\u30ea\u3092\u4f5c\u6210\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
diff --git a/opends/src/messages/messages/extension_ko.properties b/opends/src/messages/messages/extension_ko.properties
index 08f0aba..d3fe10c 100644
--- a/opends/src/messages/messages/extension_ko.properties
+++ b/opends/src/messages/messages/extension_ko.properties
@@ -21,7 +21,7 @@
# CDDL HEADER END
#
# Copyright 2006-2008 Sun Microsystems, Inc.
-# Portions copyright 2012 ForgeRock AS.
+# Portions copyright 2012-2013 ForgeRock AS.
@@ -79,7 +79,6 @@
SEVERE_ERR_FILE_KEYMANAGER_PIN_FILE_CANNOT_READ_57=\uad6c\uc131 \ud56d\ubaa9 %2$s\uc758 ds-cfg-key-store-pin-file \uad6c\uc131 \uc18d\uc131\uc5d0 \uc9c0\uc815\ub41c \ud30c\uc77c %1$s\uc5d0\uc11c \ud0a4 \uc800\uc7a5\uc18c PIN\uc744 \uc77d\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %3$s
SEVERE_ERR_FILE_KEYMANAGER_PIN_FILE_EMPTY_58=\uad6c\uc131 \ud56d\ubaa9 %2$s\uc758 ds-cfg-key-store-pin-file \uc18d\uc131\uc5d0 \uc9c0\uc815\ub41c \ud30c\uc77c %1$s\uc5d0 \ud30c\uc77c \uae30\ubc18 \ud0a4 \uad00\ub9ac\uc790\uc5d0 \uc561\uc138\uc2a4\ud558\ub294 \ub370 \ud544\uc694\ud55c PIN\uc774 \ub4e4\uc5b4 \uc788\uc5b4\uc57c \ud558\ub294\ub370 \uc774 \ud30c\uc77c\uc774 \ube44\uc5b4 \uc788\uc2b5\ub2c8\ub2e4.
SEVERE_ERR_FILE_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR_60=\uad6c\uc131 \ud56d\ubaa9 %s\uc5d0\uc11c ds-cfg-key-store-pin \uad6c\uc131 \uc18d\uc131 \uac12\uc744 \ud655\uc778\ud558\ub294 \ub3d9\uc548 \uc608\uae30\uce58 \uc54a\uc740 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
-SEVERE_ERR_FILE_KEYMANAGER_NO_PIN_61=\uad6c\uc131 \ud56d\ubaa9 %s\uc774(\uac00) \ud30c\uc77c \uae30\ubc18 \ud0a4 \uad00\ub9ac\uc790\uc758 \ub0b4\uc6a9\uc5d0 \uc561\uc138\uc2a4\ud558\ub294 \ub370 \ud544\uc694\ud55c PIN \ud655\uc778 \ubc29\ubc95\uc744 \uc9c0\uc815\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. PIN\uc740 Java \ub4f1\ub85d \uc815\ubcf4(ds-cfg-key-store-pin-property \uc18d\uc131\uc73c\ub85c \uc9c0\uc815), \ud658\uacbd \ubcc0\uc218(ds-cfg-key-store-pin-environment-variable \uc18d\uc131\uc73c\ub85c \uc9c0\uc815) \ub610\ub294 \ud14d\uc2a4\ud2b8 \ud30c\uc77c(ds-cfg-key-store-pin-file \uc18d\uc131\uc73c\ub85c \uc9c0\uc815)\ub85c \uc9c0\uc815\ud558\uac70\ub098 ds-cfg-key-store-pin \uc18d\uc131\uc744 \uc0ac\uc6a9\ud558\uc5ec \ud56d\ubaa9\uc5d0\uc11c \uc9c1\uc811 \uc9c0\uc815\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
SEVERE_ERR_FILE_KEYMANAGER_CANNOT_LOAD_62=\ud30c\uc77c %s\uc5d0\uc11c \ud0a4 \uc800\uc7a5\uc18c \ub0b4\uc6a9\uc744 \ub85c\ub4dc\ud558\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
SEVERE_ERR_FILE_KEYMANAGER_INVALID_TYPE_63=\uad6c\uc131 \ud56d\ubaa9 %2$s\uc758 ds-cfg-key-store-type \uc18d\uc131\uc5d0 \uc9c0\uc815\ub41c \ud0a4 \uc800\uc7a5\uc18c \uc720\ud615 %1$s\uc774(\uac00) \uc798\ubabb\ub418\uc5c8\uc2b5\ub2c8\ub2e4: %3$s
SEVERE_ERR_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET_68=\uad6c\uc131 \ud56d\ubaa9 %2$s\uc758 ds-cfg-key-store-pin-property \uc18d\uc131\uc5d0 \uc9c0\uc815\ub41c Java \ub4f1\ub85d \uc815\ubcf4 %1$s\uc5d0 PKCS#11 \ud0a4 \uad00\ub9ac\uc790\uc5d0 \uc561\uc138\uc2a4\ud558\ub294 \ub370 \ud544\uc694\ud55c PIN\uc774 \ub4e4\uc5b4 \uc788\uc5b4\uc57c \ud558\ub294\ub370 \uc774 \ub4f1\ub85d \uc815\ubcf4\uac00 \uc124\uc815\ub418\uc5b4 \uc788\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
@@ -88,7 +87,6 @@
SEVERE_ERR_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ_75=\uad6c\uc131 \ud56d\ubaa9 %2$s\uc758 ds-cfg-key-store-pin-file \uad6c\uc131 \uc18d\uc131\uc5d0 \uc9c0\uc815\ub41c \ud30c\uc77c %1$s\uc5d0\uc11c \ud0a4 \uc800\uc7a5\uc18c PIN\uc744 \uc77d\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %3$s
SEVERE_ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY_76=\uad6c\uc131 \ud56d\ubaa9 %2$s\uc758 ds-cfg-key-store-pin-file \uc18d\uc131\uc5d0 \uc9c0\uc815\ub41c \ud30c\uc77c %1$s\uc5d0 PKCS#11 \ud0a4 \uad00\ub9ac\uc790\uc5d0 \uc561\uc138\uc2a4\ud558\ub294 \ub370 \ud544\uc694\ud55c PIN\uc774 \ub4e4\uc5b4 \uc788\uc5b4\uc57c \ud558\ub294\ub370 \uc774 \ud30c\uc77c\uc774 \ube44\uc5b4 \uc788\uc2b5\ub2c8\ub2e4.
SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR_79=\uad6c\uc131 \ud56d\ubaa9 %s\uc5d0\uc11c ds-cfg-key-store-pin \uad6c\uc131 \uc18d\uc131 \uac12\uc744 \ud655\uc778\ud558\ub294 \ub3d9\uc548 \uc608\uae30\uce58 \uc54a\uc740 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
-SEVERE_ERR_PKCS11_KEYMANAGER_NO_PIN_80=\uad6c\uc131 \ud56d\ubaa9 %s\uc774(\uac00) PKCS#11 \ud0a4 \uad00\ub9ac\uc790\uc758 \ub0b4\uc6a9\uc5d0 \uc561\uc138\uc2a4\ud558\ub294 \ub370 \ud544\uc694\ud55c PIN \ud655\uc778 \ubc29\ubc95\uc744 \uc9c0\uc815\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. PIN\uc740 Java \ub4f1\ub85d \uc815\ubcf4(ds-cfg-key-store-pin-property \uc18d\uc131\uc73c\ub85c \uc9c0\uc815), \ud658\uacbd \ubcc0\uc218(ds-cfg-key-store-pin-environment-variable \uc18d\uc131\uc73c\ub85c \uc9c0\uc815) \ub610\ub294 \ud14d\uc2a4\ud2b8 \ud30c\uc77c(ds-cfg-key-store-pin-file \uc18d\uc131\uc73c\ub85c \uc9c0\uc815)\ub85c \uc9c0\uc815\ud558\uac70\ub098 ds-cfg-key-store-pin \uc18d\uc131\uc744 \uc0ac\uc6a9\ud558\uc5ec \ud56d\ubaa9\uc5d0\uc11c \uc9c1\uc811 \uc9c0\uc815\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_LOAD_81=PKCS#11 \ud0a4 \uad00\ub9ac\uc790\uc5d0 \uc561\uc138\uc2a4\ud558\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
SEVERE_ERR_FILE_KEYMANAGER_CANNOT_CREATE_FACTORY_83=\ud0a4 \uc800\uc7a5\uc18c \ud30c\uc77c %s\uc758 \ub0b4\uc6a9\uc5d0 \uc561\uc138\uc2a4\ud558\uae30 \uc704\ud574 \ud0a4 \uad00\ub9ac\uc790 \ud329\ud1a0\ub9ac\ub97c \ub9cc\ub4dc\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_CREATE_FACTORY_84=PKCS#11 \ud0a4 \uc800\uc7a5\uc18c\uc758 \ub0b4\uc6a9\uc5d0 \uc561\uc138\uc2a4\ud558\uae30 \uc704\ud574 \ud0a4 \uad00\ub9ac\uc790 \ud329\ud1a0\ub9ac\ub97c \ub9cc\ub4dc\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
diff --git a/opends/src/messages/messages/extension_zh_CN.properties b/opends/src/messages/messages/extension_zh_CN.properties
index 92bcb3b..bf97213 100644
--- a/opends/src/messages/messages/extension_zh_CN.properties
+++ b/opends/src/messages/messages/extension_zh_CN.properties
@@ -21,7 +21,7 @@
# CDDL HEADER END
#
# Copyright 2006-2010 Sun Microsystems, Inc.
-# Portions copyright 2012 ForgeRock AS.
+# Portions copyright 2012-2013 ForgeRock AS.
@@ -79,7 +79,6 @@
SEVERE_ERR_FILE_KEYMANAGER_PIN_FILE_CANNOT_READ_57=\u5728\u5c1d\u8bd5\u4ece\u5728\u914d\u7f6e\u6761\u76ee %2$s \u7684\u914d\u7f6e\u5c5e\u6027 ds-cfg-key-store-pin-file \u4e2d\u6307\u5b9a\u7684\u6587\u4ef6 %1$s \u8bfb\u53d6\u5bc6\u94a5\u5e93 PIN \u65f6\u51fa\u73b0\u9519\u8bef: %3$s
SEVERE_ERR_FILE_KEYMANAGER_PIN_FILE_EMPTY_58=\u5728\u914d\u7f6e\u6761\u76ee %2$s \u7684\u5c5e\u6027 ds-cfg-key-store-pin-file \u4e2d\u6307\u5b9a\u7684\u6587\u4ef6 %1$s \u5e94\u8be5\u5305\u542b\u8bbf\u95ee\u57fa\u4e8e\u6587\u4ef6\u7684\u5bc6\u94a5\u7ba1\u7406\u5668\u6240\u5fc5\u9700\u7684 PIN\uff0c\u4f46\u8be5\u6587\u4ef6\u4e3a\u7a7a
SEVERE_ERR_FILE_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR_60=\u5728\u5c1d\u8bd5\u786e\u5b9a\u914d\u7f6e\u6761\u76ee %s \u4e2d\u7684\u914d\u7f6e\u5c5e\u6027 ds-cfg-key-store-pin \u7684\u503c\u65f6\u51fa\u73b0\u610f\u5916\u9519\u8bef: %s
-SEVERE_ERR_FILE_KEYMANAGER_NO_PIN_61=\u914d\u7f6e\u6761\u76ee %s \u6ca1\u6709\u6307\u5b9a\u7528\u4e8e\u786e\u5b9a\u8bbf\u95ee\u57fa\u4e8e\u6587\u4ef6\u7684\u5bc6\u94a5\u7ba1\u7406\u5668\u4e4b\u5185\u5bb9\u6240\u5fc5\u9700\u7684 PIN \u7684\u65b9\u6cd5\u3002\u53ef\u4ee5\u5728 Java \u5c5e\u6027\uff08\u7531\u5c5e\u6027 ds-cfg-key-store-pin-property \u547d\u540d\uff09\u3001\u73af\u5883\u53d8\u91cf\uff08\u7531\u5c5e\u6027 ds-cfg-key-store-pin-environment-variable \u547d\u540d\uff09\uff0c\u6587\u672c\u6587\u4ef6\uff08\u7531\u5c5e\u6027 ds-cfg-key-store-pin-file \u547d\u540d\uff09\u4e2d\u6307\u5b9a PIN\uff0c\u6216\u8005\u76f4\u63a5\u5728\u4f7f\u7528\u5c5e\u6027 ds-cfg-key-store-pin \u7684\u6761\u76ee\u4e2d\u6307\u5b9a
SEVERE_ERR_FILE_KEYMANAGER_CANNOT_LOAD_62=\u5728\u5c1d\u8bd5\u4ece\u6587\u4ef6 %s \u52a0\u8f7d\u5bc6\u94a5\u5e93\u5185\u5bb9\u65f6\u51fa\u73b0\u9519\u8bef: %s
SEVERE_ERR_FILE_KEYMANAGER_INVALID_TYPE_63=\u5728\u914d\u7f6e\u6761\u76ee %2$s \u7684\u5c5e\u6027 ds-cfg-key-store-type \u4e2d\u6307\u5b9a\u7684\u5bc6\u94a5\u5e93\u7c7b\u578b %1$s \u65e0\u6548: %3$s
SEVERE_ERR_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET_68=\u5728\u914d\u7f6e\u6761\u76ee %2$s \u7684\u5c5e\u6027 ds-cfg-key-store-pin-property \u4e2d\u6307\u5b9a\u7684 Java \u5c5e\u6027 %1$s \u5e94\u5305\u542b\u8bbf\u95ee PKCS#11 \u5bc6\u94a5\u7ba1\u7406\u5668\u5fc5\u9700\u7684 PIN\uff0c\u4f46\u8be5\u5c5e\u6027\u672a\u8bbe\u7f6e
@@ -88,7 +87,6 @@
SEVERE_ERR_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ_75=\u5728\u5c1d\u8bd5\u4ece\u5728\u914d\u7f6e\u6761\u76ee %2$s \u7684\u914d\u7f6e\u5c5e\u6027 ds-cfg-key-store-pin-file \u4e2d\u6307\u5b9a\u7684\u6587\u4ef6 %1$s \u8bfb\u53d6\u5bc6\u94a5\u5e93 PIN \u65f6\u51fa\u73b0\u9519\u8bef: %3$s
SEVERE_ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY_76=\u5728\u914d\u7f6e\u6761\u76ee %2$s \u7684\u5c5e\u6027 ds-cfg-key-store-pin-file \u4e2d\u6307\u5b9a\u7684\u6587\u4ef6 %1$s \u5e94\u8be5\u5305\u542b\u8bbf\u95ee PKCS#11 \u5bc6\u94a5\u7ba1\u7406\u5668\u6240\u5fc5\u9700\u7684 PIN\uff0c\u4f46\u8be5\u6587\u4ef6\u4e3a\u7a7a
SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR_79=\u5728\u5c1d\u8bd5\u786e\u5b9a\u914d\u7f6e\u6761\u76ee %s \u4e2d\u7684\u914d\u7f6e\u5c5e\u6027 ds-cfg-key-store-pin \u7684\u503c\u65f6\u51fa\u73b0\u610f\u5916\u9519\u8bef: %s
-SEVERE_ERR_PKCS11_KEYMANAGER_NO_PIN_80=\u914d\u7f6e\u6761\u76ee %s \u6ca1\u6709\u6307\u5b9a\u7528\u4e8e\u786e\u5b9a\u8bbf\u95ee PKCS#11 \u5bc6\u94a5\u7ba1\u7406\u5668\u4e4b\u5185\u5bb9\u6240\u5fc5\u9700\u7684 PIN \u7684\u65b9\u6cd5\u3002\u53ef\u4ee5\u5728 Java \u5c5e\u6027\uff08\u7531\u5c5e\u6027 ds-cfg-key-store-pin-property \u547d\u540d\uff09\u3001\u73af\u5883\u53d8\u91cf\uff08\u7531\u5c5e\u6027 ds-cfg-key-store-pin-environment-variable \u547d\u540d\uff09\uff0c\u6587\u672c\u6587\u4ef6\uff08\u7531\u5c5e\u6027 ds-cfg-key-store-pin-file \u547d\u540d\uff09\u4e2d\u6307\u5b9a PIN\uff0c\u6216\u8005\u76f4\u63a5\u5728\u4f7f\u7528\u5c5e\u6027 ds-cfg-key-store-pin \u7684\u6761\u76ee\u4e2d\u6307\u5b9a
SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_LOAD_81=\u5728\u5c1d\u8bd5\u8bbf\u95ee PKCS#11 \u5bc6\u94a5\u7ba1\u7406\u5668\u65f6\u51fa\u73b0\u9519\u8bef: %s
SEVERE_ERR_FILE_KEYMANAGER_CANNOT_CREATE_FACTORY_83=\u5728\u5c1d\u8bd5\u521b\u5efa\u5bc6\u94a5\u7ba1\u7406\u5668\u5e93\u4ee5\u8bbf\u95ee\u5bc6\u94a5\u5e93\u6587\u4ef6 %s \u7684\u5185\u5bb9\u65f6\u51fa\u73b0\u9519\u8bef: %s
SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_CREATE_FACTORY_84=\u5728\u5c1d\u8bd5\u521b\u5efa\u5bc6\u94a5\u7ba1\u7406\u5668\u5e93\u4ee5\u8bbf\u95ee PKCS#11 \u5bc6\u94a5\u5e93\u7684\u5185\u5bb9\u65f6\u51fa\u73b0\u9519\u8bef: %s
diff --git a/opends/src/messages/messages/extension_zh_TW.properties b/opends/src/messages/messages/extension_zh_TW.properties
index 05aafdf..33f78c0 100644
--- a/opends/src/messages/messages/extension_zh_TW.properties
+++ b/opends/src/messages/messages/extension_zh_TW.properties
@@ -21,7 +21,7 @@
# CDDL HEADER END
#
# Copyright 2006-2008 Sun Microsystems, Inc.
-# Portions copyright 2012 ForgeRock AS.
+# Portions copyright 2012-2013 ForgeRock AS.
@@ -79,7 +79,6 @@
SEVERE_ERR_FILE_KEYMANAGER_PIN_FILE_CANNOT_READ_57=\u5617\u8a66\u5f9e\u6a94\u6848 %s (\u6307\u5b9a\u65bc\u914d\u7f6e\u9805\u76ee %s \u7684\u914d\u7f6e\u5c6c\u6027 ds-cfg-key-store-pin-file \u4e2d) \u8b80\u53d6\u91d1\u9470\u5eab PIN \u6642\u767c\u751f\u932f\u8aa4: %s
SEVERE_ERR_FILE_KEYMANAGER_PIN_FILE_EMPTY_58=\u6a94\u6848 %s (\u6307\u5b9a\u65bc\u914d\u7f6e\u9805\u76ee %s \u7684\u5c6c\u6027 ds-cfg-key-store-pin-file \u4e2d) \u61c9\u5305\u542b\u5b58\u53d6\u4ee5\u6a94\u6848\u70ba\u57fa\u790e\u4e4b\u91d1\u9470\u7ba1\u7406\u54e1\u6240\u9700\u7684 PIN\uff0c\u4f46\u662f\u6b64\u6a94\u6848\u662f\u7a7a\u7684
SEVERE_ERR_FILE_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR_60=\u5617\u8a66\u5224\u5b9a\u914d\u7f6e\u9805\u76ee %s \u4e2d\u914d\u7f6e\u5c6c\u6027 ds-cfg-key-store-pin \u7684\u503c\u6642\uff0c\u767c\u751f\u672a\u9810\u671f\u7684\u932f\u8aa4: %s
-SEVERE_ERR_FILE_KEYMANAGER_NO_PIN_61=\u914d\u7f6e\u9805\u76ee %s \u672a\u6307\u5b9a\u7528\u4f86\u5224\u5b9a\u5b58\u53d6\u4ee5\u6a94\u6848\u70ba\u57fa\u790e\u4e4b\u91d1\u9470\u7ba1\u7406\u54e1\u5167\u5bb9\u6240\u9700 PIN \u7684\u65b9\u6cd5\u3002PIN \u53ef\u6307\u5b9a\u65bc Java \u7279\u6027 (\u6839\u64da ds-cfg-key-store-pin-property \u5c6c\u6027\u547d\u540d)\u3001\u74b0\u5883\u8b8a\u6578 (\u6839\u64da ds-cfg-key-store-pin-environment-variable \u5c6c\u6027\u547d\u540d)\u3001\u6587\u5b57\u6a94 (\u6839\u64da ds-cfg-key-store-pin-file \u5c6c\u6027\u547d\u540d) \u6216\u76f4\u63a5\u6307\u5b9a\u65bc\u4f7f\u7528 ds-cfg-key-store-pin \u5c6c\u6027\u7684\u9805\u76ee
SEVERE_ERR_FILE_KEYMANAGER_CANNOT_LOAD_62=\u5617\u8a66\u5f9e\u6a94\u6848 %s \u8f09\u5165\u91d1\u9470\u5eab\u5167\u5bb9\u6642\u767c\u751f\u932f\u8aa4: %s
SEVERE_ERR_FILE_KEYMANAGER_INVALID_TYPE_63=\u91d1\u9470\u5eab\u985e\u578b %s (\u6307\u5b9a\u65bc\u914d\u7f6e\u9805\u76ee %s \u7684\u5c6c\u6027 ds-cfg-key-store-type \u4e2d) \u7121\u6548: %s
SEVERE_ERR_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET_68=Java \u7279\u6027 %s (\u6307\u5b9a\u65bc\u914d\u7f6e\u9805\u76ee %s \u7684\u5c6c\u6027 ds-cfg-key-store-pin-property \u4e2d) \u61c9\u5305\u542b\u5b58\u53d6 PKCS#11 \u91d1\u9470\u7ba1\u7406\u54e1\u6240\u9700\u7684 PIN\uff0c\u4f46\u6b64\u7279\u6027\u4e26\u672a\u8a2d\u5b9a
@@ -88,7 +87,6 @@
SEVERE_ERR_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ_75=\u5617\u8a66\u5f9e\u6a94\u6848 %s (\u6307\u5b9a\u65bc\u914d\u7f6e\u9805\u76ee %s \u7684\u914d\u7f6e\u5c6c\u6027 ds-cfg-key-store-pin-file \u4e2d) \u8b80\u53d6\u91d1\u9470\u5eab PIN \u6642\u767c\u751f\u932f\u8aa4: %s
SEVERE_ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY_76=\u6a94\u6848 %s (\u6307\u5b9a\u65bc\u914d\u7f6e\u9805\u76ee %s \u7684\u5c6c\u6027 ds-cfg-key-store-pin-file \u4e2d) \u61c9\u5305\u542b\u5b58\u53d6 PKCS#11 \u91d1\u9470\u7ba1\u7406\u54e1\u6240\u9700\u7684 PIN\uff0c\u4f46\u662f\u6b64\u6a94\u6848\u662f\u7a7a\u7684
SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR_79=\u5617\u8a66\u5224\u5b9a\u914d\u7f6e\u9805\u76ee %s \u4e2d\u914d\u7f6e\u5c6c\u6027 ds-cfg-key-store-pin \u7684\u503c\u6642\uff0c\u767c\u751f\u672a\u9810\u671f\u7684\u932f\u8aa4: %s
-SEVERE_ERR_PKCS11_KEYMANAGER_NO_PIN_80=\u914d\u7f6e\u9805\u76ee %s \u672a\u6307\u5b9a\u7528\u4f86\u5224\u5b9a\u5b58\u53d6 PKCS#11 \u91d1\u9470\u7ba1\u7406\u54e1\u5167\u5bb9\u6240\u9700 PIN \u7684\u65b9\u6cd5\u3002PIN \u53ef\u6307\u5b9a\u65bc Java \u7279\u6027 (\u6839\u64da ds-cfg-key-store-pin-property \u5c6c\u6027\u547d\u540d)\u3001\u74b0\u5883\u8b8a\u6578 (\u6839\u64da ds-cfg-key-store-pin-environment-variable \u5c6c\u6027\u547d\u540d)\u3001\u6587\u5b57\u6a94 (\u6839\u64da ds-cfg-key-store-pin-file \u5c6c\u6027\u547d\u540d) \u6216\u76f4\u63a5\u6307\u5b9a\u65bc\u4f7f\u7528 ds-cfg-key-store-pin \u5c6c\u6027\u7684\u9805\u76ee
SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_LOAD_81=\u5617\u8a66\u5b58\u53d6 PKCS#11 \u91d1\u9470\u7ba1\u7406\u54e1\u6642\u767c\u751f\u932f\u8aa4: %s
SEVERE_ERR_FILE_KEYMANAGER_CANNOT_CREATE_FACTORY_83=\u5617\u8a66\u5efa\u7acb\u91d1\u9470\u7ba1\u7406\u54e1\u5de5\u5ee0\u4ee5\u5b58\u53d6\u91d1\u9470\u5eab\u6a94\u6848 %s \u7684\u5167\u5bb9\u6642\u767c\u751f\u932f\u8aa4: %s
SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_CREATE_FACTORY_84=\u5617\u8a66\u5efa\u7acb\u91d1\u9470\u7ba1\u7406\u54e1\u5de5\u5ee0\u4ee5\u5b58\u53d6 PKCS#11 \u91d1\u9470\u5eab\u7684\u5167\u5bb9\u6642\u767c\u751f\u932f\u8aa4: %s
diff --git a/opends/src/messages/messages/quicksetup.properties b/opends/src/messages/messages/quicksetup.properties
index 5d91ddd..347512e 100644
--- a/opends/src/messages/messages/quicksetup.properties
+++ b/opends/src/messages/messages/quicksetup.properties
@@ -275,10 +275,7 @@
INFO_ERROR_ACCESSING_PKCS12_KEYSTORE=Could not access the PKCS#12 key store. \
Check that the contents of the file correspond to a valid PKCS#12 key store, \
that you have access rights to it and that the provided PIN is valid.
-INFO_ERROR_NO_KEYSTORE_PASSWORD=You must provide the PIN of the keystore \
- to retrieve the certificate to be used by the server.
-INFO_ERROR_EMPTY_KEYSTORE_PASSWORD=The provided PIN of the keystore is \
- empty.
+INFO_ERROR_ACCESSING_KEYSTORE_JDK_BUG=Could not access the key store. This may be due to JDK issue JDK-6879539 which prevent use of empty password. This issue is fixed in JDK7/JDK8.
INFO_ERROR_BROWSER_CLOSE_BUTTON_TOOLTIP=Close this window
INFO_ERROR_BROWSER_COPY_BUTTON_LABEL=Copy URL
INFO_ERROR_BROWSER_COPY_BUTTON_TOOLTIP=Copies the URL to the system clipboard
diff --git a/opends/src/messages/messages/quicksetup_ca_ES.properties b/opends/src/messages/messages/quicksetup_ca_ES.properties
index aa304f0..6cc9dd1 100644
--- a/opends/src/messages/messages/quicksetup_ca_ES.properties
+++ b/opends/src/messages/messages/quicksetup_ca_ES.properties
@@ -60,8 +60,6 @@
INFO_ERROR_ACCESSING_JKS_KEYSTORE=No es pot accedir al magatzem de claus JKS. Comprovar que el contingut del fitxer correspon amb un magatzem de claus JKS v\u00e0lid, que hi tingueu drets d'acc\u00e9s i que el PIN proporcionat sigui v\u00e0lid.
INFO_ERROR_ACCESSING_JCEKS_KEYSTORE=No es pot accedir al magatzem de claus JCEKS. Comprovar que la instal\u00b7laci\u00f3 de java que s'executa suporti JCEKS, que el contingut de fitxer correspongui amb ub magatzem de claus JCEKS v\u00e0lid, que hi tingueu drets d'acc\u00e9s i que el PIN proporcionat sigui v\u00e0lid.
INFO_ERROR_ACCESSING_PKCS12_KEYSTORE=No es pot accedir al magatzem de claus PKCS#12. Comprovar que el contingut del fitxer correspon amb un magatzem de claus PKCS#12 v\u00e0lid, que hi tingueu drets d'acc\u00e9s i que el PIN proporcionat sigui v\u00e0lid.
-INFO_ERROR_NO_KEYSTORE_PASSWORD=Heu de proporcionar un PIN pel magatzem de claus per recuperar el certificat a ser utilitzat pel servidor.
-INFO_ERROR_EMPTY_KEYSTORE_PASSWORD=El PIN proporcionat pel magatzem de claus est\u00e0 buit.
INFO_ERROR_EMPTY_RESPONSE=ERROR: El valor de resposta no pot ser una cadena de text buida
INFO_ERROR_ENABLING_WINDOWS_SERVICE=Error a l'habilitar el servei Windows.
INFO_GENERAL_SEE_FOR_DETAILS=Vegeu %s per a un registre detallat d'aquesta operaci\u00f3.
diff --git a/opends/src/messages/messages/quicksetup_de.properties b/opends/src/messages/messages/quicksetup_de.properties
index 6c621ca..1dc0caf 100644
--- a/opends/src/messages/messages/quicksetup_de.properties
+++ b/opends/src/messages/messages/quicksetup_de.properties
@@ -188,8 +188,6 @@
INFO_ERROR_ACCESSING_JCEKS_KEYSTORE=Zugriff auf JCEKS-Schl\u00fcsselspeicher nicht m\u00f6glich. Pr\u00fcfen Sie, ob die ausgef\u00fchrte Java-Installation JCEKS unterst\u00fctzt, ob der Inhalt der Datei einem g\u00fcltigen JCEKS-Schl\u00fcsselspeicher entspricht, ob Sie daf\u00fcr zugriffsberechtigt sind und ob die angegebene PIN g\u00fcltig ist.
INFO_ERROR_ACCESSING_PKCS11_KEYSTORE=Zugriff auf PKCS#11-Schl\u00fcsselspeicher nicht m\u00f6glich. Pr\u00fcfen Sie, ob er installiert und die angegebene PIN g\u00fcltig ist.
INFO_ERROR_ACCESSING_PKCS12_KEYSTORE=Zugriff auf PKCS#12-Schl\u00fcsselspeicher nicht m\u00f6glich. Pr\u00fcfen Sie, ob der Inhalt der Datei einem g\u00fcltigen PKCS#12-Schl\u00fcsselspeicher entspricht, ob Sie daf\u00fcr zugriffsberechtigt sind und ob die angegebene PIN g\u00fcltig ist.
-INFO_ERROR_NO_KEYSTORE_PASSWORD=Sie m\u00fcssen die PIN des Schl\u00fcsselspeichers angeben, um das vom Server zu verwendende Zertifikat abzurufen.
-INFO_ERROR_EMPTY_KEYSTORE_PASSWORD=Die angegebene PIN des Schl\u00fcsselspeichers ist leer.
INFO_ERROR_BROWSER_CLOSE_BUTTON_TOOLTIP=Dieses Fenster schlie\u00dfen
INFO_ERROR_BROWSER_COPY_BUTTON_LABEL=URL kopieren
INFO_ERROR_BROWSER_COPY_BUTTON_TOOLTIP=Kopiert die URL in die Zwischenablage des Systems
diff --git a/opends/src/messages/messages/quicksetup_es.properties b/opends/src/messages/messages/quicksetup_es.properties
index 0d0b1b9..61cd42f 100644
--- a/opends/src/messages/messages/quicksetup_es.properties
+++ b/opends/src/messages/messages/quicksetup_es.properties
@@ -188,8 +188,6 @@
INFO_ERROR_ACCESSING_JCEKS_KEYSTORE=No se ha podido acceder al almac\u00e9n de claves JCEKS. Compruebe que la instalaci\u00f3n de Java que se est\u00e1 ejecutando sea compatible con JCEKS, que el contenido del archivo se corresponda con un almac\u00e9n de claves JCEKS v\u00e1lido, que tenga derechos de acceso al mismo y que el PIN especificado sea v\u00e1lido.
INFO_ERROR_ACCESSING_PKCS11_KEYSTORE=No se ha podido acceder al almac\u00e9n de claves PKCS#11. Compruebe que est\u00e9 instalado y que el PIN especificado sea v\u00e1lido.
INFO_ERROR_ACCESSING_PKCS12_KEYSTORE=No se ha podido acceder al almac\u00e9n de claves PKCS#12. Compruebe que el contenido del archivo corresponda a un almac\u00e9n de claves PKCS#12 v\u00e1lido, que tenga derechos de acceso al mismo y que el PIN especificado sea v\u00e1lido.
-INFO_ERROR_NO_KEYSTORE_PASSWORD=Debe proporcionar el PIN del almac\u00e9n de claves para recuperar el certificado que utilizar\u00e1 el servidor.
-INFO_ERROR_EMPTY_KEYSTORE_PASSWORD=El PIN especificado del almac\u00e9n de claves est\u00e1 vac\u00edo.
INFO_ERROR_BROWSER_CLOSE_BUTTON_TOOLTIP=Cerrar esta ventana
INFO_ERROR_BROWSER_COPY_BUTTON_LABEL=Copiar URL
INFO_ERROR_BROWSER_COPY_BUTTON_TOOLTIP=Copia la URL al portapapeles del sistema
diff --git a/opends/src/messages/messages/quicksetup_fr.properties b/opends/src/messages/messages/quicksetup_fr.properties
index 2b58c07..5d51641 100644
--- a/opends/src/messages/messages/quicksetup_fr.properties
+++ b/opends/src/messages/messages/quicksetup_fr.properties
@@ -188,8 +188,7 @@
INFO_ERROR_ACCESSING_JCEKS_KEYSTORE=Impossible d'acc\u00e9der au keystore JCEKS. V\u00e9rifiez les situations suivantes : l'installation Java en cours d'ex\u00e9cution prend en charge JCEKS; le contenu du fichier correspond \u00e0 un keystore JCEKS valide; vous disposez de droits d'acc\u00e8s \u00e0 celui-ci; le num\u00e9ro d'identification personnel fourni est valide.
INFO_ERROR_ACCESSING_PKCS11_KEYSTORE=Impossible d'acc\u00e9der au keystore PKCS#11. V\u00e9rifiez son installation et la validit\u00e9 du num\u00e9ro d'identification personnel fourni.
INFO_ERROR_ACCESSING_PKCS12_KEYSTORE=Impossible d'acc\u00e9der au keystore PKCS#12. V\u00e9rifiez que le contenu du fichier correspond \u00e0 un keystore PKCS#12 valide, que vous disposez de droits d'acc\u00e8s \u00e0 celui-ci et que le num\u00e9ro d'identification personnel est valide.
-INFO_ERROR_NO_KEYSTORE_PASSWORD=Vous devez fournir le num\u00e9ro d'identification personnel keystore pour extraire le certificat \u00e0 utiliser par le serveur.
-INFO_ERROR_EMPTY_KEYSTORE_PASSWORD=Le num\u00e9ro d'identification personnel du keystore fourni est vide.
+INFO_ERROR_ACCESSING_KEYSTORE_JDK_BUG=Impossible d'acc\u00e9der au keystore. La cause est probablement le bug du JDK JDK-6879539, qui ne permet pas d'utiliser un mot de passe vide. Ce bug est fix\u00e9 dans le JDK7 et le JDK8.
INFO_ERROR_BROWSER_CLOSE_BUTTON_TOOLTIP=Fermer cette fen\u00eatre
INFO_ERROR_BROWSER_COPY_BUTTON_LABEL=Copier l'URL
INFO_ERROR_BROWSER_COPY_BUTTON_TOOLTIP=Copie l'URL dans le presse-papiers du syst\u00e8me
diff --git a/opends/src/messages/messages/quicksetup_ja.properties b/opends/src/messages/messages/quicksetup_ja.properties
index f1d9e8d..af3216c 100644
--- a/opends/src/messages/messages/quicksetup_ja.properties
+++ b/opends/src/messages/messages/quicksetup_ja.properties
@@ -188,8 +188,6 @@
INFO_ERROR_ACCESSING_JCEKS_KEYSTORE=JCEKS \u9375\u30b9\u30c8\u30a2\u306b\u30a2\u30af\u30bb\u30b9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u5b9f\u884c\u4e2d\u306e Java \u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u304c JCEKS \u3092\u30b5\u30dd\u30fc\u30c8\u3057\u3066\u3044\u308b\u3053\u3068\u3001\u30d5\u30a1\u30a4\u30eb\u306e\u5185\u5bb9\u304c\u6709\u52b9\u306a JCEKS \u9375\u30b9\u30c8\u30a2\u306b\u5bfe\u5fdc\u3057\u3066\u3044\u308b\u3053\u3068\u3001\u3053\u306e\u9375\u30b9\u30c8\u30a2\u3078\u306e\u30a2\u30af\u30bb\u30b9\u6a29\u9650\u3092\u4fdd\u6301\u3057\u3066\u3044\u308b\u3053\u3068\u3001\u304a\u3088\u3073\u6307\u5b9a\u3055\u308c\u305f PIN \u304c\u6709\u52b9\u3067\u3042\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
INFO_ERROR_ACCESSING_PKCS11_KEYSTORE=PKCS#11 \u9375\u30b9\u30c8\u30a2\u306b\u30a2\u30af\u30bb\u30b9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002 \u3053\u308c\u304c\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u308b\u3053\u3068\u3001\u304a\u3088\u3073\u6307\u5b9a\u3055\u308c\u305f PIN \u304c\u6709\u52b9\u3067\u3042\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
INFO_ERROR_ACCESSING_PKCS12_KEYSTORE=PKCS#12 \u9375\u30b9\u30c8\u30a2\u306b\u30a2\u30af\u30bb\u30b9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002 \u30d5\u30a1\u30a4\u30eb\u306e\u5185\u5bb9\u304c\u6709\u52b9\u306a PKCS#12 \u9375\u30b9\u30c8\u30a2\u306b\u5bfe\u5fdc\u3057\u3066\u3044\u308b\u3053\u3068\u3001\u3053\u306e\u9375\u30b9\u30c8\u30a2\u3078\u306e\u30a2\u30af\u30bb\u30b9\u6a29\u9650\u3092\u4fdd\u6301\u3057\u3066\u3044\u308b\u3053\u3068\u3001\u304a\u3088\u3073\u6307\u5b9a\u3055\u308c\u305f PIN \u304c\u6709\u52b9\u3067\u3042\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-INFO_ERROR_NO_KEYSTORE_PASSWORD=\u30b5\u30fc\u30d0\u30fc\u3067\u4f7f\u7528\u3059\u308b\u8a3c\u660e\u66f8\u3092\u53d6\u5f97\u3059\u308b\u305f\u3081\u3001\u9375\u30b9\u30c8\u30a2\u306e PIN \u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-INFO_ERROR_EMPTY_KEYSTORE_PASSWORD=\u6307\u5b9a\u3055\u308c\u305f\u9375\u30b9\u30c8\u30a2\u306e PIN \u304c\u7a7a\u3067\u3059\u3002
INFO_ERROR_BROWSER_CLOSE_BUTTON_TOOLTIP=\u3053\u306e\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u9589\u3058\u308b
INFO_ERROR_BROWSER_COPY_BUTTON_LABEL=URL \u306e\u30b3\u30d4\u30fc
INFO_ERROR_BROWSER_COPY_BUTTON_TOOLTIP=URL \u3092\u30b7\u30b9\u30c6\u30e0\u306e\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9\u306b\u30b3\u30d4\u30fc\u3059\u308b
diff --git a/opends/src/messages/messages/quicksetup_ko.properties b/opends/src/messages/messages/quicksetup_ko.properties
index 68927b7..503856c 100644
--- a/opends/src/messages/messages/quicksetup_ko.properties
+++ b/opends/src/messages/messages/quicksetup_ko.properties
@@ -180,8 +180,6 @@
INFO_ERROR_ACCESSING_JCEKS_KEYSTORE=Could not access the JCEKS key store. Check that the running Java installation supports JCEKS, that the contents of the file correspond to a valid JCEKS key store, that you have access rights to it and that the provided PIN is valid.
INFO_ERROR_ACCESSING_PKCS11_KEYSTORE=PKCS#11 \ud0a4 \uc800\uc7a5\uc18c\uc5d0 \uc561\uc138\uc2a4\ud558\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4. \ud574\ub2f9 \ud56d\ubaa9\uc774 \uc124\uce58\ub418\uc5c8\uace0 \uc81c\uacf5\ub41c PIN\uc774 \uc720\ud6a8\ud55c\uc9c0 \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
INFO_ERROR_ACCESSING_PKCS12_KEYSTORE=PKCS#12 \ud0a4 \uc800\uc7a5\uc18c\uc5d0 \uc561\uc138\uc2a4\ud558\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4. \uc720\ud6a8\ud55c PKCS#12 \ud0a4 \uc800\uc7a5\uc18c\uc5d0 \ud574\ub2f9\ud558\ub294 \ud30c\uc77c\uc758 \ub0b4\uc6a9\uc744 \ud655\uc778\ud558\uace0, \uc774 \ud0a4 \uc800\uc7a5\uc18c\uc5d0 \ub300\ud55c \uc561\uc138\uc2a4 \uad8c\ud55c\uc774 \uc788\uace0 \uc81c\uacf5\ub41c PIN\uc774 \uc720\ud6a8\ud55c\uc9c0 \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-INFO_ERROR_NO_KEYSTORE_PASSWORD=\uc11c\ubc84\uc5d0\uc11c \uc0ac\uc6a9\ud560 \uc778\uc99d\uc11c\ub97c \uac80\uc0c9\ud558\ub824\uba74 \ud0a4 \uc800\uc7a5\uc18c\uc758 PIN\uc744 \uc81c\uacf5\ud574\uc57c \ud569\ub2c8\ub2e4.
-INFO_ERROR_EMPTY_KEYSTORE_PASSWORD=\uc81c\uacf5\ub41c \ud0a4 \uc800\uc7a5\uc18c PIN\uc774 \ube44\uc5b4 \uc788\uc2b5\ub2c8\ub2e4.
INFO_ERROR_BROWSER_CLOSE_BUTTON_TOOLTIP=\uc774 \ucc3d \ub2eb\uae30
INFO_ERROR_BROWSER_COPY_BUTTON_LABEL=URL \ubcf5\uc0ac
INFO_ERROR_BROWSER_COPY_BUTTON_TOOLTIP=URL\uc744 \uc2dc\uc2a4\ud15c \ud074\ub9bd\ubcf4\ub4dc\uc5d0 \ubcf5\uc0ac\ud569\ub2c8\ub2e4.
diff --git a/opends/src/messages/messages/quicksetup_zh_CN.properties b/opends/src/messages/messages/quicksetup_zh_CN.properties
index aec5d41..1c33aa1 100644
--- a/opends/src/messages/messages/quicksetup_zh_CN.properties
+++ b/opends/src/messages/messages/quicksetup_zh_CN.properties
@@ -188,8 +188,6 @@
INFO_ERROR_ACCESSING_JCEKS_KEYSTORE=\u65e0\u6cd5\u8bbf\u95ee JCEKS \u5bc6\u94a5\u5e93\u3002\u8bf7\u68c0\u67e5\u8fd0\u884c\u7684 Java \u5b89\u88c5\u662f\u5426\u652f\u6301 JCEKS\uff0c\u6587\u4ef6\u7684\u5185\u5bb9\u662f\u5426\u5bf9\u5e94\u4e8e\u6709\u6548\u7684 JCEKS \u5bc6\u94a5\u5e93\uff0c\u60a8\u662f\u5426\u5177\u6709\u8be5\u5bc6\u94a5\u5e93\u7684\u8bbf\u95ee\u6743\u9650\u4ee5\u53ca\u63d0\u4f9b\u7684 PIN \u662f\u5426\u6709\u6548\u3002
INFO_ERROR_ACCESSING_PKCS11_KEYSTORE=\u65e0\u6cd5\u8bbf\u95ee PKCS#11 \u5bc6\u94a5\u5e93\u3002\u8bf7\u68c0\u67e5\u662f\u5426\u5b89\u88c5\u4e86\u8be5\u5bc6\u94a5\u5e93\u4ee5\u53ca\u63d0\u4f9b\u7684 PIN \u662f\u5426\u6709\u6548\u3002
INFO_ERROR_ACCESSING_PKCS12_KEYSTORE=\u65e0\u6cd5\u8bbf\u95ee PKCS#12 \u5bc6\u94a5\u5e93\u3002\u8bf7\u68c0\u67e5\u6587\u4ef6\u7684\u5185\u5bb9\u662f\u5426\u5bf9\u5e94\u4e8e\u6709\u6548\u7684 PKCS#12 \u5bc6\u94a5\u5e93\uff0c\u60a8\u662f\u5426\u5177\u6709\u8be5\u5bc6\u94a5\u5e93\u7684\u8bbf\u95ee\u6743\u9650\u4ee5\u53ca\u63d0\u4f9b\u7684 PIN \u662f\u5426\u6709\u6548\u3002
-INFO_ERROR_NO_KEYSTORE_PASSWORD=\u60a8\u5fc5\u987b\u63d0\u4f9b\u5bc6\u94a5\u5e93 PIN \u624d\u80fd\u68c0\u7d22\u8981\u7531\u670d\u52a1\u5668\u4f7f\u7528\u7684\u8bc1\u4e66\u3002
-INFO_ERROR_EMPTY_KEYSTORE_PASSWORD=\u63d0\u4f9b\u7684\u5bc6\u94a5\u5e93 PIN \u4e3a\u7a7a\u3002
INFO_ERROR_BROWSER_CLOSE_BUTTON_TOOLTIP=\u5173\u95ed\u6b64\u7a97\u53e3
INFO_ERROR_BROWSER_COPY_BUTTON_LABEL=\u590d\u5236 URL
INFO_ERROR_BROWSER_COPY_BUTTON_TOOLTIP=\u5c06 URL \u590d\u5236\u5230\u7cfb\u7edf\u526a\u8d34\u677f
diff --git a/opends/src/messages/messages/quicksetup_zh_TW.properties b/opends/src/messages/messages/quicksetup_zh_TW.properties
index d8c25ce..7d3e96e 100644
--- a/opends/src/messages/messages/quicksetup_zh_TW.properties
+++ b/opends/src/messages/messages/quicksetup_zh_TW.properties
@@ -181,8 +181,6 @@
INFO_ERROR_ACCESSING_JCEKS_KEYSTORE=Could not access the JCEKS key store. Check that the running Java installation supports JCEKS, that the contents of the file correspond to a valid JCEKS key store, that you have access rights to it and that the provided PIN is valid.
INFO_ERROR_ACCESSING_PKCS11_KEYSTORE=\u7121\u6cd5\u5b58\u53d6 PKCS#11 \u91d1\u9470\u5eab\u3002\u6aa2\u67e5\u662f\u5426\u5df2\u5b89\u88dd\uff0c\u4ee5\u53ca\u63d0\u4f9b\u7684 PIN \u662f\u5426\u6709\u6548\u3002
INFO_ERROR_ACCESSING_PKCS12_KEYSTORE=\u7121\u6cd5\u5b58\u53d6 PKCS#12 \u91d1\u9470\u5eab\u3002\u6aa2\u67e5\u6a94\u6848\u5167\u5bb9\u662f\u5426\u5c0d\u61c9\u65bc\u6709\u6548\u7684 PKCS#12 \u91d1\u9470\u5eab\u3001\u60a8\u662f\u5426\u6709\u8a72\u91d1\u9470\u5eab\u7684\u5b58\u53d6\u6b0a\u9650\u3001\u4ee5\u53ca\u63d0\u4f9b\u7684 PIN \u662f\u5426\u6709\u6548\u3002
-INFO_ERROR_NO_KEYSTORE_PASSWORD=\u60a8\u5fc5\u9808\u63d0\u4f9b\u91d1\u9470\u5eab\u7684 PIN\uff0c\u624d\u80fd\u64f7\u53d6\u4f3a\u670d\u5668\u6240\u8981\u4f7f\u7528\u7684\u6191\u8b49\u3002
-INFO_ERROR_EMPTY_KEYSTORE_PASSWORD=\u70ba\u91d1\u9470\u5eab\u63d0\u4f9b\u7684 PIN \u662f\u7a7a\u7684\u3002
INFO_ERROR_BROWSER_CLOSE_BUTTON_TOOLTIP=\u95dc\u9589\u6b64\u8996\u7a97
INFO_ERROR_BROWSER_COPY_BUTTON_LABEL=\u8907\u88fd URL
INFO_ERROR_BROWSER_COPY_BUTTON_TOOLTIP=\u5c07 URL \u8907\u88fd\u5230\u7cfb\u7d71\u526a\u8cbc\u7c3f
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java
index 6303404..2301ea1 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java
@@ -23,6 +23,8 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS
+
*/
package org.opends.quicksetup.installer.ui;
@@ -63,7 +65,9 @@
import org.opends.quicksetup.util.BackgroundTask;
import org.opends.quicksetup.util.Utils;
import org.opends.server.util.CertificateManager;
+import org.opends.server.util.StaticUtils;
import org.opends.messages.Message;
+
import static org.opends.messages.QuickSetupMessages.*;
/**
@@ -981,15 +985,8 @@
pathValid = errorMsgs.size() == 0;
}
- /* Check the password */
String pwd = String.valueOf(tfKeystorePwd.getPassword());
- if ((pwd == null) || (pwd.length() == 0))
- {
- errorMsgs.add(INFO_KEYSTORE_PWD_EMPTY.get());
- pwdValid = false;
- }
-
- if (pathValid && pwdValid)
+ if (pathValid)
{
try
{
@@ -1058,32 +1055,41 @@
}
catch (KeyStoreException ke)
{
- pwdValid = false;
- if (!rbPKCS11.isSelected())
+ // issue OPENDJ-18, related to JDK bug
+ if (StaticUtils
+ .stackTraceContainsCause(ke, ArithmeticException.class))
{
- pathValid = false;
- }
- // Could not access to the keystore: because the password is no good,
- // because the provided file is not a valid keystore, etc.
- if (rbPKCS11.isSelected())
- {
- errorMsgs.add(INFO_ERROR_ACCESSING_PKCS11_KEYSTORE.get());
+ errorMsgs.add(INFO_ERROR_ACCESSING_KEYSTORE_JDK_BUG.get());
}
else
{
- if (rbJKS.isSelected())
+ pwdValid = false;
+ if (!rbPKCS11.isSelected())
{
- errorMsgs.add(INFO_ERROR_ACCESSING_JKS_KEYSTORE.get());
+ pathValid = false;
}
- else if (rbJCEKS.isSelected())
+ // Could not access to the keystore: because the password is
+ // no good, because the provided file is not a valid keystore, etc.
+ if (rbPKCS11.isSelected())
{
- errorMsgs.add(INFO_ERROR_ACCESSING_JCEKS_KEYSTORE.get());
+ errorMsgs.add(INFO_ERROR_ACCESSING_PKCS11_KEYSTORE.get());
}
else
{
- errorMsgs.add(INFO_ERROR_ACCESSING_PKCS12_KEYSTORE.get());
+ if (rbJKS.isSelected())
+ {
+ errorMsgs.add(INFO_ERROR_ACCESSING_JKS_KEYSTORE.get());
+ }
+ else if (rbJCEKS.isSelected())
+ {
+ errorMsgs.add(INFO_ERROR_ACCESSING_JCEKS_KEYSTORE.get());
+ }
+ else
+ {
+ errorMsgs.add(INFO_ERROR_ACCESSING_PKCS12_KEYSTORE.get());
+ }
+ pathValid = false;
}
- pathValid = false;
}
}
}
diff --git a/opends/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java b/opends/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java
index 5bf8caa..7a5b940 100644
--- a/opends/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java
+++ b/opends/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2013 ForgeRock AS
*/
package org.opends.server.extensions;
import org.opends.messages.Message;
@@ -229,11 +229,6 @@
keyStorePIN = pinStr.toCharArray();
} else if (configuration.getKeyStorePin() != null) {
keyStorePIN = configuration.getKeyStorePin().toCharArray();
- } else {
- // Pin wasn't defined anywhere.
- Message message =
- ERR_FILE_KEYMANAGER_NO_PIN.get(String.valueOf(configEntryDN));
- throw new ConfigException(message);
}
}
@@ -393,6 +388,7 @@
// - As the value of a configuration attribute.
//
// In any case, the PIN must be in the clear.
+ // It is acceptable to have no PIN (OPENDJ-18)
if (configuration.getKeyStorePinProperty() != null)
{
String propertyName = configuration.getKeyStorePinProperty();
@@ -476,13 +472,6 @@
configAcceptable = false;
}
}
- else
- {
- // Pin wasn't defined anywhere.
- unacceptableReasons.add(ERR_FILE_KEYMANAGER_NO_PIN.get(
- String.valueOf(cfgEntryDN)));
- configAcceptable = false;
- }
return configAcceptable;
}
@@ -658,15 +647,6 @@
{
newPIN = configuration.getKeyStorePin().toCharArray();
}
- else
- {
- // Pin wasn't defined anywhere.
- resultCode = DirectoryServer.getServerErrorResultCode();
-
- messages.add(ERR_FILE_KEYMANAGER_NO_PIN.get(
- String.valueOf(configEntryDN)));
- }
-
if (resultCode == ResultCode.SUCCESS)
{
diff --git a/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java b/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
index a212537..2bd9ca5 100644
--- a/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
+++ b/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2013 ForgeRock AS
*/
package org.opends.server.extensions;
import org.opends.messages.Message;
@@ -192,11 +192,6 @@
keyStorePIN = pinStr.toCharArray();
} else if (configuration.getKeyStorePin() != null) {
keyStorePIN = configuration.getKeyStorePin().toCharArray();
- } else {
- // Pin wasn't defined anywhere.
- Message message =
- ERR_PKCS11_KEYMANAGER_NO_PIN.get(String.valueOf(configEntryDN));
- throw new ConfigException(message);
}
}
@@ -305,6 +300,8 @@
// - As the value of a configuration attribute.
//
// In any case, the PIN must be in the clear.
+ //
+ // It is acceptable to have no PIN (OPENDJ-18)
if (configuration.getKeyStorePinProperty() != null)
{
String propertyName = configuration.getKeyStorePinProperty();
@@ -391,13 +388,6 @@
configAcceptable = false;
}
}
- else
- {
- // Pin wasn't defined anywhere.
- unacceptableReasons.add(ERR_PKCS11_KEYMANAGER_NO_PIN.get(
- String.valueOf(cfgEntryDN)));
- configAcceptable = false;
- }
return configAcceptable;
}
@@ -520,16 +510,6 @@
{
newPIN = configuration.getKeyStorePin().toCharArray();
}
- else
- {
- // Pin wasn't defined anywhere.
- resultCode = DirectoryServer.getServerErrorResultCode();
-
-
- messages.add(ERR_PKCS11_KEYMANAGER_NO_PIN.get(
- String.valueOf(configEntryDN)));
- }
-
if (resultCode == ResultCode.SUCCESS)
{
diff --git a/opends/src/server/org/opends/server/tools/InstallDS.java b/opends/src/server/org/opends/server/tools/InstallDS.java
index 4d8c424..fbafd78 100644
--- a/opends/src/server/org/opends/server/tools/InstallDS.java
+++ b/opends/src/server/org/opends/server/tools/InstallDS.java
@@ -69,6 +69,7 @@
import org.opends.server.types.NullOutputStream;
import org.opends.server.util.CertificateManager;
import org.opends.server.util.SetupUtils;
+import org.opends.server.util.StaticUtils;
import org.opends.server.util.args.ArgumentException;
import org.opends.server.util.args.IntegerArgument;
import org.opends.server.util.args.StringArgument;
@@ -1884,18 +1885,7 @@
errorWithPath = true;
}
}
- boolean pwdProvided = true;
- if (pwd == null)
- {
- pwdProvided = false;
- errorMessages.add(INFO_ERROR_NO_KEYSTORE_PASSWORD.get());
- }
- else if (pwd.length() == 0)
- {
- pwdProvided = false;
- errorMessages.add(INFO_ERROR_EMPTY_KEYSTORE_PASSWORD.get());
- }
- if (!errorWithPath && pwdProvided)
+ if (!errorWithPath)
{
try
{
@@ -1983,24 +1973,32 @@
}
catch (KeyStoreException ke)
{
- // Could not access to the key store: because the password is no good,
- // because the provided file is not a valid key store, etc.
- switch (type)
+ // issue OPENDJ-18, related to JDK bug
+ if (StaticUtils.stackTraceContainsCause(ke, ArithmeticException.class))
{
- case JKS:
- errorMessages.add(INFO_ERROR_ACCESSING_JKS_KEYSTORE.get());
- break;
- case JCEKS:
- errorMessages.add(INFO_ERROR_ACCESSING_JCEKS_KEYSTORE.get());
- break;
- case PKCS12:
- errorMessages.add(INFO_ERROR_ACCESSING_PKCS12_KEYSTORE.get());
- break;
- case PKCS11:
- errorMessages.add(INFO_ERROR_ACCESSING_PKCS11_KEYSTORE.get());
- break;
- default:
- throw new IllegalArgumentException("Invalid type: "+type);
+ errorMessages.add(INFO_ERROR_ACCESSING_KEYSTORE_JDK_BUG.get());
+ }
+ else
+ {
+ // Could not access to the key store: because the password is no good,
+ // because the provided file is not a valid key store, etc.
+ switch (type)
+ {
+ case JKS:
+ errorMessages.add(INFO_ERROR_ACCESSING_JKS_KEYSTORE.get());
+ break;
+ case JCEKS:
+ errorMessages.add(INFO_ERROR_ACCESSING_JCEKS_KEYSTORE.get());
+ break;
+ case PKCS12:
+ errorMessages.add(INFO_ERROR_ACCESSING_PKCS12_KEYSTORE.get());
+ break;
+ case PKCS11:
+ errorMessages.add(INFO_ERROR_ACCESSING_PKCS11_KEYSTORE.get());
+ break;
+ default:
+ throw new IllegalArgumentException("Invalid type: " + type);
+ }
}
}
}
@@ -2236,8 +2234,7 @@
msg.getDescriptor().equals(INFO_ERROR_ACCESSING_JCEKS_KEYSTORE) ||
msg.getDescriptor().equals(INFO_ERROR_ACCESSING_PKCS12_KEYSTORE) ||
msg.getDescriptor().equals(INFO_ERROR_ACCESSING_PKCS11_KEYSTORE) ||
- msg.getDescriptor().equals(INFO_ERROR_NO_KEYSTORE_PASSWORD) ||
- msg.getDescriptor().equals(INFO_ERROR_EMPTY_KEYSTORE_PASSWORD))
+ msg.getDescriptor().equals(INFO_ERROR_ACCESSING_KEYSTORE_JDK_BUG))
{
found = true;
break;
diff --git a/opends/src/server/org/opends/server/util/CertificateManager.java b/opends/src/server/org/opends/server/util/CertificateManager.java
index 08818da..1593737 100644
--- a/opends/src/server/org/opends/server/util/CertificateManager.java
+++ b/opends/src/server/org/opends/server/util/CertificateManager.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS
*/
package org.opends.server.util;
@@ -81,7 +82,6 @@
//Error message strings.
private static final String KEYSTORE_PATH_MSG = "key store path";
private static final String KEYSTORE_TYPE_MSG = "key store type";
- private static final String KEYSTORE_PWD_MSG = "key store password";
private static final String SUBJECT_DN_MSG = "subject DN";
private static final String CERT_ALIAS_MSG = "certificate alias";
private static final String CERT_REQUEST_FILE_MSG =
@@ -136,7 +136,6 @@
throws IllegalArgumentException {
ensureValid(keyStorePath, KEYSTORE_PATH_MSG);
ensureValid(keyStoreType, KEYSTORE_TYPE_MSG);
- ensureValid(keyStorePassword, KEYSTORE_PWD_MSG);
if (keyStoreType.equals(KEY_STORE_TYPE_PKCS11)) {
if (! keyStorePath.equals(KEY_STORE_PATH_PKCS11)) {
Message msg =
@@ -168,7 +167,8 @@
}
this.keyStorePath = keyStorePath;
this.keyStoreType = keyStoreType;
- this.password = keyStorePassword.toCharArray();
+ this.password =
+ keyStorePassword == null ? null : keyStorePassword.toCharArray();
keyStore = null;
}
diff --git a/opends/src/server/org/opends/server/util/StaticUtils.java b/opends/src/server/org/opends/server/util/StaticUtils.java
index d2a89e7..dbd185b 100644
--- a/opends/src/server/org/opends/server/util/StaticUtils.java
+++ b/opends/src/server/org/opends/server/util/StaticUtils.java
@@ -60,7 +60,6 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
-
/**
* This class defines a number of static utility methods that may be used
* throughout the server. Note that because of the frequency with which these
@@ -1746,7 +1745,30 @@
return buffer.toString();
}
+ /**
+ * Check if the stack trace of provided exception contains a given cause.
+ *
+ * @param throwable
+ * exception that may contain the cause
+ * @param searchedCause
+ * class of the cause to look for. Any subclass will match.
+ * @return true if and only if the given cause is found as a cause of any
+ * level in the provided exception.
+ */
+ public static boolean stackTraceContainsCause(
+ Throwable throwable, Class<? extends Throwable> searchedCause)
+ {
+ Throwable t = throwable;
+ while ((t = t.getCause()) != null)
+ {
+ if (searchedCause.isAssignableFrom(t.getClass()))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
/**
* Appends a string representation of the stack trace for the provided
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java
index 98370bf..37c1276 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java
@@ -23,11 +23,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS
*/
package org.opends.server.extensions;
-
-
import java.io.File;
import java.io.FileWriter;
import java.util.List;
@@ -46,8 +45,6 @@
import static org.opends.server.util.ServerConstants.*;
-
-
/**
* A set of test cases for the file-based key manager provider.
*/
@@ -146,7 +143,17 @@
"ds-cfg-enabled: true",
"ds-cfg-key-store-file: config/server-cert.p12",
"ds-cfg-key-store-pin: password",
- "ds-cfg-key-store-type: PKCS12");
+ "ds-cfg-key-store-type: PKCS12",
+ "",
+ "dn: cn=No Key Store PIN,cn=SSL,cn=config",
+ "objectClass: top",
+ "objectClass: ds-cfg-key-manager-provider",
+ "objectClass: ds-cfg-file-based-key-manager-provider",
+ "cn: Key Manager Provider",
+ "ds-cfg-java-class: org.opends.server.extensions." +
+ "FileBasedKeyManagerProvider",
+ "ds-cfg-enabled: true",
+ "ds-cfg-key-store-file: config/server.keystore");
Object[][] configEntries = new Object[entries.size()][1];
@@ -215,16 +222,6 @@
"ds-cfg-key-store-file: config/nosuchfile",
"ds-cfg-key-store-pin: password",
"",
- "dn: cn=No Key Store PIN,cn=SSL,cn=config",
- "objectClass: top",
- "objectClass: ds-cfg-key-manager-provider",
- "objectClass: ds-cfg-file-based-key-manager-provider",
- "cn: Key Manager Provider",
- "ds-cfg-java-class: org.opends.server.extensions." +
- "FileBasedKeyManagerProvider",
- "ds-cfg-enabled: true",
- "ds-cfg-key-store-file: config/server.keystore",
- "",
"dn: cn=Nonexistent Key Store PIN File,cn=SSL,cn=config",
"objectClass: top",
"objectClass: ds-cfg-key-manager-provider",
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/util/CertificateManagerTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/util/CertificateManagerTestCase.java
index 90ef7cf..2065c83 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/util/CertificateManagerTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/util/CertificateManagerTestCase.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS
*/
package org.opends.server.util;
@@ -58,10 +59,10 @@
// Get the build root and use it to create a test package directory.
- public static final String BUILD_ROOT =
+ public static final String BUILD_ROOT =
System.getProperty(TestCaseUtils.PROPERTY_BUILD_ROOT);
-
+
/**
* The path to a JKS key store file.
*/
@@ -239,11 +240,11 @@
*
* @throws Exception If a problem occurs.
*/
- @Test(expectedExceptions = { NullPointerException.class })
+ @Test
public void testConstructorNullPIN()
throws Exception
{
- new CertificateManager(JKS_KEY_STORE_PATH, "JKS", null);
+ assertNotNull(new CertificateManager(JKS_KEY_STORE_PATH, "JKS", null));
}
@@ -254,11 +255,11 @@
*
* @throws Exception If a problem occurs.
*/
- @Test(expectedExceptions = { NullPointerException.class })
+ @Test
public void testConstructorEmptyPIN()
throws Exception
{
- new CertificateManager(JKS_KEY_STORE_PATH, "JKS", "");
+ assertNotNull(new CertificateManager(JKS_KEY_STORE_PATH, "JKS", ""));
}
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java
index fccde2c..af075c2 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2013 ForgeRock AS
*/
package org.opends.server.util;
@@ -1194,4 +1194,17 @@
throws Exception {
Assert.assertEquals(StaticUtils.listsAreEqual(list1, list2), result);
}
+
+ @Test
+ public void testStackTraceHasCause() throws Exception
+ {
+ boolean hasCause = StaticUtils.stackTraceContainsCause(new RuntimeException(new ArithmeticException()), ArithmeticException.class);
+ Assert.assertTrue(hasCause, "First case : ArithmeticException should be detected as a cause");
+
+ hasCause = StaticUtils.stackTraceContainsCause(new RuntimeException(new RuntimeException()), ArithmeticException.class);
+ Assert.assertFalse(hasCause, "Second case : ArithmeticException should not be detected as a cause");
+
+ hasCause = StaticUtils.stackTraceContainsCause(new RuntimeException(new IllegalThreadStateException()), IllegalArgumentException.class);
+ Assert.assertTrue(hasCause, "Third case : IllegalThreadStateException should be detected as a cause");
+ }
}
--
Gitblit v1.10.0