mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-28 15:24:43 +02:00
8225181: KeyStore should have a getAttributes method
Reviewed-by: mullan
This commit is contained in:
parent
38f525e96e
commit
a729a70c01
6 changed files with 169 additions and 2 deletions
|
@ -1307,6 +1307,15 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
|
|||
stream.flush();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<KeyStore.Entry.Attribute> engineGetAttributes(String alias) {
|
||||
if (!engineContainsAlias(alias)) {
|
||||
return super.engineGetAttributes(alias);
|
||||
}
|
||||
Entry entry = entries.get(alias.toLowerCase(Locale.ENGLISH));
|
||||
return getAttributes(entry);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets a <code>KeyStore.Entry</code> for the specified alias
|
||||
* with the specified protection parameter.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
|
@ -236,6 +236,28 @@ abstract class DomainKeyStore extends KeyStoreSpi {
|
|||
return date;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<KeyStore.Entry.Attribute> engineGetAttributes(String alias) {
|
||||
|
||||
AbstractMap.SimpleEntry<String, Collection<KeyStore>> pair =
|
||||
getKeystoresForReading(alias);
|
||||
Set<KeyStore.Entry.Attribute> result = Collections.emptySet();
|
||||
|
||||
try {
|
||||
String entryAlias = pair.getKey();
|
||||
for (KeyStore keystore : pair.getValue()) {
|
||||
result = keystore.getAttributes(entryAlias);
|
||||
if (result != null) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
} catch (KeyStoreException e) {
|
||||
throw new IllegalStateException(e);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Assigns the given private key to the given alias, protecting
|
||||
* it with the given password as defined in PKCS8.
|
||||
|
|
|
@ -129,6 +129,11 @@ public class KeyStoreDelegator extends KeyStoreSpi {
|
|||
keystore.engineDeleteEntry(alias);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<KeyStore.Entry.Attribute> engineGetAttributes(String alias) {
|
||||
return keystore.engineGetAttributes(alias);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Enumeration<String> engineAliases() {
|
||||
return keystore.engineAliases();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue