corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 981872 - Replace sha-1 MessageDigest with NativeCrypto. r=nalexander

Browse Source
This commit is contained in:
Michael Comella
2014-04-08 11:44:38 -07:00
parent 63e313c8ff
commit c68dce8d0b
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mobile/android/base/sync/Utils.java
View File

@@ -28,6 +28,7 @@ import org.json.simple.JSONArray;
import org.mozilla.apache.commons.codec.binary.Base32;
import org.mozilla.apache.commons.codec.binary.Base64;
import org.mozilla.gecko.background.common.log.Logger;
import org.mozilla.gecko.background.nativecode.NativeCrypto;
import org.mozilla.gecko.sync.setup.Constants;
import android.annotation.SuppressLint;
@@ -210,8 +211,18 @@ public class Utils {
protected static byte[] sha1(final String utf8)
throws NoSuchAlgorithmException, UnsupportedEncodingException {
MessageDigest sha1 = MessageDigest.getInstance("SHA-1");
return sha1.digest(utf8.getBytes("UTF-8"));
final byte[] bytes = utf8.getBytes("UTF-8");
try {
return NativeCrypto.sha1(bytes);
} catch (final LinkageError e) {
// This will throw UnsatisifiedLinkError (missing mozglue) the first time it is called, and
// ClassNotDefFoundError, for the uninitialized NativeCrypto class, each subsequent time this
// is called; LinkageError is their common ancestor.
Logger.warn(LOG_TAG, "Got throwable stretching password using native sha1 implementation; " +
"ignoring and using Java implementation.", e);
final MessageDigest sha1 = MessageDigest.getInstance("SHA-1");
return sha1.digest(utf8.getBytes("UTF-8"));
}
}
protected static String sha1Base32(final String utf8)