Skip to content
This repository was archived by the owner on Apr 22, 2025. It is now read-only.

Commit cd93543

Browse files
adecaroSaad Karim
authored andcommitted
[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>
1 parent a44c2aa commit cd93543

File tree

3 files changed

+0
-60
lines changed

3 files changed

+0
-60
lines changed

cacerts/admincert.pem

Lines changed: 0 additions & 16 deletions
This file was deleted.

cacerts/cacert.pem

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/test/java/org/hyperledger/fabric/sdk/security/CryptoPrimitivesTest.java

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -419,35 +419,6 @@ public void testLoadCACertsBytesBadInput() throws CryptoException {
419419
crypto.loadCACertificatesAsBytes(null);
420420
}
421421

422-
@Test
423-
public void testLoadCACerts() {
424-
try {
425-
File certsFolder = new File("cacerts").getAbsoluteFile();
426-
Collection<File> certFiles = FileUtils.listFiles(certsFolder, new String[] {"pem"}, false);
427-
int numFiles = certFiles.size();
428-
int numStore = crypto.getTrustStore().size();
429-
430-
BufferedInputStream bis;
431-
ArrayList<byte[]> certBytesList = new ArrayList<>();
432-
ArrayList<String> certIDs = new ArrayList<>();
433-
byte[] certB;
434-
for (File certFile : certFiles) {
435-
certB = IOUtils.toByteArray(new FileInputStream(certFile));
436-
certBytesList.add(certB);
437-
bis = new BufferedInputStream(new ByteArrayInputStream(certB));
438-
certIDs.add(Integer.toString(cf.generateCertificate(bis).hashCode()));
439-
}
440-
crypto.loadCACertificatesAsBytes(certBytesList);
441-
assertEquals(crypto.getTrustStore().size(), numStore + numFiles);
442-
for (String cID : certIDs) {
443-
assertTrue(crypto.getTrustStore().containsAlias(cID));
444-
}
445-
} catch (KeyStoreException | CryptoException | IOException | CertificateException e) {
446-
fail("testLoadCACerts should not have thrown exception. Error: " + e.getMessage());
447-
e.printStackTrace();
448-
}
449-
}
450-
451422
@Test
452423
public void testValidateNullCertificateByteArray() {
453424
assertFalse(crypto.validateCertificate((byte[]) null));

0 commit comments

Comments
 (0)