From d2b556fbbff86cb82bea12a952dd4837b25adcfd Mon Sep 17 00:00:00 2001
From: david_page <david_page@localhost>
Date: Tue, 09 Oct 2007 17:18:14 +0000
Subject: [PATCH] issue 466 (partial) CryptoManager final i18n cleanup
---
opendj-sdk/opends/src/messages/messages/core.properties | 8 ++++++--
opendj-sdk/opends/src/server/org/opends/server/types/CryptoManager.java | 49 +++++++++++++++----------------------------------
2 files changed, 21 insertions(+), 36 deletions(-)
diff --git a/opendj-sdk/opends/src/messages/messages/core.properties b/opendj-sdk/opends/src/messages/messages/core.properties
index 7ad2fa7..3d93afe 100644
--- a/opendj-sdk/opends/src/messages/messages/core.properties
+++ b/opendj-sdk/opends/src/messages/messages/core.properties
@@ -1710,8 +1710,8 @@
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 \
- failed to decode the MAC key entry identifier "%s": %s
+MILD_ERR_CRYPTOMGR_INVALID_KEY_IDENTIFIER_SYNTAX_677=CryptoManager failed to decode \
+ the key entry identifier "%s": %s
SEVERE_ERR_CRYPTOMGR_GET_MAC_ENGINE_INVALID_MAC_ALGORITHM_678=CrytpoManager \
passed invalid MAC algorithm "%s": %s
SEVERE_ERR_CRYPTOMGR_GET_MAC_ENGINE_CANNOT_INITIALIZE_679=CryptoManager \
@@ -1739,3 +1739,7 @@
key attribute value that can be decoded by this instance"
SEVERE_ERR_CRYPTOMGR_IMPORT_KEY_ENTRY_FAILED_OTHER_688=CryptoManager failed \
to import the symmetric key entry "%s": %s
+MILD_ERR_CRYPTOMGR_INVALID_SYMMETRIC_KEY_ALGORITHM_689=CryptoManager failed \
+ to instantiate a KeyGenerator for algorithm "%s": %s
+SEVERE_ERR_CRYPTOMGR_SYMMETRIC_KEY_ENTRY_ADD_FAILED_690=CryptoManager failed \
+ to add locally produced symmetric key entry "%s": %s
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/CryptoManager.java b/opendj-sdk/opends/src/server/org/opends/server/types/CryptoManager.java
index 298f1dd..cd1c781 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/CryptoManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/CryptoManager.java
@@ -1135,19 +1135,8 @@
public Mac getMacEngine(String keyEntryID)
throws CryptoManagerException
{
- MacKeyEntry keyEntry;
- try {
- keyEntry = MacKeyEntry.getKeyEntry(this,
- new KeyEntryID(keyEntryID));
- }
- catch (IllegalArgumentException ex) {
- if (debugEnabled()) {
- TRACER.debugCaught(DebugLogLevel.ERROR, ex);
- }
- throw new CryptoManagerException(
- ERR_CRYPTOMGR_GET_MAC_ENGINE_INVALID_KEY_IDENTIFIER.get(
- keyEntryID, getExceptionMessage(ex)), ex);
- }
+ final MacKeyEntry keyEntry = MacKeyEntry.getKeyEntry(this,
+ new KeyEntryID(keyEntryID));
return (null == keyEntry) ? null : getMacEngine(keyEntry);
}
@@ -1979,16 +1968,13 @@
try {
fValue = UUID.fromString(keyEntryID);
}
- catch (Exception ex) {
+ catch (IllegalArgumentException ex) {
if (debugEnabled()) {
TRACER.debugCaught(DebugLogLevel.ERROR, ex);
}
throw new CryptoManagerException(
- // TODO: i18n
- Message.raw("Key entry identifier \"%s\" has" +
- " invalid syntax: "
- + getExceptionMessage(ex).toString(),
- keyEntryID), ex);
+ ERR_CRYPTOMGR_INVALID_KEY_IDENTIFIER_SYNTAX.get(
+ keyEntryID, getExceptionMessage(ex)), ex);
}
}
@@ -2100,11 +2086,8 @@
}
catch (NoSuchAlgorithmException ex) {
throw new CryptoManagerException(
- // TODO: i18n
- Message.raw("Unable to produce key generator using" +
- " key algorithm argument \"%s\": "
- + getExceptionMessage(ex).toString(),
- algorithm), ex);
+ ERR_CRYPTOMGR_INVALID_SYMMETRIC_KEY_ALGORITHM.get(
+ algorithm, getExceptionMessage(ex)), ex);
}
keyGen.init(keyLengthBits, secureRandom);
final byte[] key = keyGen.generateKey().getEncoded();
@@ -2388,11 +2371,10 @@
AddOperation addOperation = connection.processAdd(entry);
if (addOperation.getResultCode() != ResultCode.SUCCESS)
{
- // TODO i18n
- Message message = Message.raw(
- "Unable to add generated cipher key entry %s: %s",
- entry.getDN(), addOperation.getErrorMessage());
- throw new CryptoManagerException(message);
+ throw new CryptoManagerException(
+ ERR_CRYPTOMGR_SYMMETRIC_KEY_ENTRY_ADD_FAILED.get(
+ entry.getDN().toString(),
+ addOperation.getErrorMessage()));
}
}
@@ -2853,11 +2835,10 @@
AddOperation addOperation = connection.processAdd(entry);
if (addOperation.getResultCode() != ResultCode.SUCCESS)
{
- // TODO i18n
- Message message = Message.raw(
- "Unable to add generated mac key entry %s: %s",
- entry.getDN(), addOperation.getErrorMessage());
- throw new CryptoManagerException(message);
+ throw new CryptoManagerException(
+ ERR_CRYPTOMGR_SYMMETRIC_KEY_ENTRY_ADD_FAILED.get(
+ entry.getDN().toString(),
+ addOperation.getErrorMessage()));
}
}
--
Gitblit v1.10.0