You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/05/27 16:08:38 UTC
[tomcat] branch 9.0.x updated: Fix BZ 64474 - Correct missing log
messages
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 2935e3f Fix BZ 64474 - Correct missing log messages
2935e3f is described below
commit 2935e3fa91a1bcb7119c100784bcc8ece3dc9f43
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed May 27 17:07:52 2020 +0100
Fix BZ 64474 - Correct missing log messages
Previous refactorings moved code between packages but didn't move the
associated messages.
---
.../org/apache/tomcat/util/net/LocalStrings.properties | 8 ++++++++
.../apache/tomcat/util/net/LocalStrings_de.properties | 2 ++
.../apache/tomcat/util/net/LocalStrings_es.properties | 3 +++
.../apache/tomcat/util/net/LocalStrings_fr.properties | 8 ++++++++
.../apache/tomcat/util/net/LocalStrings_ja.properties | 8 ++++++++
.../apache/tomcat/util/net/LocalStrings_ko.properties | 8 ++++++++
.../tomcat/util/net/LocalStrings_zh_CN.properties | 8 ++++++++
java/org/apache/tomcat/util/net/SSLUtilBase.java | 18 +++++++++---------
.../tomcat/util/net/jsse/LocalStrings.properties | 11 -----------
.../tomcat/util/net/jsse/LocalStrings_de.properties | 5 -----
.../tomcat/util/net/jsse/LocalStrings_es.properties | 6 ------
.../tomcat/util/net/jsse/LocalStrings_fr.properties | 11 -----------
.../tomcat/util/net/jsse/LocalStrings_ja.properties | 11 -----------
.../tomcat/util/net/jsse/LocalStrings_ko.properties | 11 -----------
.../tomcat/util/net/jsse/LocalStrings_zh_CN.properties | 11 -----------
.../util/net/openssl/ciphers/LocalStrings.properties | 3 ++-
...trings_ja.properties => LocalStrings_de.properties} | 2 +-
...trings_ja.properties => LocalStrings_es.properties} | 2 +-
.../net/openssl/ciphers/LocalStrings_fr.properties | 3 ++-
.../net/openssl/ciphers/LocalStrings_ja.properties | 3 ++-
.../net/openssl/ciphers/LocalStrings_ko.properties | 3 ++-
.../net/openssl/ciphers/LocalStrings_zh_CN.properties | 3 ++-
.../ciphers/OpenSSLCipherConfigurationParser.java | 4 ++--
23 files changed, 68 insertions(+), 84 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties b/java/org/apache/tomcat/util/net/LocalStrings.properties
index 053da6c..350d6b0 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -163,8 +163,16 @@ sslHostConfigCertificate.mismatch=The property [{0}] was set on the SSLHostConfi
sslImplementation.cnfe=Unable to create SSLImplementation for class [{0}]
sslUtilBase.active=The [{0}] that are active are : [{1}]
+sslUtilBase.alias_no_key_entry=Alias name [{0}] does not identify a key entry
+sslUtilBase.invalidTrustManagerClassName=The trustManagerClassName provided [{0}] does not implement javax.net.ssl.TrustManager
sslUtilBase.keystore_load_failed=Failed to load keystore type [{0}] with path [{1}] due to [{2}]
+sslUtilBase.noCertFile=SSLHostConfig attribute certificateFile must be defined when using an SSL connector
+sslUtilBase.noCrlSupport=The truststoreProvider [{0}] does not support the certificateRevocationFile configuration option
+sslUtilBase.noKeys=No aliases for private keys found in key store
+sslUtilBase.noVerificationDepth=The truststoreProvider [{0}] does not support the certificateVerificationDepth configuration option
sslUtilBase.noneSupported=None of the [{0}] specified are supported by the SSL engine : [{1}]
sslUtilBase.skipped=Some of the specified [{0}] are not supported by the SSL engine and have been skipped: [{1}]
sslUtilBase.ssl3=SSLv3 has been explicitly enabled. This protocol is known to be insecure.
sslUtilBase.tls13.auth=The JSSE TLS 1.3 implementation does not support authentication after the initial handshake and is therefore incompatible with optional client authentication
+sslUtilBase.trustedCertNotChecked=The validity dates of the trusted certificate with alias [{0}] were not checked as the certificate was of an unknown type
+sslUtilBase.trustedCertNotValid=The trusted certificate with alias [{0}] and DN [{1}] is not valid due to [{2}]. Certificates signed by this trusted certificate WILL be accepted
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_de.properties b/java/org/apache/tomcat/util/net/LocalStrings_de.properties
index 064fcde..434e26e 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_de.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_de.properties
@@ -44,5 +44,7 @@ sslHostConfig.certificate.notype=Es wurden mehrere Zertifikate angegeben und min
sslHostConfig.fileNotFound=Die konfigurierte Datei [{0}] existiert nicht.\n
sslHostConfig.opensslconf.null=Versuch eine null OpenSSLConf zu setzen ignoriert
+sslUtilBase.noVerificationDepth=Der truststoreProvider [{0}] unterstützt nicht die Option certificateVerificationDepth
sslUtilBase.noneSupported=Keine der spezifizierten [{0}] wird von der SSL Engine unterstützt: [{1}]
sslUtilBase.ssl3=SSLv3 wurde explizit eingeschalten. Dieses Protokoll ist als unsicher bekannt.
+sslUtilBase.trustedCertNotValid=Das vertrauenswürdige Zertifikat mit alias [{0}] und DN [{1}] ist auf Grund von [{2}] nicht gültig. Zertifikate die von diesem signiert worden sind WERDEN akzeptiert.
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_es.properties b/java/org/apache/tomcat/util/net/LocalStrings_es.properties
index 10adc2e..1efc227 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_es.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_es.properties
@@ -69,6 +69,9 @@ sslHostConfig.opensslconf.null=El intento de fijar OpenSSLConf en nulo fue ignor
sslImplementation.cnfe=Incapaz de crear SSLImplementation para la clase [{0}]
+sslUtilBase.alias_no_key_entry=El nombre de Alias [{0}] no identifica una entrada de clave
+sslUtilBase.invalidTrustManagerClassName=El trustManagerClassName suministrado [{0}] no implementa javax.net.ssl.TrustManager
sslUtilBase.keystore_load_failed=No pude cargar almacén de claves de tipo [{0}] con ruta [{1}] debido a [{2}]
sslUtilBase.noneSupported=Ninguno de los [{0}] especificados es soportado por el motor SSL : [{1}]
sslUtilBase.ssl3=SSLv3 ha sido explicitamente habilitado. Se conoce que este protocolo es inseguro
+sslUtilBase.trustedCertNotValid=El certificado confiable con alias [{0}] y DN [{1}] no es válido debido a [{2}]. Los certificados firmados por este certificados confiable SERAN aceptados\n
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
index 4120457..ec3e503 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
@@ -163,8 +163,16 @@ sslHostConfigCertificate.mismatch=La propriété [{0}] a été définie sur le S
sslImplementation.cnfe=Impossible de créer une SSLImplementation avec la class [{0}]
sslUtilBase.active=Les [{0}] qui sont actifs sont : [{1}]
+sslUtilBase.alias_no_key_entry=Le nom alias [{0}] n''identifie pas une entrée de clé
+sslUtilBase.invalidTrustManagerClassName=Le trustManagerClassName fourni [{0}] n''implémente pas javax.net.ssl.TrustManager
sslUtilBase.keystore_load_failed=Impossible de changer la base de clés de type [{0}] avec le chemin [{1}] à cause de [{2}]
+sslUtilBase.noCertFile=L'attribut certificateFile de SSLHostConfig doit être défini lorsqu'un connecteur SSL est utilisé
+sslUtilBase.noCrlSupport=Le truststoreProvider [{0}] ne supporte pas d''option de configuration certificateRevocationFile
+sslUtilBase.noKeys=Aucun alias pour les clés privées n'a été trouvé dans la base de clés
+sslUtilBase.noVerificationDepth=Le truststoreProvider [{0}] ne supporte pas l''option de configuration certificateVerificationDepth
sslUtilBase.noneSupported=Aucun des [{0}] spécifiés n''est supporté par le moteur SSL : [{1}]
sslUtilBase.skipped=Quelques [{0}] spécifiés ne sont pas supportés par le moteur SSL et ont été ignorés : [{1}]
sslUtilBase.ssl3=SSLv3 a été explicitement activé. Ce protocole est connu comme non-sécurisé.
sslUtilBase.tls13.auth=L’implémentation JSSE de TLS 1.3 ne supporte pas l'authentification après la négociation initiale, elle est donc incompatible avec l’authentification optionnelle du client
+sslUtilBase.trustedCertNotChecked=Les dates de validité du certificat de confiance dont l''alias est [{0}] n''ont pas été vérifiées car sont type est inconnu
+sslUtilBase.trustedCertNotValid=Le certificat de confiance avec l''alias [{0}] et le DN [{1}] n''est pas valide à cause de [{2}], les certificats signés par ce certificat de confiance SERONT acceptés
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ja.properties b/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
index 35d4305..d1c73e9 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
@@ -163,8 +163,16 @@ sslHostConfigCertificate.mismatch=プロパティ[{0}]は[{1}]という名前の
sslImplementation.cnfe=クラス [{0}] のインスタンスを SSLImplementation として作成できません。
sslUtilBase.active=アクティブな[{0}]は次のとおりです：[{1}]
+sslUtilBase.alias_no_key_entry=別名 [{0}] はキーエントリを発見できません
+sslUtilBase.invalidTrustManagerClassName=[{0}]が提供するtrustManagerClassNameはjavax.net.ssl.TrustManagerを実装していません。
sslUtilBase.keystore_load_failed=[{0}] のキーストア [{1}] の読み込みは [{2}] により失敗しました。
+sslUtilBase.noCertFile=SSLコネクタを使用する場合は、SSLHostConfigのcertificateFile属性を定義する必要があります。
+sslUtilBase.noKeys=キーストアで見つかった秘密キーのエイリアスがありません。
+sslUtilBase.noCrlSupport=トラストストアプロバイダー [{0}] は設定項目 certificateRevocationFile に対応していません。
+sslUtilBase.noVerificationDepth=トラストストアプロバイダー [{0}] は設定項目 certificateVerificationDepth に未対応です。
sslUtilBase.noneSupported=指定された[{0}]のどれもSSLエンジンでサポートされていません：[{1}]
sslUtilBase.skipped=指定された[{0}]の一部はSSLエンジンでサポートされておらず、スキップされています：[{1}]
sslUtilBase.ssl3=SSLv3 が明示的に有効化化されています。このプロトコルは安全ではありません。
sslUtilBase.tls13.auth=JSSE TLS 1.3実装は、初期ハンドシェイク後の認証をサポートしていないため、オプションのクライアント認証と互換性がありません。
+sslUtilBase.trustedCertNotChecked=エイリアス[{0}]を持つ信頼できる証明書の有効期限は、証明書が不明な型であるためチェックされませんでした。
+sslUtilBase.trustedCertNotValid=エイリアス[{0}]とDN [{1}]を持つ信頼できる証明書が[{2}]のために無効です。 この信頼できる証明書で署名された証明書が受け入れられるでしょう
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ko.properties b/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
index c5af206..56d54aa 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
@@ -163,8 +163,16 @@ sslHostConfigCertificate.mismatch=프로퍼티 [{0}]이(가) [{1}](이)라는
sslImplementation.cnfe=클래스 [{0}]의 SSLImplementation 객체를 생성할 수 없습니다.
sslUtilBase.active=활성화 된 [{0}]은(는) 다음과 같습니다: [{1}]
+sslUtilBase.alias_no_key_entry=별칭 이름 [{0}]을(를) 사용하여 키 엔트리를 식별해낼 수 없습니다.
+sslUtilBase.invalidTrustManagerClassName=trustManagerClassName에 의해 제공된 클래스 [{0}]은(는) javax.net.ssl.TrustManager를 구현하지 않았습니다.
sslUtilBase.keystore_load_failed=[{2}](으)로 인하여, 경로 [{1}]에 있고 타입이 [{0}]인 키 저장소를 로드하지 못했습니다.
+sslUtilBase.noCertFile=SSLHostConfig의 속성인 certificateFile은, 반드시 SSL connector를 사용할 때에만 정의되어야 합니다.
+sslUtilBase.noCrlSupport=truststoreProvider [{0}]은(는) certificateRevocationFile 설정 옵션을 지원하지 않습니다.
+sslUtilBase.noKeys=개인 키들에 대한 별칭들이 키 저장소에 없습니다.
+sslUtilBase.noVerificationDepth=truststoreProvider [{0}]은(는) certificateVerificationDepth 설정 옵션을 지원하지 않습니다.
sslUtilBase.noneSupported=지정된 [{0}]의 어느 것도 SSL 엔진에 의해 지원되지 않습니다: [{1}]
sslUtilBase.skipped=지정된 [{0}]의 일부가 SSL 엔진에 의해 지원되지 않아 건너뜁니다: [{1}]
sslUtilBase.ssl3=SSLv3이 명시적으로 사용 가능 상태로 설정되었습니다. 이 프로토콜은 안전하지 않은 것으로 알려져 있습니다.
sslUtilBase.tls13.auth=JSSE TLS 1.3 구현이 초기 handshake 이후의 인증을 지원하지 않음에 따라, 선택사항인 클라이언트 인증과 호환되지 않습니다.
+sslUtilBase.trustedCertNotChecked=인증서가 알 수 없는 타입이라서, 별칭이 [{0}]인 신뢰되는 인증서의 유효일자들이 점검되지 않았습니다.
+sslUtilBase.trustedCertNotValid=별칭이 [{0}](이)고 DN이 [{1}]인 해당 신뢰받는 인증서는 [{2}](으)로 인하여 유효하지 않습니다. 이 신뢰되는 인증서에 의해 서명된 인증서들은 받아들여질 것입니다.
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
index 4599491..847194a 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
@@ -163,8 +163,16 @@ sslHostConfigCertificate.mismatch=属性[{0}]是在名为[{1}]的SSLHostConfigCe
sslImplementation.cnfe=无法为类 [{0}] 创建SSLImplementation
sslUtilBase.active=活跃的[{0}]是：[{1}]
+sslUtilBase.alias_no_key_entry=别名[{0}]不标识密钥项
+sslUtilBase.invalidTrustManagerClassName=提供的trustManagerClassName[{0}]未实现javax.net.ssl.TrustManager
sslUtilBase.keystore_load_failed=由于{2}，无法加载路径为{1}]的密钥库类型{0}]
+sslUtilBase.noCertFile=使用SSL连接器时必须定义SSLHostConfig属性certificateFile
+sslUtilBase.noCrlSupport=truststoreProvider [{0}]不支持certificateRevocationFile配置选项
+sslUtilBase.noKeys=在密钥存储中找不到私钥的别名
+sslUtilBase.noVerificationDepth=truststoreProvider[{0}]不支持CertificationDepth配置选项
sslUtilBase.noneSupported=SSL引擎不支持指定的[{0}]：[{1}]
sslUtilBase.skipped=某些指定的[{0}]不受SSL引擎支持，已被跳过：[{1}]
sslUtilBase.ssl3=SSLv3 已显式启用。 已知该协议是不安全。
sslUtilBase.tls13.auth=JSSE TLS 1.3实现不支持初始握手后的身份验证，因此与可选的客户端身份验证不兼容
+sslUtilBase.trustedCertNotChecked=未检查别名为{0}的受信任证书的有效日期，因为该证书属于未知类型
+sslUtilBase.trustedCertNotValid=由于[{2}]，别名为[{0}]且DN [{1}]的可信证书无效。 将接受由此可信证书签署的证书
diff --git a/java/org/apache/tomcat/util/net/SSLUtilBase.java b/java/org/apache/tomcat/util/net/SSLUtilBase.java
index 936fbc0..dd5f99a 100644
--- a/java/org/apache/tomcat/util/net/SSLUtilBase.java
+++ b/java/org/apache/tomcat/util/net/SSLUtilBase.java
@@ -298,7 +298,7 @@ public abstract class SSLUtilBase implements SSLUtil {
if (ks == null) {
if (certificate.getCertificateFile() == null) {
- throw new IOException(sm.getString("jsse.noCertFile"));
+ throw new IOException(sm.getString("sslUtilBase.noCertFile"));
}
PEMFile privateKeyFile = new PEMFile(
@@ -323,11 +323,11 @@ public abstract class SSLUtilBase implements SSLUtil {
chain.toArray(new Certificate[0]));
} else {
if (keyAlias != null && !ks.isKeyEntry(keyAlias)) {
- throw new IOException(sm.getString("jsse.alias_no_key_entry", keyAlias));
+ throw new IOException(sm.getString("sslUtilBase.alias_no_key_entry", keyAlias));
} else if (keyAlias == null) {
Enumeration<String> aliases = ks.aliases();
if (!aliases.hasMoreElements()) {
- throw new IOException(sm.getString("jsse.noKeys"));
+ throw new IOException(sm.getString("sslUtilBase.noKeys"));
}
while (aliases.hasMoreElements() && keyAlias == null) {
keyAlias = aliases.nextElement();
@@ -336,7 +336,7 @@ public abstract class SSLUtilBase implements SSLUtil {
}
}
if (keyAlias == null) {
- throw new IOException(sm.getString("jsse.alias_no_key_entry", (Object) null));
+ throw new IOException(sm.getString("sslUtilBase.alias_no_key_entry", (Object) null));
}
}
@@ -402,7 +402,7 @@ public abstract class SSLUtilBase implements SSLUtil {
Class<?> clazz = classLoader.loadClass(className);
if(!(TrustManager.class.isAssignableFrom(clazz))){
throw new InstantiationException(sm.getString(
- "jsse.invalidTrustManagerClassName", className));
+ "sslUtilBase.invalidTrustManagerClassName", className));
}
Object trustManagerObject = clazz.getConstructor().newInstance();
TrustManager trustManager = (TrustManager) trustManagerObject;
@@ -429,11 +429,11 @@ public abstract class SSLUtilBase implements SSLUtil {
tmf.init(trustStore);
tms = tmf.getTrustManagers();
if (crlf != null && crlf.length() > 0) {
- throw new CRLException(sm.getString("jsseUtil.noCrlSupport", algorithm));
+ throw new CRLException(sm.getString("sslUtilBase.noCrlSupport", algorithm));
}
// Only warn if the attribute has been explicitly configured
if (sslHostConfig.isCertificateVerificationDepthConfigured()) {
- log.warn(sm.getString("jsseUtil.noVerificationDepth", algorithm));
+ log.warn(sm.getString("sslUtilBase.noVerificationDepth", algorithm));
}
}
}
@@ -454,7 +454,7 @@ public abstract class SSLUtilBase implements SSLUtil {
try {
((X509Certificate) cert).checkValidity(now);
} catch (CertificateExpiredException | CertificateNotYetValidException e) {
- String msg = sm.getString("jsseUtil.trustedCertNotValid", alias,
+ String msg = sm.getString("sslUtilBase.trustedCertNotValid", alias,
((X509Certificate) cert).getSubjectDN(), e.getMessage());
if (log.isDebugEnabled()) {
log.debug(msg, e);
@@ -464,7 +464,7 @@ public abstract class SSLUtilBase implements SSLUtil {
}
} else {
if (log.isDebugEnabled()) {
- log.debug(sm.getString("jsseUtil.trustedCertNotChecked", alias));
+ log.debug(sm.getString("sslUtilBase.trustedCertNotChecked", alias));
}
}
}
diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties b/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
index a7dd13c..b276db9 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
@@ -13,22 +13,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-jsse.alias_no_key_entry=Alias name [{0}] does not identify a key entry
-jsse.invalidTrustManagerClassName=The trustManagerClassName provided [{0}] does not implement javax.net.ssl.TrustManager
-jsse.noCertFile=SSLHostConfig attribute certificateFile must be defined when using an SSL connector
-jsse.noKeys=No aliases for private keys found in key store
-jsse.openssl.effectiveCiphers=Ciphers used: [{0}]
-jsse.openssl.unknownElement=Unknown element in cipher string: [{0}]
-
jsseSupport.certTranslationError=Error translating certificate [{0}]
jsseSupport.clientCertError=Error trying to obtain a certificate from the client
jsseUtil.excludeProtocol=The SSL protocol [{0}] which is supported in this JRE was excluded from the protocols available to Tomcat
-jsseUtil.noCrlSupport=The truststoreProvider [{0}] does not support the certificateRevocationFile configuration option
jsseUtil.noDefaultProtocols=Unable to determine a default for sslEnabledProtocols. Set an explicit value to ensure the connector can start.
-jsseUtil.noVerificationDepth=The truststoreProvider [{0}] does not support the certificateVerificationDepth configuration option
-jsseUtil.trustedCertNotChecked=The validity dates of the trusted certificate with alias [{0}] were not checked as the certificate was of an unknown type
-jsseUtil.trustedCertNotValid=The trusted certificate with alias [{0}] and DN [{1}] is not valid due to [{2}]. Certificates signed by this trusted certificate WILL be accepted
pemFile.noMultiPrimes=The PKCS#1 certificate is in multi-prime format and Java does not provide an API for constructing an RSA private key object from that format
pemFile.notValidRFC5915=The provided key file does not conform to RFC 5915
diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings_de.properties b/java/org/apache/tomcat/util/net/jsse/LocalStrings_de.properties
index 6d52fd3..14941f1 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings_de.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings_de.properties
@@ -13,12 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-jsse.openssl.effectiveCiphers=Verwendete Ciphers: [{0}]
-
jsseSupport.certTranslationError=Fehler beim Übersetzen des Zertifikates [{0}]
jsseSupport.clientCertError=Fehler beim Versuch ein Zertifikat vom Client zu erhalten.
-jsseUtil.noVerificationDepth=Der truststoreProvider [{0}] unterstützt nicht die Option certificateVerificationDepth
-jsseUtil.trustedCertNotValid=Das vertrauenswürdige Zertifikat mit alias [{0}] und DN [{1}] ist auf Grund von [{2}] nicht gültig. Zertifikate die von diesem signiert worden sind WERDEN akzeptiert.
-
pemFile.parseError=Der Schlüssel konnte nicht aus [{0}] geparst werden.
diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings_es.properties b/java/org/apache/tomcat/util/net/jsse/LocalStrings_es.properties
index 7042469..5fffe6f 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings_es.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings_es.properties
@@ -13,12 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-jsse.alias_no_key_entry=El nombre de Alias [{0}] no identifica una entrada de clave
-jsse.invalidTrustManagerClassName=El trustManagerClassName suministrado [{0}] no implementa javax.net.ssl.TrustManager
-jsse.openssl.effectiveCiphers=Cifradores usados: [{0}]
-
jsseSupport.clientCertError=Error tratando de obtener un certificado desde el cliente
-jsseUtil.trustedCertNotValid=El certificado confiable con alias [{0}] y DN [{1}] no es válido debido a [{2}]. Los certificados firmados por este certificados confiable SERAN aceptados\n
-
pemFile.parseError=Imposible parsear la clave desde [{0}]
diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties b/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
index 3d4349e..ed9a7ee 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
@@ -13,22 +13,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-jsse.alias_no_key_entry=Le nom alias [{0}] n''identifie pas une entrée de clé
-jsse.invalidTrustManagerClassName=Le trustManagerClassName fourni [{0}] n''implémente pas javax.net.ssl.TrustManager
-jsse.noCertFile=L'attribut certificateFile de SSLHostConfig doit être défini lorsqu'un connecteur SSL est utilisé
-jsse.noKeys=Aucun alias pour les clés privées n'a été trouvé dans la base de clés
-jsse.openssl.effectiveCiphers=Chiffres utilisés : [{0}]
-jsse.openssl.unknownElement=Elément inconnu dans la chaîne de chiffres : [{0}]
-
jsseSupport.certTranslationError=Erreur lors de la traduction du certificat [{0}]
jsseSupport.clientCertError=Echec de l'obtention d'un certificat de la part du client
jsseUtil.excludeProtocol=Le protocole SSL [{0}] qui est supporté par ce JRE a été exclu des protocoles disponibles dans Tomcat
-jsseUtil.noCrlSupport=Le truststoreProvider [{0}] ne supporte pas d''option de configuration certificateRevocationFile
jsseUtil.noDefaultProtocols=Impossible de déterminer un défaut pour sslEnabledProtocols de [{0}], indiquez une valeur explicite pour permettre le démarrage du connecteur
-jsseUtil.noVerificationDepth=Le truststoreProvider [{0}] ne supporte pas l''option de configuration certificateVerificationDepth
-jsseUtil.trustedCertNotChecked=Les dates de validité du certificat de confiance dont l''alias est [{0}] n''ont pas été vérifiées car sont type est inconnu
-jsseUtil.trustedCertNotValid=Le certificat de confiance avec l''alias [{0}] et le DN [{1}] n''est pas valide à cause de [{2}], les certificats signés par ce certificat de confiance SERONT acceptés
pemFile.noMultiPrimes=Le certificat PKCS#1 est dans un format mutli-prime et Java ne fournit pas d'API pour construire une clé privée RSA à partir de ce format
pemFile.notValidRFC5915=La fichier de clé fourni ne se conforme pas à la RFC 5915
diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties b/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties
index 6e323bd..b0b83b0 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties
@@ -13,22 +13,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-jsse.alias_no_key_entry=別名 [{0}] はキーエントリを発見できません
-jsse.invalidTrustManagerClassName=[{0}]が提供するtrustManagerClassNameはjavax.net.ssl.TrustManagerを実装していません。
-jsse.noCertFile=SSLコネクタを使用する場合は、SSLHostConfigのcertificateFile属性を定義する必要があります。
-jsse.noKeys=キーストアで見つかった秘密キーのエイリアスがありません。
-jsse.openssl.effectiveCiphers=使用された暗号：[{0}]
-jsse.openssl.unknownElement=暗号文字列の不明な要素：[{0}]
-
jsseSupport.certTranslationError=証明書の翻訳中にエラーが発生しました[{0}]
jsseSupport.clientCertError=クライアント証明書を取得中のエラー
jsseUtil.excludeProtocol=JRE は SSL プロトコル [{0}] に対応しています。しかし Tomcat の利用可能プロトコルからは除外されています。
-jsseUtil.noCrlSupport=トラストストアプロバイダー [{0}] は設定項目 certificateRevocationFile に対応していません。
jsseUtil.noDefaultProtocols=sslEnableProtocols の既定値を取得できません。コネクターを開始できるよう明示的に値を設定してください。
-jsseUtil.noVerificationDepth=トラストストアプロバイダー [{0}] は設定項目 certificateVerificationDepth に未対応です。
-jsseUtil.trustedCertNotChecked=エイリアス[{0}]を持つ信頼できる証明書の有効期限は、証明書が不明な型であるためチェックされませんでした。
-jsseUtil.trustedCertNotValid=エイリアス[{0}]とDN [{1}]を持つ信頼できる証明書が[{2}]のために無効です。 この信頼できる証明書で署名された証明書が受け入れられるでしょう
pemFile.noMultiPrimes=PKCS#1 証明書は multi-prime RSA フォーマットですが、Java はそのようなフォーマットに対する RSA 秘密鍵を構築する API を提供していません
pemFile.notValidRFC5915=与えられたキーファイルは RFC 5915 に準拠していません
diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings_ko.properties b/java/org/apache/tomcat/util/net/jsse/LocalStrings_ko.properties
index 7e697da..1882888 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings_ko.properties
@@ -13,22 +13,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-jsse.alias_no_key_entry=별칭 이름 [{0}]을(를) 사용하여 키 엔트리를 식별해낼 수 없습니다.
-jsse.invalidTrustManagerClassName=trustManagerClassName에 의해 제공된 클래스 [{0}]은(는) javax.net.ssl.TrustManager를 구현하지 않았습니다.
-jsse.noCertFile=SSLHostConfig의 속성인 certificateFile은, 반드시 SSL connector를 사용할 때에만 정의되어야 합니다.
-jsse.noKeys=개인 키들에 대한 별칭들이 키 저장소에 없습니다.
-jsse.openssl.effectiveCiphers=사용되는 Cipher들: [{0}]
-jsse.openssl.unknownElement=Cipher 문자열에 알 수 없는 엘리먼트: [{0}]
-
jsseSupport.certTranslationError=인증서 [{0}]에 대한 인증서 변환을 하는 중 오류 발생
jsseSupport.clientCertError=클라이언트로부터 인증서를 구하려 시도하는 중 오류 발생
jsseUtil.excludeProtocol=이 JRE에서 지원되는 해당 SSL 프로토콜 [{0}]이(가), Tomcat의 가용 프로토콜 목록에서 제외되어 있습니다.
-jsseUtil.noCrlSupport=truststoreProvider [{0}]은(는) certificateRevocationFile 설정 옵션을 지원하지 않습니다.
jsseUtil.noDefaultProtocols=sslEnabledProtocols의 기본값을 결정할 수 없습니다. Connector가 제대로 시작되는지 보증하려면 명시적으로 값을 설정하십시오.
-jsseUtil.noVerificationDepth=truststoreProvider [{0}]은(는) certificateVerificationDepth 설정 옵션을 지원하지 않습니다.
-jsseUtil.trustedCertNotChecked=인증서가 알 수 없는 타입이라서, 별칭이 [{0}]인 신뢰되는 인증서의 유효일자들이 점검되지 않았습니다.
-jsseUtil.trustedCertNotValid=별칭이 [{0}](이)고 DN이 [{1}]인 해당 신뢰받는 인증서는 [{2}](으)로 인하여 유효하지 않습니다. 이 신뢰되는 인증서에 의해 서명된 인증서들은 받아들여질 것입니다.
pemFile.noMultiPrimes=해당 PKCS#1 인증서는 multi-prime 포맷으로 되어 있는데, 자바는 해당 포맷으로부터 RSA 개인 키 객체를 생성할 API를 제공하지 않습니다.
pemFile.notValidRFC5915=제공된 키는 RFC 5915를 따르지 않습니다
diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties
index fbf0da5..fc763bb 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties
@@ -13,22 +13,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-jsse.alias_no_key_entry=别名[{0}]不标识密钥项
-jsse.invalidTrustManagerClassName=提供的trustManagerClassName[{0}]未实现javax.net.ssl.TrustManager
-jsse.noCertFile=使用SSL连接器时必须定义SSLHostConfig属性certificateFile
-jsse.noKeys=在密钥存储中找不到私钥的别名
-jsse.openssl.effectiveCiphers=使用的密码：[{0}]
-jsse.openssl.unknownElement=密码字符串中的未知元素：[{0}]。
-
jsseSupport.certTranslationError=错误的转换证书[{0}]
jsseSupport.clientCertError=尝试从客户端获取证书时出错
jsseUtil.excludeProtocol=此JRE支持的SSL协议[{0}]已从Tomcat可用的协议中排除
-jsseUtil.noCrlSupport=truststoreProvider [{0}]不支持certificateRevocationFile配置选项
jsseUtil.noDefaultProtocols=无法确定sslEnabledProtocols的默认值。设置显式值以确保连接器可以启动。
-jsseUtil.noVerificationDepth=truststoreProvider[{0}]不支持CertificationDepth配置选项
-jsseUtil.trustedCertNotChecked=未检查别名为{0}的受信任证书的有效日期，因为该证书属于未知类型
-jsseUtil.trustedCertNotValid=由于[{2}]，别名为[{0}]且DN [{1}]的可信证书无效。 将接受由此可信证书签署的证书
pemFile.noMultiPrimes=PKCS#1证书是多素数格式的，Java不提供从该格式构造RSA私钥对象的API
pemFile.notValidRFC5915=提供的key文件不符合RFC 5915
diff --git a/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings.properties b/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings.properties
index 4d0a321..7de7e45 100644
--- a/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings.properties
@@ -13,4 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-converter.mapping=Cipher suite mapping: [{0}] => [{1}]
+opensslCipherConfigurationParser.effectiveCiphers=Ciphers used: [{0}]
+opensslCipherConfigurationParser.unknownElement=Unknown element in cipher string: [{0}]
diff --git a/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_ja.properties b/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_de.properties
similarity index 91%
copy from java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_ja.properties
copy to java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_de.properties
index 25e23e8..4eded96 100644
--- a/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_de.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-converter.mapping=暗号スイートの対応付け: [{0}] => [{1}]
+opensslCipherConfigurationParser.effectiveCiphers=Verwendete Ciphers: [{0}]
diff --git a/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_ja.properties b/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_es.properties
similarity index 91%
copy from java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_ja.properties
copy to java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_es.properties
index 25e23e8..a36ea19 100644
--- a/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_es.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-converter.mapping=暗号スイートの対応付け: [{0}] => [{1}]
+opensslCipherConfigurationParser.effectiveCiphers=Cifradores usados: [{0}]
diff --git a/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_fr.properties b/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_fr.properties
index 73bef10..6739fbc 100644
--- a/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_fr.properties
@@ -13,4 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-converter.mapping=Association de la suite de chiffres : [{0}] => [{1}]
+opensslCipherConfigurationParser.effectiveCiphers=Chiffres utilisés : [{0}]
+opensslCipherConfigurationParser.unknownElement=Elément inconnu dans la chaîne de chiffres : [{0}]
diff --git a/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_ja.properties b/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_ja.properties
index 25e23e8..2fb406e 100644
--- a/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_ja.properties
@@ -13,4 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-converter.mapping=暗号スイートの対応付け: [{0}] => [{1}]
+opensslCipherConfigurationParser.effectiveCiphers=使用された暗号：[{0}]
+opensslCipherConfigurationParser.unknownElement=暗号文字列の不明な要素：[{0}]
diff --git a/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_ko.properties b/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_ko.properties
index 3a83e56..d2c5e52 100644
--- a/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_ko.properties
@@ -13,4 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-converter.mapping=Cipher suite 매핑: [{0}] => [{1}]
+opensslCipherConfigurationParser.effectiveCiphers=사용되는 Cipher들: [{0}]
+opensslCipherConfigurationParser.unknownElement=Cipher 문자열에 알 수 없는 엘리먼트: [{0}]
diff --git a/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_zh_CN.properties
index 59c4c33..e62d7f6 100644
--- a/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_zh_CN.properties
@@ -13,4 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-converter.mapping=密码套件映射：[{0}]=>[{1}]
+opensslCipherConfigurationParser.effectiveCiphers=使用的密码：[{0}]
+opensslCipherConfigurationParser.unknownElement=密码字符串中的未知元素：[{0}]。
diff --git a/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java b/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
index 60433db..d9179b2 100644
--- a/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
+++ b/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
@@ -732,7 +732,7 @@ public class OpenSSLCipherConfigurationParser {
if (aliases.containsKey(alias)) {
removedCiphers.addAll(aliases.get(alias));
} else {
- log.warn(sm.getString("jsse.openssl.unknownElement", alias));
+ log.warn(sm.getString("opensslCipherConfigurationParser.unknownElement", alias));
}
} else if (element.startsWith(TO_END)) {
String alias = element.substring(1);
@@ -767,7 +767,7 @@ public class OpenSSLCipherConfigurationParser {
result.addAll(cipher.getJsseNames());
}
if (log.isDebugEnabled()) {
- log.debug(sm.getString("jsse.openssl.effectiveCiphers", displayResult(ciphers, true, ",")));
+ log.debug(sm.getString("opensslCipherConfigurationParser.effectiveCiphers", displayResult(ciphers, true, ",")));
}
return result;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org