Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0c3aa483: Merge "Remove hex encoding and password adjusting now that patterns are \'1\' based" into mnc-dev

Browse Source 
* commit '0c3aa4834efd91ea9559486fed1d613fd4289969':
  Remove hex encoding and password adjusting now that patterns are '1' based
This commit is contained in:
Paul Lawrence
2015-06-10 15:56:09 +00:00
committed by Android Git Automerger
parent 1f91eed048 0c3aa4834e
commit c8c5884d97
1 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
services/core/java/com/android/server/MountService.java
View File

@@ -76,7 +76,6 @@ import android.util.Xml;
import libcore.io.IoUtils;
import libcore.util.EmptyArray;
import libcore.util.HexEncoding;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
@@ -2078,23 +2077,6 @@ class MountService extends IMountService.Stub
}
}
private static String toHex(String password) {
if (password == null) {
return "";
}
byte[] bytes = password.getBytes(StandardCharsets.UTF_8);
return new String(HexEncoding.encode(bytes));
}
private static String fromHex(String hexPassword) throws IllegalArgumentException {
if (hexPassword == null) {
return null;
}
final byte[] bytes = HexEncoding.decode(hexPassword.toCharArray(), false);
return new String(bytes, StandardCharsets.UTF_8);
}
@Override
public int decryptStorage(String password) {
if (TextUtils.isEmpty(password)) {
@@ -2112,7 +2094,7 @@ class MountService extends IMountService.Stub
final NativeDaemonEvent event;
try {
event = mCryptConnector.execute("cryptfs", "checkpw", new SensitiveArg(toHex(password)));
event = mCryptConnector.execute("cryptfs", "checkpw", new SensitiveArg(password));
final int code = Integer.parseInt(event.getMessage());
if (code == 0) {
@@ -2152,7 +2134,7 @@ class MountService extends IMountService.Stub
try {
mCryptConnector.execute("cryptfs", "enablecrypto", "inplace", CRYPTO_TYPES[type],
new SensitiveArg(toHex(password)));
new SensitiveArg(password));
} catch (NativeDaemonConnectorException e) {
// Encryption failed
return e.getCode();
@@ -2177,7 +2159,7 @@ class MountService extends IMountService.Stub
try {
NativeDaemonEvent event = mCryptConnector.execute("cryptfs", "changepw", CRYPTO_TYPES[type],
new SensitiveArg(toHex(password)));
new SensitiveArg(password));
return Integer.parseInt(event.getMessage());
} catch (NativeDaemonConnectorException e) {
// Encryption failed
@@ -2210,7 +2192,7 @@ class MountService extends IMountService.Stub
final NativeDaemonEvent event;
try {
event = mCryptConnector.execute("cryptfs", "verifypw", new SensitiveArg(toHex(password)));
event = mCryptConnector.execute("cryptfs", "verifypw", new SensitiveArg(password));
Slog.i(TAG, "cryptfs verifypw => " + event.getMessage());
return Integer.parseInt(event.getMessage());
} catch (NativeDaemonConnectorException e) {
@@ -2300,7 +2282,7 @@ class MountService extends IMountService.Stub
// -1 equals no password
return null;
}
return fromHex(event.getMessage());
return event.getMessage();
} catch (NativeDaemonConnectorException e) {
throw e.rethrowAsParcelableException();
} catch (IllegalArgumentException e) {