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/backends/SchemaBackend.java | 19 ++++---------------
1 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/SchemaBackend.java b/opends/src/server/org/opends/server/backends/SchemaBackend.java
index 7a35a9f..50ec617 100644
--- a/opends/src/server/org/opends/server/backends/SchemaBackend.java
+++ b/opends/src/server/org/opends/server/backends/SchemaBackend.java
@@ -4244,14 +4244,12 @@
// output stream.
if (encrypt)
{
- String cipherAlgorithm = cryptoManager.getPreferredCipherTransformation();
- backupProperties.put(BACKUP_PROPERTY_CIPHER_ALGORITHM, cipherAlgorithm);
try
{
outputStream
= cryptoManager.getCipherOutputStream(outputStream);
}
- catch (Exception e)
+ catch (CryptoManager.CryptoManagerException e)
{
if (debugEnabled())
{
@@ -4259,7 +4257,7 @@
}
Message message = ERR_SCHEMA_BACKUP_CANNOT_GET_CIPHER.get(
- cipherAlgorithm, stackTraceToSingleLineString(e));
+ e.getMessage());
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, e);
}
@@ -4619,24 +4617,15 @@
// in a cipher input stream.
if (backupInfo.isEncrypted())
{
- String cipherAlgorithm =
- backupInfo.getBackupProperty(BACKUP_PROPERTY_CIPHER_ALGORITHM);
- if (cipherAlgorithm == null)
- {
- Message message = ERR_SCHEMA_RESTORE_UNKNOWN_CIPHER.get(backupID);
- throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
- message);
- }
-
try
{
inputStream = DirectoryServer.getCryptoManager()
.getCipherInputStream(inputStream);
}
- catch (Exception e)
+ catch (CryptoManager.CryptoManagerException e)
{
Message message = ERR_SCHEMA_RESTORE_CANNOT_GET_CIPHER.
- get(cipherAlgorithm, backupFile.getPath());
+ get(backupFile.getPath(), e.getMessage());
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, e);
}
--
Gitblit v1.10.0