diff --git a/certs/cacert.der b/certs/cacert.der
index bd2c519aeb3..6c405e2bb27 100644
Binary files a/certs/cacert.der and b/certs/cacert.der differ
diff --git a/certs/cacert.pem b/certs/cacert.pem
index 0732f074eba..d8e6eadf574 100644
--- a/certs/cacert.pem
+++ b/certs/cacert.pem
@@ -1,23 +1,23 @@
 -----BEGIN CERTIFICATE-----
-MIIDyjCCArKgAwIBAgIJALOYCutr8EvUMA0GCSqGSIb3DQEBCwUAMIGLMRUwEwYD
-VQQDDAxJY2UgVGVzdHMgQ0ExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0Ms
-IEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNV
-BAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0MjIx
-NTAyMjJaFw0yMjA3MjYxNTAyMjJaMIGLMRUwEwYDVQQDDAxJY2UgVGVzdHMgQ0Ex
-DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
-cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
-AQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBANlGOp6TTTU7BVQjc7U/jvXz6u14bb5KAFTx4V0kkEiCXD1/vMH+meJbYH3s
-QskC9xmdOl+fn+40OrcxVPDcKLk2YFRSOOsbyeQDViUjLpSz5Lft8NZnHUhb+Mj+
-0ewmg01K4wSwNI/J5W0E7GAqD+eBPYfiguT8viu9xWetjXp3AsgbJ8QCwWpd2n1X
-8BGf6P+IYk7OKat74n04JE3SKBBEQmAfR1JVhEvtanruPlivzt/TsPPL4j52AvOY
-Z6eAxjxX+QTK5cqLxxuEAlIn1pvB+K2KUEQ7pQrOAgeLFDfk68H3yMAW5ioCFrEI
-0OZDcqr7yvNyfCJkZZOKbb7HrZ8CAwEAAaMvMC0wDAYDVR0TBAUwAwEB/zAdBgNV
-HQ4EFgQU7O6bzeYwIBh5lbsB2FSs8DudPq8wDQYJKoZIhvcNAQELBQADggEBAB5H
-g1Kg0tjQB+N4AiAKxFAIwW05ziksnbH/oKiVD/bx/65Gkwj0okktkSnAtT0Ws9ox
-bhOqg+mk/q+HUhXQmIaz6dAHc8DdfzoWVg7uQPCa+8c235c/BOGE1f8IJvWN4Bie
-zMHdzfqOjUIJ5Od328tnD9JWHex68lCrNE1xeWI7hqhvenQfViH/zD+mo6mqS+A0
-fWpHmWrSKkWn3kl1B4LqE1cqFyqvKEqX26vEylt0GDUHvT7X09LodvUmpyP1NBlF
-/x2jO5IAmGS9AW78lbjBJCV4RFfZ0/+6CFLteP4uF1fmNi3hSyJW5XGx9Oh7KFfP
-6MuBftHVo260MRUTinw=
+MIID1jCCAr6gAwIBAgIIUmyVFUPQ9f0wDQYJKoZIhvcNAQELBQAwgYsxFTATBgNV
+BAMMDEljZSBUZXN0cyBDQTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywg
+SW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UE
+BhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcyNzEx
+MzIxOFoXDTI0MTAyOTExMzIxOFowgYsxFTATBgNVBAMMDEljZSBUZXN0cyBDQTEM
+MAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVw
+aXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0B
+CQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAy6/rqeQ+McDn/mXQwNGk+cNftOIJb99Cdpl4dFuMzD7XBK36l1Ijo/Ro/d03
+7ZJr2BzAY/DlseyuvX9qXeQ2jsvzwlumNuEv09ILbCqn27rGt3Gu8RpvSt6ehVic
+PXJR3dA/TCZW+iK8WDmDOWtD8DO9jSiN0+qneWixCqWFX5DeBFQoORF3dIjJa62B
+LLPaWK1EW01/6R/Las92NKRqXuQ3TkAT1bpsQBjrJFNGSSdwwcteGGpPfzwSw9gW
+IuKuS4f0/xZVx6rG9Jzcxm/J2owidhZqqKEvaNiIghMXax6Cldh9Iq2qUS3FS3Ye
+T4ZuT/7cEVGu5RPyNnTKgGirhwIDAQABozwwOjAMBgNVHRMEBTADAQH/MB0GA1Ud
+DgQWBBQfsKt279iGWWp5DRYKF9f9b/F1+TALBgNVHQ8EBAMCAYYwDQYJKoZIhvcN
+AQELBQADggEBAI4qKKqx/edLOQKdcdH+2QAxrmsnZDSMmnlVGl51WBatFw+9GskH
+YeIabYdihTx/aDbdoLW5FDVYQQEfBhnvo7uwfhoYR8DapuPFCfeyf5hED+FIpXHo
+jVgeL3DrTccPQX3VaCu0ID5FN4EA3Jbp9/Kt+uwQUlHVeMrHQNfo4En/yoJoJowz
+26iWrmi2ZdnxuK9WZ0HhENODLp86oNvkgqu9iOR5vJVcJOtKMAiSHmemLOZdaAeM
+7UwNTu+cYTC6N2LH31K6qCwJkk3YJg89uCKhd6YkMZvmQlTrnqM39Hg+V8LKl3x/
+2iDrWoik199Rh9p/Z1qqitqeOnWK3EzNevA=
 -----END CERTIFICATE-----
diff --git a/certs/client.bks b/certs/client.bks
index 24f948f9568..9b27535f405 100644
Binary files a/certs/client.bks and b/certs/client.bks differ
diff --git a/certs/client.jks b/certs/client.jks
index 2eb71212a03..aaf78692e41 100644
Binary files a/certs/client.jks and b/certs/client.jks differ
diff --git a/certs/client.p12 b/certs/client.p12
index b1b4ceee3bd..f2aab608a5d 100644
Binary files a/certs/client.p12 and b/certs/client.p12 differ
diff --git a/certs/server.bks b/certs/server.bks
index 532b49b840b..7b3a17cc346 100644
Binary files a/certs/server.bks and b/certs/server.bks differ
diff --git a/certs/server.jks b/certs/server.jks
index c92abf21343..edc43fd1d74 100644
Binary files a/certs/server.jks and b/certs/server.jks differ
diff --git a/certs/server.p12 b/certs/server.p12
index 95e82110dc0..fbc2a61fb23 100644
Binary files a/certs/server.p12 and b/certs/server.p12 differ
diff --git a/certs/server.pem b/certs/server.pem
index 708efeea89b..ca1b44cb78f 100644
--- a/certs/server.pem
+++ b/certs/server.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-MIIEyDCCA7CgAwIBAgIJAKT4o5VXt+JLMA0GCSqGSIb3DQEBCwUAMIGLMRUwEwYD
-VQQDDAxJY2UgVGVzdHMgQ0ExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0Ms
-IEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNV
-BAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0yMDA0MjIx
-NTAyMjJaFw0yMjA3MjYxNTAyMjJaMIGIMRIwEAYDVQQDDAkxMjcuMC4wLjExDDAK
-BgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0
-ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkB
-Fg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALwjVlaEufra2Wdgxh4maufYtD9bxW2ngLJ9tD5pCVGvWS+pJsSxc7PUyyOr0S0z
-XGM30r59j3+xhDTaWSOOG9ZlMtbHIOu9GjQz1EvUyRF1Ad6gFb056KAPO01kpKCn
-1Xs7l+FDlJ97/IZ6YbIRlsT/MCy7IFWYzjCiLyRINQVl0mbiASE7K9x/jBDpUCFE
-1V/b5mKtlNeO2wyaAX+K35ONBbzhftoBcF04eYfBXsmZOUgaewIpzj+tC87tCLAA
-ZaYjhMuafrU0HV2/1KC3tBbh8aoG7fyibFJ83T6C24HIBrpCEZuUo9ooeeD7GbJG
-6BKJ5HFjWFszNDqIb+JCNKMCAwEAAaOCAS4wggEqMB0GA1UdDgQWBBR9x4IcOrrC
-AHyErd/qEKLkq4FK8TCBwAYDVR0jBIG4MIG1gBTs7pvN5jAgGHmVuwHYVKzwO50+
-r6GBkaSBjjCBizEVMBMGA1UEAwwMSWNlIFRlc3RzIENBMQwwCgYDVQQLDANJY2Ux
-FDASBgNVBAoMC1plcm9DLCBJbmMuMRAwDgYDVQQHDAdKdXBpdGVyMRAwDgYDVQQI
-DAdGbG9yaWRhMQswCQYDVQQGEwJVUzEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJv
-Yy5jb22CCQCzmArra/BL1DALBgNVHQ8EBAMCBeAwGgYDVR0RBBMwEYcEfwAAAYIJ
-bG9jYWxob3N0MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG
-9w0BAQsFAAOCAQEAtfWm504s1xhWQ95tMFHRzaecLZTyUNH+zxzAJxVp+7/SAWad
-FkwXlYfH1zASKyUfHXZN0W8GjLPeX3LT9xVF3OikTm5ZK4tjGKWfKuZk60Ah+LOL
-kyO64wLVmmwAyTrLeZvzTedIXkpKHlDjFwMxYj6n/16lD8IkKNN8jHfI5bt/VY3p
-ETjVZUcY2qEHexv3yeB4Siu4OHwytUZlQMfX2buDk9dYVbG36MDibz2m7smGBRS6
-q0HYVrin60b9hn6n/tfc+OScyXpW4Yimcnxm9FQCpqcajx2XM6i2IA2WPs9kWkAx
-38tpEZ6APsPH+FPpsIE/wF3kAjMKjK+vKOIoRw==
+MIIExjCCA66gAwIBAgIICIqPq5Tox3swDQYJKoZIhvcNAQELBQAwgYsxFTATBgNV
+BAMMDEljZSBUZXN0cyBDQTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywg
+SW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UE
+BhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTIyMDcyNzEx
+MzIxOFoXDTI0MTAyOTExMzIxOFowgYgxEjAQBgNVBAMMCTEyNy4wLjAuMTEMMAoG
+A1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UEBwwHSnVwaXRl
+cjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEW
+DmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+t9yRk/tf1VBy4NOyf546bsc6VVkp2qLMCuJUE8nB7SCOLVMXsXZS5WWVr7P2juDa
+HPisBE1eEcUpEvBgFt7KQ4VvbcIKwP/5j/Z1vmT5TTk+EH4ryAlItjaEQpDQJNiu
+arymConMZfMu+bJ99D41OChrNzSw5Q/zOg1jTchcv9d9aNE6Jfe5bMKAsSjH1PW3
+VKIUGlv7taw4jbwueuAMX9Q8tKk0z/DffJfQ83EJK2y/MVLCLsN/iZh1d2psC2NB
+/0u1lOJPg7xPUy4KtIhnoBH+upT9HaT56AxCEEt83ezy/dhksrsutYlNMUSRIRse
+H8W9Y0jjt11Ocn1ZgSWr7wIDAQABo4IBLTCCASkwHQYDVR0OBBYEFHxebATdX527
+y0pGKgeWQ40uMkgFMIG/BgNVHSMEgbcwgbSAFB+wq3bv2IZZankNFgoX1/1v8XX5
+oYGRpIGOMIGLMRUwEwYDVQQDDAxJY2UgVGVzdHMgQ0ExDDAKBgNVBAsMA0ljZTEU
+MBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgM
+B0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9j
+LmNvbYIIUmyVFUPQ9f0wCwYDVR0PBAQDAgXgMBoGA1UdEQQTMBGHBH8AAAGCCWxv
+Y2FsaG9zdDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDQYJKoZIhvcN
+AQELBQADggEBAJHUGjzNU91OK2ZUdVZPgYOF9i4odGeZ9N8SefRMl/3/Uefj7Kkx
+BXZbP1FEKMts9QBAfit0OktmJltxB5+DyARAS6zRH4t0c/wmUm5ml/OOza297aAl
+hvW/Q1QlB6WKRMCH9F7AUyRz9uFiaM1cYsZ/I/SltoPCguESZcjqFDZ8fblNcdur
+v/c6QECje4YDjZ53vxEjfYtDBpFBG6GQPXBF5BZN47F6Iu/W+kS/OQatkR/8hhEh
+CjvZb3AXSr9f9V+uRm9c6yeHz2mfp9jFHIPhCJrYpkPQfSJ2pZfyiD1tzwvOyw5K
+x+P/Keu4P/M4IZLHdQiYgSbV9lFe04z5cBo=
 -----END CERTIFICATE-----
diff --git a/java/test/android/controller/src/main/res/raw/client.bks b/java/test/android/controller/src/main/res/raw/client.bks
index 24f948f9568..9b27535f405 100644
Binary files a/java/test/android/controller/src/main/res/raw/client.bks and b/java/test/android/controller/src/main/res/raw/client.bks differ
diff --git a/java/test/android/controller/src/main/res/raw/server.bks b/java/test/android/controller/src/main/res/raw/server.bks
index 532b49b840b..7b3a17cc346 100644
Binary files a/java/test/android/controller/src/main/res/raw/server.bks and b/java/test/android/controller/src/main/res/raw/server.bks differ