OSDN Git Service

Don't use IntegralToString
authorChad Brubaker <cbrubaker@google.com>
Tue, 1 Dec 2015 21:03:27 +0000 (13:03 -0800)
committerNarayan Kamath <narayan@google.com>
Tue, 22 Dec 2015 13:41:08 +0000 (13:41 +0000)
Fix master build

(cherry picked from commit 7845e44c0cff3ec6a9ea0e5059fa1f7019ef0eb7)

Change-Id: Ic99a5e868b5d42e7bf72ef5388e30f070b6655d8

core/java/android/security/net/config/DirectoryCertificateSource.java

index bf88e58..bf29efa 100644 (file)
@@ -32,6 +32,7 @@ import java.security.cert.X509Certificate;
 import java.util.Set;
 import libcore.io.IoUtils;
 
+import com.android.org.conscrypt.Hex;
 import com.android.org.conscrypt.NativeCrypto;
 
 import javax.security.auth.x500.X500Principal;
@@ -136,7 +137,7 @@ abstract class DirectoryCertificateSource implements CertificateSource {
 
     private String getHash(X500Principal name) {
         int hash = NativeCrypto.X509_NAME_hash_old(name);
-        return IntegralToString.intToHexString(hash, false, 8);
+        return Hex.intToHexString(hash, 8);
     }
 
     private X509Certificate readCertificate(String file) {