From 88b5935e25fae6d6b65e4a43e151a546d0bc8787 Mon Sep 17 00:00:00 2001
From: david_page <david_page@localhost>
Date: Wed, 10 Oct 2007 16:38:28 +0000
Subject: [PATCH] issue 466 (partial) remove redundant server property BACKUP_PROPERTY_CIPHER_ALGORITHM The cipher algorithm used is encoded in the backup data prologue.
---
opends/src/server/org/opends/server/extensions/ConfigFileHandler.java | 16 ++--------------
1 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java b/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
index 25c0244..51897bd 100644
--- a/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
+++ b/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
@@ -2745,9 +2745,6 @@
// output stream.
if (encrypt)
{
- String cipherAlgorithm = cryptoManager.getPreferredCipherTransformation();
- backupProperties.put(BACKUP_PROPERTY_CIPHER_ALGORITHM, cipherAlgorithm);
-
try
{
outputStream
@@ -2761,7 +2758,7 @@
}
Message message = ERR_CONFIG_BACKUP_CANNOT_GET_CIPHER.get(
- cipherAlgorithm, stackTraceToSingleLineString(e));
+ e.getMessage());
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, e);
}
@@ -3161,15 +3158,6 @@
// in a cipher input stream.
if (backupInfo.isEncrypted())
{
- String cipherAlgorithm =
- backupInfo.getBackupProperty(BACKUP_PROPERTY_CIPHER_ALGORITHM);
- if (cipherAlgorithm == null)
- {
- Message message = ERR_CONFIG_RESTORE_UNKNOWN_CIPHER.get(backupID);
- throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
- message);
- }
-
try
{
inputStream = DirectoryServer.getCryptoManager()
@@ -3178,7 +3166,7 @@
catch (Exception e)
{
Message message = ERR_CONFIG_RESTORE_CANNOT_GET_CIPHER.
- get(backupFile.getPath(), cipherAlgorithm);
+ get(e.getMessage(), backupFile.getPath());
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, e);
}
--
Gitblit v1.10.0