Skip to content
This repository has been archived by the owner on Sep 2, 2022. It is now read-only.


Browse files Browse the repository at this point in the history
8278744: KeyStore:getAttributes() not returning unmodifiable Set
Reviewed-by: mullan
  • Loading branch information
wangweij committed Dec 14, 2021
1 parent 475ec8e commit 0cc989b
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 1 deletion.
Expand Up @@ -1313,7 +1313,7 @@ public Set<KeyStore.Entry.Attribute> engineGetAttributes(String alias) {
return super.engineGetAttributes(alias);
Entry entry = entries.get(alias.toLowerCase(Locale.ENGLISH));
return getAttributes(entry);
return Collections.unmodifiableSet(new HashSet<>(getAttributes(entry)));

Expand Down
64 changes: 64 additions & 0 deletions test/jdk/java/security/KeyStore/PKCS12/
@@ -0,0 +1,64 @@
* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit if you need additional information or have any
* questions.

* @test
* @bug 8278744
* @summary KeyStore:getAttributes() not returning unmodifiable Set
* @library /test/lib

import jdk.test.lib.SecurityTools;
import jdk.test.lib.Utils;


public class UnmodifiableAttributes {
public static final void main(String[] args) throws Exception {

var oneAttr = new KeyStore.Entry.Attribute() {
public String getName() {
return "1.2.3";

public String getValue() {
return "testVal";
char[] pass = "changeit".toCharArray();

SecurityTools.keytool("-keystore ks -storepass changeit -genkeypair -alias a -dname CN=A -keyalg EC")

KeyStore ks = KeyStore.getInstance(new File("ks"), pass);

var attrs = ks.getAttributes("a");
Utils.runAndCheckException(() -> attrs.add(oneAttr), UnsupportedOperationException.class);

var attrs2 = ks.getEntry("a", new KeyStore.PasswordProtection(pass)).getAttributes();
Utils.runAndCheckException(() -> attrs2.add(oneAttr), UnsupportedOperationException.class);

1 comment on commit 0cc989b

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.