Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always use Locale.ENGLISH for hashes/fingerprints

Browse Source
This commit is contained in:
Daniel Martí 2014-01-08 11:52:55 +01:00
parent 98d574afbf
commit fe41108ed6
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/org/fdroid/fdroid/DB.java
View File

@ -33,6 +33,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.concurrent.Semaphore;
@ -1378,7 +1379,7 @@ public class DB {
if (fingerprint == null) {
fingerprint = calcedFingerprint;
} else if (calcedFingerprint != null) {
fingerprint = fingerprint.toUpperCase();
fingerprint = fingerprint.toUpperCase(Locale.ENGLISH);
if (!fingerprint.equals(calcedFingerprint)) {
throw new SecurityException("Given fingerprint does not match calculated one! ("
+ fingerprint + " != " + calcedFingerprint);

3
src/org/fdroid/fdroid/Hasher.java
View File

@ -28,6 +28,7 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.cert.Certificate;
import java.security.cert.CertificateEncodingException;
import java.util.Locale;
public class Hasher {
@ -88,7 +89,7 @@ public class Hasher {
if (hashCache == null) getHash();
if (otherHash == null || hashCache.equals(""))
return false;
return hashCache.equals(otherHash.toLowerCase());
return hashCache.equals(otherHash.toLowerCase(Locale.ENGLISH));
}
public void reset() {