Merge changes Ided7a6bf,I61339e02

* changes:
  NativeCrypto: inline call to peekInt
  NativeCrypto: remove unused import

1 files changed, 5 insertions, 3 deletions

diff --git a/crypto/src/main/java/org/conscrypt/NativeCrypto.java b/crypto/src/main/java/org/conscrypt/NativeCrypto.java
index c6d1b2d..48729a2 100644
--- a/crypto/src/main/java/org/conscrypt/NativeCrypto.java
+++ b/crypto/src/main/java/org/conscrypt/NativeCrypto.java
@@ -23,7 +23,6 @@ import java.net.SocketTimeoutException;
 import java.nio.ByteOrder;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
 import java.security.SignatureException;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateEncodingException;
@@ -39,7 +38,6 @@ import javax.crypto.BadPaddingException;
 import javax.crypto.IllegalBlockSizeException;
 import javax.net.ssl.SSLException;
 import javax.security.auth.x500.X500Principal;
-import libcore.io.Memory;
 
 /**
  * Provides the Java side of our JNI glue for OpenSSL.
@@ -348,7 +346,11 @@ public final class NativeCrypto {
     private static int X509_NAME_hash(X500Principal principal, String algorithm) {
         try {
             byte[] digest = MessageDigest.getInstance(algorithm).digest(principal.getEncoded());
-            return Memory.peekInt(digest, 0, ByteOrder.LITTLE_ENDIAN);
+            int offset = 0;
+            return (((digest[offset++] & 0xff) <<  0) |
+                    ((digest[offset++] & 0xff) <<  8) |
+                    ((digest[offset++] & 0xff) << 16) |
+                    ((digest[offset  ] & 0xff) << 24));
         } catch (NoSuchAlgorithmException e) {
             throw new AssertionError(e);
         }