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

Fix network order for marshalling in keystore interface.

Browse Source 
This will fix the endian issue for heterogeneous architectures in keystore marshalling interface.
This commit is contained in:
repo sync
2009-08-05 18:06:27 +08:00
parent 0f0767d4da
commit f1ab36f9ab
3 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
keystore/java/android/security/ServiceCommand.java
View File

@@ -121,15 +121,16 @@ public class ServiceCommand {
Reply reply = new Reply();
if (!readBytes(buf, 4)) return null;
reply.len = (((int) buf[0]) & 0xff) | ((((int) buf[1]) & 0xff) << 8) |
((((int) buf[2]) & 0xff) << 16) |
((((int) buf[3]) & 0xff) << 24);
reply.len = ((((int) buf[0]) & 0xff) << 24) |
((((int) buf[1]) & 0xff) << 16) |
((((int) buf[2]) & 0xff) << 8) |
(((int) buf[3]) & 0xff);
if (!readBytes(buf, 4)) return null;
reply.returnCode = (((int) buf[0]) & 0xff) |
((((int) buf[1]) & 0xff) << 8) |
((((int) buf[2]) & 0xff) << 16) |
((((int) buf[3]) & 0xff) << 24);
reply.returnCode = ((((int) buf[0]) & 0xff) << 24) |
((((int) buf[1]) & 0xff) << 16) |
((((int) buf[2]) & 0xff) << 8) |
(((int) buf[3]) & 0xff);
if (reply.len > BUFFER_LENGTH) {
Log.e(mTag,"invalid reply length (" + reply.len + ")");
@@ -145,15 +146,15 @@ public class ServiceCommand {
byte[] data = (_data == null) ? new byte[0] : _data.getBytes();
int len = data.length;
// the length of data
buf[0] = (byte) (len & 0xff);
buf[1] = (byte) ((len >> 8) & 0xff);
buf[2] = (byte) ((len >> 16) & 0xff);
buf[3] = (byte) ((len >> 24) & 0xff);
buf[0] = (byte) ((len >> 24) & 0xff);
buf[1] = (byte) ((len >> 16) & 0xff);
buf[2] = (byte) ((len >> 8) & 0xff);
buf[3] = (byte) (len & 0xff);
// the opcode of the command
buf[4] = (byte) (cmd & 0xff);
buf[5] = (byte) ((cmd >> 8) & 0xff);
buf[6] = (byte) ((cmd >> 16) & 0xff);
buf[7] = (byte) ((cmd >> 24) & 0xff);
buf[4] = (byte) ((cmd >> 24) & 0xff);
buf[5] = (byte) ((cmd >> 16) & 0xff);
buf[6] = (byte) ((cmd >> 8) & 0xff);
buf[7] = (byte) (cmd & 0xff);
try {
mOut.write(buf, 0, 8);
mOut.write(data, 0, len);