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

Jump to bottom

Support exporting plain SecretKey in FIPS mode #622

Merged
merged 1 commit into from
Jun 28, 2023
Merged

Support exporting plain SecretKey in FIPS mode #622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 41 additions & 0 deletions src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,24 @@ static SecretKey secretKey(Session session, long keyID, String algorithm,
new CK_ATTRIBUTE(CKA_SENSITIVE),
new CK_ATTRIBUTE(CKA_EXTRACTABLE),
});

if ((SunPKCS11.mysunpkcs11 != null) && !SunPKCS11.isExportWrapKey.get()
&& ("AES".equals(algorithm) || "TripleDES".equals(algorithm))
) {
if (attrs[0].getBoolean() || attrs[1].getBoolean() || (attrs[2].getBoolean() == false)) {
try {
byte[] key = SunPKCS11.mysunpkcs11.exportKey(session.id(), attrs, keyID);
SecretKey secretKey = new SecretKeySpec(key, algorithm);
return new P11SecretKeyFIPS(session, keyID, algorithm, keyLength, attrs, secretKey);
} catch (PKCS11Exception e) {
// Attempt failed, create a P11SecretKey object.
if (debug != null) {
debug.println("Attempt failed, creating a SecretKey object for " + algorithm);
}
}
}
}

return new P11SecretKey(session, keyID, algorithm, keyLength, attrs);
}

Expand Down Expand Up @@ -480,6 +498,29 @@ byte[] getEncodedInternal() {
}
}

private static final class P11SecretKeyFIPS extends P11Key implements SecretKey {
@Serial
private static final long serialVersionUID = -9186806495402041696L;
private final SecretKey key;

P11SecretKeyFIPS(Session session, long keyID, String algorithm,
int keyLength, CK_ATTRIBUTE[] attributes, SecretKey key) {
super(SECRET, session, keyID, algorithm, keyLength, attributes);
this.key = key;
}

@Override
public String getFormat() {
return "RAW";
}

@Override
byte[] getEncodedInternal() {
return key.getEncoded();
}

}

private static class P11SecretKey extends P11Key implements SecretKey {
@Serial
private static final long serialVersionUID = -7828241727014329084L;
Expand Down
4 changes: 4 additions & 0 deletions src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@ public final class SunPKCS11 extends AuthProvider {
// FIPS mode.
static SunPKCS11 mysunpkcs11;

static final ThreadLocal<Boolean> isExportWrapKey = ThreadLocal.withInitial(() -> Boolean.FALSE);

Token getToken() {
return token;
}
Expand Down Expand Up @@ -506,10 +508,12 @@ byte[] exportKey(long hSession, CK_ATTRIBUTE[] attributes, long keyId) throws PK

try {
long genKeyId = token.p11.C_GenerateKey(wrapKeyGenSession.id(), new CK_MECHANISM(CKM_AES_KEY_GEN), wrapKeyAttributes);
isExportWrapKey.set(Boolean.TRUE);
wrapKey = (P11Key)P11Key.secretKey(wrapKeyGenSession, genKeyId, "AES", 256 >> 3, null);
} catch (PKCS11Exception e) {
throw e;
} finally {
isExportWrapKey.set(Boolean.FALSE);
token.releaseSession(wrapKeyGenSession);
}

Expand Down