[FIXED JENKINS-25937] Treat BadPaddingException as an unloadable key …

…and continue. (cherry picked from commit 6318b8d) Conflicts: changelog.html
jenkinsci · Dec 21, 2014 · 5ded56a · 5ded56a
1 parent 5e02457
commit 5ded56a
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/core/src/main/java/jenkins/security/DefaultConfidentialStore.java b/core/src/main/java/jenkins/security/DefaultConfidentialStore.java
@@ -16,6 +16,7 @@
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.security.SecureRandom;
+import javax.crypto.BadPaddingException;
 import org.apache.commons.io.IOUtils;
 
 /**
@@ -107,6 +108,12 @@ protected byte[] load(ConfidentialKey key) throws IOException {
             return verifyMagic(bytes);
         } catch (GeneralSecurityException e) {
             throw new IOException("Failed to load the key: "+key.getId(),e);
+        } catch (IOException x) {
+            if (x.getCause() instanceof BadPaddingException) {
+                return null; // broken somehow
+            } else {
+                throw x;
+            }
         } finally {
             IOUtils.closeQuietly(cis);
             IOUtils.closeQuietly(fis);