Skip to content

Commit

Permalink
Update SEReferenceImplementation.java
Browse files Browse the repository at this point in the history
  • Loading branch information
@cyberphone
cyberphone committed Apr 11, 2019
1 parent 7a5e06e commit abb0cb7
Showing 1 changed file with 43 additions and 36 deletions.
79 changes: 43 additions & 36 deletions library/test/org/webpki/sks/twolayer/se/SEReferenceImplementation.java
View file
Expand Up @@ -502,25 +502,25 @@ static Algorithm addAlgorithm(String uri, String jceName, int mask) {

static final byte[] USER_KEY_INTEGRITY = {'I', 'n', 't', 'e', 'g', 'r', 'i', 't', 'y'};

static byte[] userKey_wrapper_secret;
static byte[] userKeyWrapperSecret;

static {
try {
MacBuilder macBuilder = new MacBuilder(SE_MASTER_SECRET);
macBuilder.addVerbatim(USER_KEY_ENCRYPTION);
userKey_wrapper_secret = macBuilder.getResult();
userKeyWrapperSecret = macBuilder.getResult();
} catch (GeneralSecurityException e) {
throw new RuntimeException(e);
}
}

static byte[] sessionKey_wrapper_secret;
static byte[] sessionKeyWrapperSecret;

static {
try {
MacBuilder macBuilder = new MacBuilder(SE_MASTER_SECRET);
macBuilder.addVerbatim(SESSION_KEY_ENCRYPTION);
sessionKey_wrapper_secret = macBuilder.getResult();
sessionKeyWrapperSecret = macBuilder.getResult();
} catch (GeneralSecurityException e) {
throw new RuntimeException(e);
}
Expand Down Expand Up @@ -617,13 +617,13 @@ private byte[] createMAC(byte[] osInstanceKey) throws GeneralSecurityException {
}

byte[] writeKey(byte[] osInstanceKey) throws IOException, GeneralSecurityException {
ByteWriter byte_writer = new ByteWriter();
byte_writer.writeArray(wrappedKey);
byte_writer.writeBoolean(isSymmetric);
byte_writer.writeBoolean(isExportable);
byte_writer.writeArray(sha256OfPublicKeyOrCertificate);
byte_writer.writeArray(createMAC(osInstanceKey));
return byte_writer.getData();
ByteWriter byteWriter = new ByteWriter();
byteWriter.writeArray(wrappedKey);
byteWriter.writeBoolean(isSymmetric);
byteWriter.writeBoolean(isExportable);
byteWriter.writeArray(sha256OfPublicKeyOrCertificate);
byteWriter.writeArray(createMAC(osInstanceKey));
return byteWriter.getData();
}

void readKey(byte[] osInstanceKey, byte[] sealedKey) throws IOException, GeneralSecurityException {
Expand Down Expand Up @@ -660,11 +660,11 @@ public void readKey(byte[] provisioningState) throws IOException {
}

byte[] writeKey() throws IOException {
ByteWriter byte_writer = new ByteWriter();
byte_writer.writeArray(wrappedSessionKey);
byte_writer.writeShort(macSequenceCounter);
byte_writer.writeShort(sessionKeyLimit);
return byte_writer.getData();
ByteWriter byteWriter = new ByteWriter();
byteWriter.writeArray(wrappedSessionKey);
byteWriter.writeShort(macSequenceCounter);
byteWriter.writeShort(sessionKeyLimit);
return byteWriter.getData();
}
}

Expand All @@ -688,7 +688,7 @@ static UnwrappedKey getUnwrappedKey(byte[] osInstanceKey, byte[] sealedKey) thro
unwrappedKey.readKey(osInstanceKey, sealedKey);
byte[] data = unwrappedKey.wrappedKey;
Cipher crypt = Cipher.getInstance("AES/CBC/PKCS5Padding");
crypt.init(Cipher.DECRYPT_MODE, new SecretKeySpec(deriveKey(osInstanceKey, userKey_wrapper_secret), "AES"), new IvParameterSpec(data, 0, 16));
crypt.init(Cipher.DECRYPT_MODE, new SecretKeySpec(deriveKey(osInstanceKey, userKeyWrapperSecret), "AES"), new IvParameterSpec(data, 0, 16));
byte[] rawKey = crypt.doFinal(data, 16, data.length - 16);
if (unwrappedKey.isSymmetric) {
unwrappedKey.symmetricKey = rawKey;
Expand All @@ -703,7 +703,7 @@ static byte[] wrapKey(byte[] osInstanceKey, UnwrappedKey unwrappedKey, byte[] ra
byte[] iv = new byte[16];
new SecureRandom().nextBytes(iv);
crypt.init(Cipher.ENCRYPT_MODE,
new SecretKeySpec(deriveKey(osInstanceKey, userKey_wrapper_secret), "AES"),
new SecretKeySpec(deriveKey(osInstanceKey, userKeyWrapperSecret), "AES"),
new IvParameterSpec(iv));
unwrappedKey.wrappedKey = addArrays(iv, crypt.doFinal(rawKey));
return unwrappedKey.writeKey(osInstanceKey);
Expand All @@ -716,7 +716,7 @@ static UnwrappedSessionKey getUnwrappedSessionKey(byte[] osInstanceKey, byte[] p
byte[] data = unwrappedSessionKey.wrappedSessionKey;
Cipher crypt = Cipher.getInstance("AES/CBC/PKCS5Padding");
crypt.init(Cipher.DECRYPT_MODE,
new SecretKeySpec(deriveKey(osInstanceKey, sessionKey_wrapper_secret), "AES"),
new SecretKeySpec(deriveKey(osInstanceKey, sessionKeyWrapperSecret), "AES"),
new IvParameterSpec(data, 0, 16));
unwrappedSessionKey.sessionKey = crypt.doFinal(data, 16, data.length - 16);
return unwrappedSessionKey;
Expand All @@ -727,28 +727,33 @@ static byte[] wrapSessionKey(byte[] osInstanceKey, UnwrappedSessionKey unwrapped
Cipher crypt = Cipher.getInstance("AES/CBC/PKCS5Padding");
byte[] iv = new byte[16];
new SecureRandom().nextBytes(iv);
crypt.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(deriveKey(osInstanceKey, sessionKey_wrapper_secret), "AES"), new IvParameterSpec(iv));
crypt.init(Cipher.ENCRYPT_MODE,
new SecretKeySpec(deriveKey(osInstanceKey, sessionKeyWrapperSecret), "AES"),
new IvParameterSpec(iv));
unwrappedSessionKey.wrappedSessionKey = addArrays(iv, crypt.doFinal(rawKey));
unwrappedSessionKey.sessionKeyLimit = sessionKeyLimit;
return unwrappedSessionKey.writeKey();
}

static KeyStore getAttestationKeyStore() throws IOException, GeneralSecurityException {
KeyStore ks = KeyStore.getInstance("JKS");
ks.load(SEReferenceImplementation.class.getResourceAsStream("attestationkeystore.jks"), ATTESTATION_KEY_PASSWORD);
ks.load(SEReferenceImplementation.class.getResourceAsStream("attestationkeystore.jks"),
ATTESTATION_KEY_PASSWORD);
return ks;
}

static X509Certificate[] getDeviceCertificatePath() throws IOException, GeneralSecurityException {
return new X509Certificate[]{(X509Certificate) getAttestationKeyStore().getCertificate(ATTESTATION_KEY_ALIAS)};
return new X509Certificate[]{(X509Certificate) getAttestationKeyStore()
.getCertificate(ATTESTATION_KEY_ALIAS)};
}

static byte[] getDeviceID(boolean privacyEnabled) throws IOException, GeneralSecurityException {
return privacyEnabled ? SecureKeyStore.KDF_ANONYMOUS : getDeviceCertificatePath()[0].getEncoded();
}

static PrivateKey getAttestationKey() throws IOException, GeneralSecurityException {
return (PrivateKey) getAttestationKeyStore().getKey(ATTESTATION_KEY_ALIAS, ATTESTATION_KEY_PASSWORD);
return (PrivateKey) getAttestationKeyStore()
.getKey(ATTESTATION_KEY_ALIAS, ATTESTATION_KEY_PASSWORD);
}

static int getShort(byte[] buffer, int index) {
Expand All @@ -767,7 +772,7 @@ static void abort(Exception e) {
throw new SKSException(e, SKSException.ERROR_CRYPTO);
}

static void checkIDSyntax(String identifier, String symbolic_name) {
static void checkIDSyntax(String identifier, String symbolicName) {
boolean flag = false;
if (identifier.length() == 0 || identifier.length() > SecureKeyStore.MAX_LENGTH_ID_TYPE) {
flag = true;
Expand All @@ -781,7 +786,7 @@ static void checkIDSyntax(String identifier, String symbolic_name) {
}
}
if (flag) {
abort("Malformed \"" + symbolic_name + "\" : " + identifier);
abort("Malformed \"" + symbolicName + "\" : " + identifier);
}
}

Expand Down Expand Up @@ -907,8 +912,9 @@ static class AttestationSignatureGenerator {

AttestationSignatureGenerator() throws IOException, GeneralSecurityException {
PrivateKey attester = getAttestationKey();
signer = new SignatureWrapper(attester instanceof RSAPrivateKey ? "SHA256withRSA" : "SHA256withECDSA",
attester);
signer = new SignatureWrapper(attester instanceof RSAPrivateKey ?
"SHA256withRSA" : "SHA256withECDSA",
attester);
}

private byte[] short2bytes(int s) {
Expand Down Expand Up @@ -991,7 +997,8 @@ static boolean verifyKeyManagementKeyAuthorization(PublicKey keyManagementKey,
byte[] kmkKdf,
byte[] argument,
byte[] authorization) throws GeneralSecurityException {
return new SignatureWrapper(keyManagementKey instanceof RSAPublicKey ? "SHA256WithRSA" : "SHA256WithECDSA",
return new SignatureWrapper(keyManagementKey instanceof RSAPublicKey ?
"SHA256WithRSA" : "SHA256WithECDSA",
keyManagementKey)
.update(kmkKdf)
.update(argument)
Expand Down Expand Up @@ -1190,14 +1197,14 @@ public static SEVoidData checkKeyPair(byte[] osInstanceKey,
abort("RSA mismatch between public and private keys for: " + id);
}
} else {
Signature ec_signer = Signature.getInstance("SHA256withECDSA");
ec_signer.initSign(unwrappedKey.privateKey);
ec_signer.update(RSA_ENCRYPTION_OID); // Any data could be used...
byte[] ec_signData = ec_signer.sign();
Signature ec_verifier = Signature.getInstance("SHA256withECDSA");
ec_verifier.initVerify(publicKey);
ec_verifier.update(RSA_ENCRYPTION_OID);
if (!ec_verifier.verify(ec_signData)) {
Signature ecSigner = Signature.getInstance("SHA256withECDSA");
ecSigner.initSign(unwrappedKey.privateKey);
ecSigner.update(RSA_ENCRYPTION_OID); // Any data could be used...
byte[] ec_signData = ecSigner.sign();
Signature ecVerifier = Signature.getInstance("SHA256withECDSA");
ecVerifier.initVerify(publicKey);
ecVerifier.update(RSA_ENCRYPTION_OID);
if (!ecVerifier.verify(ec_signData)) {
abort("EC mismatch between public and private keys for: " + id);
}
}
Expand Down

0 comments on commit abb0cb7

Please sign in to comment.