Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: move public.pfx to correct subdirectory #16444

Merged
merged 3 commits into from
Nov 6, 2024
Merged

fix: move public.pfx to correct subdirectory #16444

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ec017b
fix: move `public.pfx` to correct subdirectory
edward-swirldslabs Nov 5, 2024
3201306
Merge branch 'develop' into 16439-fix-migration-public-pfx-file-to-co…
edward-swirldslabs Nov 6, 2024
b2db986
Merge branch 'develop' into 16439-fix-migration-public-pfx-file-to-co…
edward-swirldslabs Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...irlds-platform-core/src/main/java/com/swirlds/platform/crypto/EnhancedKeyStoreLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,8 @@ public EnhancedKeyStoreLoader scan() throws KeyLoadingException, KeyStoreExcepti
}

/**
* Iterates over the local nodes and creates the agreement key and certificate for each. This
* method should be called after {@link #scan()} and before {@link #verify()}.
* Iterates over the local nodes and creates the agreement key and certificate for each. This method should be
* called after {@link #scan()} and before {@link #verify()}.
*
* @return this {@link EnhancedKeyStoreLoader} instance.
* @throws NoSuchAlgorithmException if the algorithm required to generate the key pair is not available.
Expand Down Expand Up @@ -1476,7 +1476,7 @@ private void cleanupByMovingPfxFilesToSubDirectory() throws KeyStoreException, K
if (sPublicPfx.exists()
&& sPublicPfx.isFile()
&& !sPublicPfx.renameTo(
pfxArchiveDirectory.resolve(sPublicPfx.getName()).toFile())) {
pfxDateDirectory.resolve(sPublicPfx.getName()).toFile())) {
edward-swirldslabs marked this conversation as resolved.
Show resolved Hide resolved
cleanupErrorCount.incrementAndGet();
}
if (cleanupErrorCount.get() > 0) {
Expand Down
Loading