From 9f5b919d84da48df1bee0afa2b17fd806d627e1f Mon Sep 17 00:00:00 2001
From: david_page <david_page@localhost>
Date: Mon, 08 Oct 2007 20:45:54 +0000
Subject: [PATCH] issue 466 (partial) CryptoManager more i18n cleanup
---
opends/src/messages/messages/core.properties | 25 +++++++++---
opends/src/server/org/opends/server/types/CryptoManager.java | 56 ++++++++-------------------
2 files changed, 36 insertions(+), 45 deletions(-)
diff --git a/opends/src/messages/messages/core.properties b/opends/src/messages/messages/core.properties
index 18c604a..0f40564 100644
--- a/opends/src/messages/messages/core.properties
+++ b/opends/src/messages/messages/core.properties
@@ -1695,11 +1695,24 @@
failed to publish the instance-key-pair public-key-certificate entry in ADS: %s
SEVERE_ERR_CRYPTOMGR_FAILED_TO_RETRIEVE_ADS_TRUSTSTORE_CERTS_670=CryptoManager \
failed to retrieve the collection of instance-key-pair public-key-certificates \
- from ADS container \"%s\": %s
+ from ADS container "%s": %s
SEVERE_ERR_CRYPTOMGR_FAILED_TO_ENCODE_SYMMETRIC_KEY_ATTRIBUTE_671=CryptoManager \
failed to encode symmetric key attribute value: %s
-SEVERE_ERR_CRYPTOMGR_PARSE_SYMMETRIC_KEY_ATTRIBUTE_FIELD_COUNT_672=CryptoManager \
- symmetric key attribute value \"%s\" syntax is invalid: incorrect number of fields
-SEVERE_ERR_CRYPTOMGR_PARSE_SYMMETRIC_KEY_ATTRIBUTE_SYNTAX_673=CryptoManager \
- symmetric key attribute value \"%s\" syntax is invalid. Parsing failed in field \
- \"%s\" at offset \"%d\"
+SEVERE_ERR_CRYPTOMGR_DECODE_SYMMETRIC_KEY_ATTRIBUTE_FIELD_COUNT_672=CryptoManager \
+ symmetric key attribute value "%s" syntax is invalid: incorrect number of fields
+SEVERE_ERR_CRYPTOMGR_DECODE_SYMMETRIC_KEY_ATTRIBUTE_SYNTAX_673=CryptoManager \
+ symmetric key attribute value "%s" syntax is invalid. Parsing failed in field \
+ "%s" at offset %d
+SEVERE_ERR_CRYPTOMGR_DECODE_SYMMETRIC_KEY_ATTRIBUTE_NO_PRIVATE_674=CryptoManager \
+ failed to retrieve the instance-key-pair private-key: %s
+SEVERE_ERR_CRYPTOMGR_DECODE_SYMMETRIC_KEY_ATTRIBUTE_DECIPHER_675=CryptoManager \
+ failed to decipher the wrapped secret-key value: %s
+MILD_ERR_CRYPTOMGR_REWRAP_SYMMETRIC_KEY_ATTRIBUTE_NO_WRAPPER_676=CryptoManager \
+ cannot find the public-key-certificate (identfier "%s") requested for symmetric \
+ key re-encoding
+MILD_ERR_CRYPTOMGR_GET_MAC_ENGINE_INVALID_KEY_IDENTIFIER_677=CryptoManager \
+ cannot decode the MAC key entry identifier "%s": %s
+SEVERE_ERR_CRYPTOMGR_GET_MAC_ENGINE_INVALID_MAC_ALGORITHM_678=CrytpoManager \
+ invalid MAC algorithm "%s": %s
+SEVERE_ERR_CRYPTOMGR_GET_MAC_ENGINE_INVALID_KEY_SPECIFICATION_679=CryptoManager \
+ cannot initialize MAC engine: %s
diff --git a/opends/src/server/org/opends/server/types/CryptoManager.java b/opends/src/server/org/opends/server/types/CryptoManager.java
index ee2d5f1..70edd98 100644
--- a/opends/src/server/org/opends/server/types/CryptoManager.java
+++ b/opends/src/server/org/opends/server/types/CryptoManager.java
@@ -754,7 +754,7 @@
String[] elements = symmetricKeyAttribute.split(":", 0);
if (5 != elements.length) {
throw new CryptoManagerException(
- ERR_CRYPTOMGR_PARSE_SYMMETRIC_KEY_ATTRIBUTE_FIELD_COUNT.get(
+ ERR_CRYPTOMGR_DECODE_SYMMETRIC_KEY_ATTRIBUTE_FIELD_COUNT.get(
symmetricKeyAttribute));
}
@@ -798,7 +798,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, ex);
}
throw new CryptoManagerException(
- ERR_CRYPTOMGR_PARSE_SYMMETRIC_KEY_ATTRIBUTE_SYNTAX.get(
+ ERR_CRYPTOMGR_DECODE_SYMMETRIC_KEY_ATTRIBUTE_SYNTAX.get(
symmetricKeyAttribute, fieldName,
ex.getErrorOffset()), ex);
}
@@ -815,26 +815,14 @@
privateKey = (PrivateKey)getTrustStoreBackend()
.getKey(ConfigConstants.ADS_CERTIFICATE_ALIAS);
}
- catch (ConfigException ex) {
+ catch (IdentifiedException ex) {
+ // ConfigException, DirectoryException
if (debugEnabled()) {
TRACER.debugCaught(DebugLogLevel.ERROR, ex);
}
throw new CryptoManagerException(
- // TODO: i18n
- Message.raw("The instance-key-pair private-key is not"
- + " available: "
- + getExceptionMessage(ex).toString()), ex);
- }
- catch (DirectoryException ex) {
- // TODO: is DirectoryException reasonable for getKey() ?
- if (debugEnabled()) {
- TRACER.debugCaught(DebugLogLevel.ERROR, ex);
- }
- throw new CryptoManagerException(
- // TODO: i18n
- Message.raw("The instance-key-pair private-key is not"
- + " available: "
- + getExceptionMessage(ex).toString()), ex);
+ ERR_CRYPTOMGR_DECODE_SYMMETRIC_KEY_ATTRIBUTE_NO_PRIVATE.get(
+ getExceptionMessage(ex)), ex);
}
// Unwrap secret key.
@@ -852,10 +840,8 @@
TRACER.debugCaught(DebugLogLevel.ERROR, ex);
}
throw new CryptoManagerException(
- // TODO: i18n
- Message.raw("Failed to decipher the wrapped secret-key"
- + " value: "
- + getExceptionMessage(ex).toString()), ex);
+ ERR_CRYPTOMGR_DECODE_SYMMETRIC_KEY_ATTRIBUTE_DECIPHER.get(
+ getExceptionMessage(ex)), ex);
}
return secretKey;
@@ -887,10 +873,8 @@
if (! (certMap.containsKey(requestedInstanceKeyID)
&& null != certMap.get(requestedInstanceKeyID))) {
throw new CryptoManagerException(
- // TODO: i18n
- Message.raw("The public key certificate specified by" +
- " the identifier %s cannot be found.",
- requestedInstanceKeyID));
+ ERR_CRYPTOMGR_REWRAP_SYMMETRIC_KEY_ATTRIBUTE_NO_WRAPPER.get(
+ requestedInstanceKeyID));
}
final byte[] wrappingKeyCert =
certMap.get(requestedInstanceKeyID);
@@ -1161,11 +1145,8 @@
TRACER.debugCaught(DebugLogLevel.ERROR, ex);
}
throw new CryptoManagerException(
- // TODO: i18n
- Message.raw("MAC key entry identifier \"%s\" is not"
- + " a valid UUID: "
- + getExceptionMessage(ex).toString(),
- keyEntryID), ex);
+ ERR_CRYPTOMGR_GET_MAC_ENGINE_INVALID_KEY_IDENTIFIER.get(
+ keyEntryID, getExceptionMessage(ex)), ex);
}
return (null == keyEntry) ? null : getMacEngine(keyEntry);
}
@@ -1194,10 +1175,9 @@
TRACER.debugCaught(DebugLogLevel.ERROR, ex);
}
throw new CryptoManagerException(
- // TODO: i18n
- Message.raw("Invalid MAC algorithm \"%s\": "
- + getExceptionMessage(ex).toString(),
- keyEntry.getType()), ex);
+ ERR_CRYPTOMGR_GET_MAC_ENGINE_INVALID_MAC_ALGORITHM.get(
+ keyEntry.getType(), getExceptionMessage(ex)),
+ ex);
}
try {
@@ -1208,10 +1188,8 @@
TRACER.debugCaught(DebugLogLevel.ERROR, ex);
}
throw new CryptoManagerException(
- // TODO: i18n
- Message.raw("Invalid key specification supplied to"
- + " Mac object initialization: "
- + getExceptionMessage(ex).toString()), ex);
+ ERR_CRYPTOMGR_GET_MAC_ENGINE_INVALID_KEY_SPECIFICATION.get(
+ getExceptionMessage(ex)), ex);
}
return mac;
--
Gitblit v1.10.0