[FAB-8451] Fixing certificates close to expire

This change-set regenerates the certitificates under fabric-sdk-java/cacerts. The close to expire certificates under /src/test/fixture/sdkintegration/e2e-2Orgs/tls seems not used. Change-Id: I32e9161836d9e4def55703d24309aed908864717 Signed-off-by: Angelo De Caro <adc@zurich.ibm.com> Signed-off-by: Saad Karim <skarim@us.ibm.com>
hyperledger · Feb 23, 2018 · cd93543 · cd93543
1 parent a44c2aa
commit cd93543
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 60 deletions.
diff --git a/cacerts/admincert.pem b/cacerts/admincert.pem
diff --git a/cacerts/cacert.pem b/cacerts/cacert.pem
diff --git a/src/test/java/org/hyperledger/fabric/sdk/security/CryptoPrimitivesTest.java b/src/test/java/org/hyperledger/fabric/sdk/security/CryptoPrimitivesTest.java
@@ -419,35 +419,6 @@ public void testLoadCACertsBytesBadInput() throws CryptoException {
         crypto.loadCACertificatesAsBytes(null);
     }
 
-    @Test
-    public void testLoadCACerts() {
-        try {
-            File certsFolder = new File("cacerts").getAbsoluteFile();
-            Collection<File> certFiles = FileUtils.listFiles(certsFolder, new String[] {"pem"}, false);
-            int numFiles = certFiles.size();
-            int numStore = crypto.getTrustStore().size();
-
-            BufferedInputStream bis;
-            ArrayList<byte[]> certBytesList = new ArrayList<>();
-            ArrayList<String> certIDs = new ArrayList<>();
-            byte[] certB;
-            for (File certFile : certFiles) {
-                certB = IOUtils.toByteArray(new FileInputStream(certFile));
-                certBytesList.add(certB);
-                bis = new BufferedInputStream(new ByteArrayInputStream(certB));
-                certIDs.add(Integer.toString(cf.generateCertificate(bis).hashCode()));
-            }
-            crypto.loadCACertificatesAsBytes(certBytesList);
-            assertEquals(crypto.getTrustStore().size(), numStore + numFiles);
-            for (String cID : certIDs) {
-                assertTrue(crypto.getTrustStore().containsAlias(cID));
-            }
-        } catch (KeyStoreException | CryptoException | IOException | CertificateException e) {
-            fail("testLoadCACerts should not have thrown exception. Error: " + e.getMessage());
-            e.printStackTrace();
-        }
-    }
-
     @Test
     public void testValidateNullCertificateByteArray() {
         assertFalse(crypto.validateCertificate((byte[]) null));