2 files changed, 4 insertions, 5 deletions
diff --git a/libjava/classpath/gnu/javax/crypto/pad/PadFactory.java b/libjava/classpath/gnu/javax/crypto/pad/PadFactory.java
index e122719b62b..913d69dcbaf 100644
--- a/libjava/classpath/gnu/javax/crypto/pad/PadFactory.java
+++ b/libjava/classpath/gnu/javax/crypto/pad/PadFactory.java
@@ -84,7 +84,7 @@ public class PadFactory implements Registry
     if (pad.endsWith("padding"))
       pad = pad.substring(0, pad.length() - "padding".length());
     IPad result = null;
-    if (pad.equals(PKCS7_PAD))
+    if (pad.equals(PKCS7_PAD) || pad.equals(PKCS5_PAD))
       {
         result = new PKCS7();
       }
@@ -122,6 +122,7 @@ public class PadFactory implements Registry
   public static final Set getNames()
   {
     HashSet hs = new HashSet();
+    hs.add(PKCS5_PAD);
     hs.add(PKCS7_PAD);
     hs.add(TBC_PAD);
     hs.add(EME_PKCS1_V1_5_PAD);
@@ -133,4 +134,4 @@ public class PadFactory implements Registry
 
   // Instance methods
   // -------------------------------------------------------------------------
-}
-\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/crypto/pad/WrongPaddingException.java b/libjava/classpath/gnu/javax/crypto/pad/WrongPaddingException.java
index cc74dfb26bf..e477cf303c7 100644
--- a/libjava/classpath/gnu/javax/crypto/pad/WrongPaddingException.java
+++ b/libjava/classpath/gnu/javax/crypto/pad/WrongPaddingException.java
@@ -41,8 +41,6 @@ package gnu.javax.crypto.pad;
 /**
  * <p>A checked exception that indicates that a padding algorithm did not find the
  * expected padding bytes when unpadding some data.</p>
- *
- * @version $Revision: 1.1 $
  */
 public class WrongPaddingException extends Exception
 {
@@ -60,4 +58,4 @@ public class WrongPaddingException extends Exception
 
   // Instant methods
   // -------------------------------------------------------------------------
-}
-\ No newline at end of file
+}