Skip to content

RH2173781: Avoid calling C_GetInfo() too early, before cryptoki is initialized #26

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

Merged
merged 2 commits into from
Apr 12, 2023
Merged

RH2173781: Avoid calling C_GetInfo() too early, before cryptoki is initialized #26

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
e10d570
Avoid calling C_GetInfo() too early, before cryptoki is initialized
fridrich Feb 10, 2023
658f03f
RH2173781: C_GetInfo can throw an exception if called before initiali…
martinuy Feb 28, 2023
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
8 changes: 5 additions & 3 deletions src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,11 @@ static P11Key derivePBEKey(Token token, PBEKeySpec keySpec, String algo)
}

if (kdfData.kdfMech == CKM_PKCS5_PBKD2) {
CK_VERSION p11Ver = token.p11.getInfo().cryptokiVersion;
if (P11Util.isNSS(token) || p11Ver.major < 2 ||
p11Ver.major == 2 && p11Ver.minor < 40) {
CK_INFO p11Info = token.p11.getInfo();
CK_VERSION p11Ver = (p11Info != null ? p11Info.cryptokiVersion
: null);
if (P11Util.isNSS(token) || p11Ver != null && (p11Ver.major <
2 || p11Ver.major == 2 && p11Ver.minor < 40)) {
// NSS keeps using the old structure beyond PKCS #11 v2.40
ckMech = new CK_MECHANISM(kdfData.kdfMech,
new CK_PKCS5_PBKD2_PARAMS(password, salt,
Expand Down
19 changes: 16 additions & 3 deletions src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public static void loadNative() {

private long pNativeData;

private CK_INFO pInfo;
private volatile CK_INFO pInfo;

/**
* This method does the initialization of the native library. It is called
Expand Down Expand Up @@ -153,7 +153,6 @@ public static void loadNative() {
throws IOException, PKCS11Exception {
connect(pkcs11ModulePath, functionListName);
this.pkcs11ModulePath = pkcs11ModulePath;
pInfo = C_GetInfo();
}

/*
Expand Down Expand Up @@ -215,7 +214,21 @@ public static synchronized PKCS11 getInstance(String pkcs11ModulePath,
* C_GetInfo. This structure represent Cryptoki library information.
*/
public CK_INFO getInfo() {
return pInfo;
CK_INFO lPInfo = pInfo;
if (lPInfo == null) {
synchronized (this) {
lPInfo = pInfo;
if (lPInfo == null) {
try {
lPInfo = C_GetInfo();
pInfo = lPInfo;
} catch (PKCS11Exception e) {
// Some PKCS #11 tokens require initialization first.
}
}
}
}
return lPInfo;
}

/**
Expand Down