From 2c1469036863c593a1bcba68f7c68b46f2a8e169 Mon Sep 17 00:00:00 2001
From: Steve Loughran <stevel@apache.org>
Date: Tue, 21 Apr 2015 22:38:27 +0100
Subject: [PATCH] HADOOP-11846 TestCertificateUtil.testCorruptPEM failing on
 Jenkins JDK8. (Larry McCay via stevel)

---
 .../security/authentication/util/TestCertificateUtil.java     | 4 ++--
 hadoop-common-project/hadoop-common/CHANGES.txt               | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/util/TestCertificateUtil.java b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/util/TestCertificateUtil.java
index f52b6d21c76..ce4176c30f6 100644
--- a/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/util/TestCertificateUtil.java
+++ b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/util/TestCertificateUtil.java
@@ -52,7 +52,7 @@ public class TestCertificateUtil {
 
   @Test
   public void testCorruptPEM() throws Exception {
-    String pem = "LJMLJMMIICOjCCAaOgAwIBAgIJANXi/oWxvJNzMA0GCSqGSIb3DQEBBQUAMF8xCzAJBgNVBAYTAlVTMQ0w"
+    String pem = "MIICOjCCAaOgAwIBAgIJANXi/oWxvJNzMA0GCSqGSIb3DQEBBQUAMF8xCzAJBgNVBAYTAlVTMQ0w"
         + "CwYDVQQIEwRUZXN0MQ0wCwYDVQQHEwRUZXN0MQ8wDQYDVQQKEwZIYWRvb3AxDTALBgNVBAsTBFRl"
         + "c3QxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNTAxMDIyMTE5MjRaFw0xNjAxMDIyMTE5MjRaMF8x"
         + "CzAJBgNVBAYTAlVTMQ0wCwYDVQQIEwRUZXN0MQ0wCwYDVQQHEwRUZXN0MQ8wDQYDVQQKEwZIYWRv"
@@ -62,7 +62,7 @@ public class TestCertificateUtil {
         + "7OPuuaHb25J8isiOyA3RiWuJGQlXTdkCAwEAATANBgkqhkiG9w0BAQUFAAOBgQAdRUyCUqE9sdim"
         + "Fbll9BuZDKV16WXeWGq+kTd7ETe7l0fqXjq5EnrifOai0L/pXwVvS2jrFkKQRlRxRGUNaeEBZ2Wy"
         + "9aTyR+HGHCfvwoCegc9rAVw/DLaRriSO/jnEXzYK6XLVKH+hx5UXrJ7Oyc7JjZUc3g9kCWORThCX"
-        + "Mzc1xA==";
+        + "Mzc1xA++";
     try {
       CertificateUtil.parseRSAPublicKey(pem);
       fail("Should not have thrown ServletException");
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 98193008748..02066b678ee 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -527,6 +527,9 @@ Release 2.8.0 - UNRELEASED
     HADOOP-11704. DelegationTokenAuthenticationFilter must pass ipaddress
     instead of hostname to ProxyUsers#authorize (Anubhav Dhoot via asuresh)
 
+    HADOOP-11846 TestCertificateUtil.testCorruptPEM failing on Jenkins JDK8.
+    (Larry McCay via stevel)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES