From 8c3b1bf2a1a6f50c3d0dea213e54821c8f401fd7 Mon Sep 17 00:00:00 2001
From: david_page <david_page@localhost>
Date: Tue, 09 Oct 2007 02:40:09 +0000
Subject: [PATCH] issue 466 (partial) CryptoManager more i18n cleanup
---
opends/src/messages/messages/core.properties | 20 ++++++++++++++++----
opends/src/server/org/opends/server/types/CryptoManager.java | 35 ++++++++++++-----------------------
2 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/opends/src/messages/messages/core.properties b/opends/src/messages/messages/core.properties
index 0f40564..82a5064 100644
--- a/opends/src/messages/messages/core.properties
+++ b/opends/src/messages/messages/core.properties
@@ -1711,8 +1711,20 @@
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
+ failed to 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
+ passed invalid MAC algorithm "%s": %s
+SEVERE_ERR_CRYPTOMGR_GET_MAC_ENGINE_CANNOT_INITIALIZE_679=CryptoManager \
+ failed to initialize MAC engine: %s
+SEVERE_ERR_CRYPTOMGR_GET_CIPHER_INVALID_CIPHER_TRANSFORMATION_680=CryptoManager \
+ passed invalid Cipher transformation "%s": %s
+SEVERE_ERR_CRYPTOMGR_GET_CIPHER_CANNOT_INITIALIZE_681=CryptoManager \
+ cannot initialize Cipher: %s
+SEVERE_ERR_CRYPTOMGR_GET_CIPHER_STREAM_PROLOGUE_WRITE_ERROR_682=CryptoManager \
+ failed to write the stream prologue: %s
+SEVERE_ERR_CRYPTOMGR_DECRYPT_FAILED_TO_READ_KEY_IDENTIFIER_683=CryptoManager \
+ failed to read the symmetric key identifier from the data prologue: %s
+SEVERE_ERR_CRYPTOMGR_DECRYPT_UNKNOWN_KEY_IDENTIFIER_684=CryptoManager does not \
+ recognize the symmetric key identifier in the data prologue
+SEVERE_ERR_CRYPTOMGR_DECRYPT_FAILED_TO_READ_IV_685=CryptoManager failed to \
+ read the initialization vector from the data prologue: %s
diff --git a/opends/src/server/org/opends/server/types/CryptoManager.java b/opends/src/server/org/opends/server/types/CryptoManager.java
index 70edd98..87970f3 100644
--- a/opends/src/server/org/opends/server/types/CryptoManager.java
+++ b/opends/src/server/org/opends/server/types/CryptoManager.java
@@ -1188,7 +1188,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, ex);
}
throw new CryptoManagerException(
- ERR_CRYPTOMGR_GET_MAC_ENGINE_INVALID_KEY_SPECIFICATION.get(
+ ERR_CRYPTOMGR_GET_MAC_ENGINE_CANNOT_INITIALIZE.get(
getExceptionMessage(ex)), ex);
}
@@ -1251,10 +1251,8 @@
TRACER.debugCaught(DebugLogLevel.ERROR, ex);
}
throw new CryptoManagerException(
- // TODO: i18n
- Message.raw("Invalid Cipher transformation \"%s\": "
- + getExceptionMessage(ex).toString(),
- keyEntry.getType()), ex);
+ ERR_CRYPTOMGR_GET_CIPHER_INVALID_CIPHER_TRANSFORMATION.get(
+ keyEntry.getType(), getExceptionMessage(ex)), ex);
}
try {
@@ -1281,9 +1279,8 @@
TRACER.debugCaught(DebugLogLevel.ERROR, ex);
}
throw new CryptoManagerException(
- // TODO: i18n
- Message.raw("Error initializing cipher: "
- + getExceptionMessage(ex).toString()), ex);
+ ERR_CRYPTOMGR_GET_CIPHER_CANNOT_INITIALIZE.get(
+ getExceptionMessage(ex)), ex);
}
return cipher;
@@ -1435,10 +1432,8 @@
TRACER.debugCaught(DebugLogLevel.ERROR, ex);
}
throw new CryptoManagerException(
- // TODO: i18n
- Message.raw("Exception when writing CryptoManager" +
- " prologue: "
- + getExceptionMessage(ex).toString()), ex);
+ ERR_CRYPTOMGR_GET_CIPHER_STREAM_PROLOGUE_WRITE_ERROR.get(
+ getExceptionMessage(ex)), ex);
}
return new CipherOutputStream(outputStream, cipher);
@@ -1479,18 +1474,14 @@
TRACER.debugCaught(DebugLogLevel.ERROR, ex);
}
throw new CryptoManagerException(
- // TODO: i18n
- Message.raw("Exception when reading key identifier"
- + " from data prologue: "
- + getExceptionMessage(ex).toString()), ex);
+ ERR_CRYPTOMGR_DECRYPT_FAILED_TO_READ_KEY_IDENTIFIER.get(
+ getExceptionMessage(ex)), ex);
}
CipherKeyEntry keyEntry = CipherKeyEntry.getKeyEntry(this, keyID);
if (null == keyEntry) {
throw new CryptoManagerException(
- // TODO: i18N
- Message.raw("Invalid or unknown key identifier in" +
- " data prologue."));
+ ERR_CRYPTOMGR_DECRYPT_UNKNOWN_KEY_IDENTIFIER.get());
}
byte[] iv = null;
@@ -1506,10 +1497,8 @@
TRACER.debugCaught(DebugLogLevel.ERROR, ex);
}
throw new CryptoManagerException(
- // TODO: i18n
- Message.raw("Exception when reading initialization"
- + " vector from data prologue: "
- + getExceptionMessage(ex).toString()), ex);
+ ERR_CRYPTOMGR_DECRYPT_FAILED_TO_READ_IV.get(
+ getExceptionMessage(ex)), ex);
}
}
--
Gitblit v1.10.0