From e6a7ecfc71d6b0144a6366cd2520e2f03846b033 Mon Sep 17 00:00:00 2001
From: david_page <david_page@localhost>
Date: Wed, 05 Sep 2007 17:58:40 +0000
Subject: [PATCH] Update CryptoManager secret key encryption public API:
---
opends/src/server/org/opends/server/extensions/ConfigFileHandler.java | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java b/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
index 228105f..9d0822c 100644
--- a/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
+++ b/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
@@ -54,9 +54,6 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.locks.ReentrantLock;
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.CipherOutputStream;
import javax.crypto.Mac;
import org.opends.messages.Message;
@@ -2823,13 +2820,13 @@
// output stream.
if (encrypt)
{
- String cipherAlgorithm = cryptoManager.getPreferredCipherAlgorithm();
+ String cipherAlgorithm = cryptoManager.getPreferredCipherTransformation();
backupProperties.put(BACKUP_PROPERTY_CIPHER_ALGORITHM, cipherAlgorithm);
- Cipher cipher;
try
{
- cipher = cryptoManager.getPreferredCipher(Cipher.ENCRYPT_MODE);
+ outputStream
+ = cryptoManager.getCipherOutputStream(outputStream);
}
catch (Exception e)
{
@@ -2843,8 +2840,6 @@
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, e);
}
-
- outputStream = new CipherOutputStream(outputStream, cipher);
}
@@ -3259,11 +3254,10 @@
message);
}
- Cipher cipher;
try
{
- cipher = DirectoryServer.getCryptoManager().getCipher(cipherAlgorithm,
- Cipher.DECRYPT_MODE);
+ inputStream = DirectoryServer.getCryptoManager()
+ .getCipherInputStream(inputStream);
}
catch (Exception e)
{
@@ -3272,8 +3266,6 @@
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, e);
}
-
- inputStream = new CipherInputStream(inputStream, cipher);
}
// Now wrap the resulting input stream in a zip stream so that we can read
--
Gitblit v1.10.0