From 8aa9e3c4288898f16445e768320b6dad1de612e1 Mon Sep 17 00:00:00 2001
From: dugan <dugan@localhost>
Date: Wed, 25 Mar 2009 21:26:49 +0000
Subject: [PATCH] These changes:
---
opends/src/server/org/opends/server/crypto/CryptoManagerImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/crypto/CryptoManagerImpl.java b/opends/src/server/org/opends/server/crypto/CryptoManagerImpl.java
index b5351a6..6f8d314 100644
--- a/opends/src/server/org/opends/server/crypto/CryptoManagerImpl.java
+++ b/opends/src/server/org/opends/server/crypto/CryptoManagerImpl.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.server.crypto;
@@ -2884,7 +2884,13 @@
}
final Cipher cipher = getCipher(keyEntry, Cipher.DECRYPT_MODE, iv);
- return cipher.doFinal(data, readIndex, data.length - readIndex);
+ if(data.length - readIndex > 0)
+ return cipher.doFinal(data, readIndex, data.length - readIndex);
+ else {
+ //IBM Java 6 throws an IllegalArgumentException when there's n
+ // data to process.
+ return cipher.doFinal();
+ }
}
--
Gitblit v1.10.0