Skip to content

OpenPGPKey.getSecretKeys(): Preserve order of keys #2183

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+4 −5
Open

OpenPGPKey.getSecretKeys(): Preserve order of keys #2183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a88fed
OpenPGPKey.getSecretKeys(): Preserve order of keys
vanitasvitae Oct 21, 2025
7592e7e
OpenPGPCertificate.getPublicKeys(): Preserve order of items
vanitasvitae Oct 21, 2025
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
3 changes: 1 addition & 2 deletions pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPCertificate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
Expand Down Expand Up @@ -183,7 +182,7 @@ public List<OpenPGPUserId> getValidUserIds(Date evaluationTime)
*/
public Map<KeyIdentifier, OpenPGPComponentKey> getPublicKeys()
{
Map<KeyIdentifier, OpenPGPComponentKey> keys = new HashMap<KeyIdentifier, OpenPGPComponentKey>();
Map<KeyIdentifier, OpenPGPComponentKey> keys = new LinkedHashMap<KeyIdentifier, OpenPGPComponentKey>();
keys.put(primaryKey.getKeyIdentifier(), primaryKey);
keys.putAll(subkeys);
return keys;
Expand Down
6 changes: 3 additions & 3 deletions pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPKey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;

Expand Down Expand Up @@ -74,7 +74,7 @@ public OpenPGPKey(PGPSecretKeyRing keyRing, OpenPGPImplementation implementation
super(keyRing, implementation, policy);

// Process and map secret keys
this.secretKeys = new HashMap<KeyIdentifier, OpenPGPSecretKey>();
this.secretKeys = new LinkedHashMap<KeyIdentifier, OpenPGPSecretKey>();
for (Iterator it = getKeys().iterator(); it.hasNext(); )
{
OpenPGPComponentKey key = (OpenPGPComponentKey)it.next();
Expand Down Expand Up @@ -147,7 +147,7 @@ public OpenPGPSecretKey getPrimarySecretKey()
*/
public Map<KeyIdentifier, OpenPGPSecretKey> getSecretKeys()
{
return new HashMap<KeyIdentifier, OpenPGPSecretKey>(secretKeys);
return new LinkedHashMap<KeyIdentifier, OpenPGPSecretKey>(secretKeys);
}

/**
Expand Down