Skip to content

Commit

Permalink
Revert "Swap the order of synthetic password wrapping"
Browse files Browse the repository at this point in the history 
* To be reverted.

This reverts commit 926c144.
  • Loading branch information
@neobuddy89
neobuddy89 committed Feb 12, 2018
1 parent 31ea6ba commit 0a431cf
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 38 deletions.
21 changes: 4 additions & 17 deletions services/core/java/com/android/server/locksettings/SyntheticPasswordCrypto.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,28 +112,14 @@ public static byte[] decrypt(byte[] keyBytes, byte[] personalisation, byte[] cip
}
}

public static byte[] decryptBlobV1(String keyAlias, byte[] blob, byte[] applicationId) {
public static byte[] decryptBlob(String keyAlias, byte[] blob, byte[] applicationId) {
try {
KeyStore keyStore = KeyStore.getInstance("AndroidKeyStore");
keyStore.load(null);

SecretKey decryptionKey = (SecretKey) keyStore.getKey(keyAlias, null);
byte[] intermediate = decrypt(applicationId, APPLICATION_ID_PERSONALIZATION, blob);
return decrypt(decryptionKey, intermediate);
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("Failed to decrypt blob", e);
}
}

public static byte[] decryptBlob(String keyAlias, byte[] blob, byte[] applicationId) {
try {
KeyStore keyStore = KeyStore.getInstance("AndroidKeyStore");
keyStore.load(null);

SecretKey decryptionKey = (SecretKey) keyStore.getKey(keyAlias, null);
byte[] intermediate = decrypt(decryptionKey, blob);
return decrypt(applicationId, APPLICATION_ID_PERSONALIZATION, intermediate);
} catch (CertificateException | IOException | BadPaddingException
| IllegalBlockSizeException
| KeyStoreException | NoSuchPaddingException | NoSuchAlgorithmException
Expand Down Expand Up @@ -164,8 +150,9 @@ public static byte[] createBlob(String keyAlias, byte[] data, byte[] application
keyStore.setEntry(keyAlias,
new KeyStore.SecretKeyEntry(secretKey),
builder.build());
byte[] intermediate = encrypt(applicationId, APPLICATION_ID_PERSONALIZATION, data);
return encrypt(secretKey, intermediate);
byte[] intermediate = encrypt(secretKey, data);
return encrypt(applicationId, APPLICATION_ID_PERSONALIZATION, intermediate);

} catch (CertificateException | IOException | BadPaddingException
| IllegalBlockSizeException
| KeyStoreException | NoSuchPaddingException | NoSuchAlgorithmException
Expand Down
27 changes: 6 additions & 21 deletions services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,7 @@ public class SyntheticPasswordManager {
private static final byte WEAVER_VERSION = 1;
private static final int INVALID_WEAVER_SLOT = -1;

private static final byte SYNTHETIC_PASSWORD_VERSION_V1 = 1;
private static final byte SYNTHETIC_PASSWORD_VERSION = 2;
private static final byte SYNTHETIC_PASSWORD_VERSION = 1;
private static final byte SYNTHETIC_PASSWORD_PASSWORD_BASED = 0;
private static final byte SYNTHETIC_PASSWORD_TOKEN_BASED = 1;

Expand Down Expand Up @@ -793,7 +792,6 @@ public AuthenticationResult unwrapPasswordBasedSyntheticPassword(IGateKeeperServ
byte[] pwdToken = computePasswordToken(credential, pwd);

final byte[] applicationId;
final long sid;
int weaverSlot = loadWeaverSlot(handle, userId);
if (weaverSlot != INVALID_WEAVER_SLOT) {
// Weaver based user password
Expand All @@ -806,7 +804,6 @@ public AuthenticationResult unwrapPasswordBasedSyntheticPassword(IGateKeeperServ
if (result.gkResponse.getResponseCode() != VerifyCredentialResponse.RESPONSE_OK) {
return result;
}
sid = GateKeeper.INVALID_SECURE_USER_ID;
applicationId = transformUnderWeaverSecret(pwdToken, result.gkResponse.getPayload());
} else {
byte[] gkPwdToken = passwordTokenToGkInput(pwdToken);
Expand Down Expand Up @@ -839,13 +836,12 @@ public AuthenticationResult unwrapPasswordBasedSyntheticPassword(IGateKeeperServ
result.gkResponse = VerifyCredentialResponse.ERROR;
return result;
}
sid = sidFromPasswordHandle(pwd.passwordHandle);
applicationId = transformUnderSecdiscardable(pwdToken,
loadSecdiscardable(handle, userId));
}

result.authToken = unwrapSyntheticPasswordBlob(handle, SYNTHETIC_PASSWORD_PASSWORD_BASED,
applicationId, sid, userId);
applicationId, userId);

// Perform verifyChallenge to refresh auth tokens for GK if user password exists.
result.gkResponse = verifyChallenge(gatekeeper, result.authToken, 0L, userId);
Expand Down Expand Up @@ -881,7 +877,7 @@ public AuthenticationResult unwrapPasswordBasedSyntheticPassword(IGateKeeperServ
}
byte[] applicationId = transformUnderSecdiscardable(token, secdiscardable);
result.authToken = unwrapSyntheticPasswordBlob(handle, SYNTHETIC_PASSWORD_TOKEN_BASED,
applicationId, 0L, userId);
applicationId, userId);
if (result.authToken != null) {
result.gkResponse = verifyChallenge(gatekeeper, result.authToken, 0L, userId);
if (result.gkResponse == null) {
Expand All @@ -896,26 +892,19 @@ public AuthenticationResult unwrapPasswordBasedSyntheticPassword(IGateKeeperServ
}

private AuthenticationToken unwrapSyntheticPasswordBlob(long handle, byte type,
byte[] applicationId, long sid, int userId) {
byte[] applicationId, int userId) {
byte[] blob = loadState(SP_BLOB_NAME, handle, userId);
if (blob == null) {
return null;
}
final byte version = blob[0];
if (version != SYNTHETIC_PASSWORD_VERSION && version != SYNTHETIC_PASSWORD_VERSION_V1) {
if (blob[0] != SYNTHETIC_PASSWORD_VERSION) {
throw new RuntimeException("Unknown blob version");
}
if (blob[1] != type) {
throw new RuntimeException("Invalid blob type");
}
final byte[] secret;
if (version == SYNTHETIC_PASSWORD_VERSION_V1) {
secret = SyntheticPasswordCrypto.decryptBlobV1(getHandleName(handle),
Arrays.copyOfRange(blob, 2, blob.length), applicationId);
} else {
secret = decryptSPBlob(getHandleName(handle),
byte[] secret = decryptSPBlob(getHandleName(handle),
Arrays.copyOfRange(blob, 2, blob.length), applicationId);
}
if (secret == null) {
Log.e(TAG, "Fail to decrypt SP for user " + userId);
return null;
Expand All @@ -930,10 +919,6 @@ private AuthenticationToken unwrapSyntheticPasswordBlob(long handle, byte type,
} else {
result.syntheticPassword = new String(secret);
}
if (version == SYNTHETIC_PASSWORD_VERSION_V1) {
Log.i(TAG, "Upgrade v1 SP blob for user " + userId + ", type = " + type);
createSyntheticPasswordBlob(handle, type, result, applicationId, sid, userId);
}
return result;
}

Expand Down

3 comments on commit 0a431cf

@gwolf2u
Copy link
Member

@gwolf2u gwolf2u commented on 0a431cf Mar 9, 2018

Choose a reason for hiding this comment

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

can get reverted
NastyAndroidDevs/android_bootable_recovery@c5dd579

@neobuddy89
Copy link
Member Author

Choose a reason for hiding this comment

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

Most users are dependent on TWRP.
Not LOS recovery... Not sure if this patch helps.

@gwolf2u
Copy link
Member

@gwolf2u gwolf2u commented on 0a431cf Mar 9, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

that patch is for TWRP

Edit:
cordeworks just made a new TWRP that fixes the decryption (am running it currently)

Please sign in to comment.