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

remove unneeded bouncycastle dependencies

Browse Source 
These calls to bouncycastle were just used because the library was
there.  Now with the upcoming 'basic' build flavor, there will be no
need for bouncycastle.  It is required for ZipSigner signing of swap
indexes, and TLS support in the swap NanoHTTPD webserver.
This commit is contained in:
Hans-Christoph Steiner 2018-06-01 13:27:33 +02:00
parent f3974898af
commit 00da6080c7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/fdroid/fdroid/installer/ApkSignatureVerifier.java
View File

@ -26,7 +26,6 @@ import android.content.pm.PackageManager;
import android.content.pm.Signature;
import org.acra.ACRA;
import org.fdroid.fdroid.Utils;
import org.bouncycastle.util.encoders.Hex;
import java.io.ByteArrayOutputStream;
import java.io.File;
@ -69,8 +68,8 @@ class ApkSignatureVerifier {
}
Utils.debugLog(TAG, "Signature mismatch!");
Utils.debugLog(TAG, "APK sig: " + Hex.toHexString(getApkSignature(apkFile)));
Utils.debugLog(TAG, "F-Droid sig: " + Hex.toHexString(getFDroidSignature()));
Utils.debugLog(TAG, "APK sig: " + Utils.toHexString(getApkSignature(apkFile)));
Utils.debugLog(TAG, "F-Droid sig: " + Utils.toHexString(getFDroidSignature()));
return false;
}

5
app/src/main/java/org/fdroid/fdroid/net/HttpDownloader.java
View File

@ -4,12 +4,12 @@ import android.annotation.TargetApi;
import android.net.Uri;
import android.os.Build;
import android.text.TextUtils;
import android.util.Base64;
import info.guardianproject.netcipher.NetCipher;
import org.apache.commons.io.FileUtils;
import org.fdroid.fdroid.BuildConfig;
import org.fdroid.fdroid.FDroidApp;
import org.fdroid.fdroid.Utils;
import org.bouncycastle.util.encoders.Base64;
import java.io.BufferedInputStream;
import java.io.File;
@ -151,7 +151,8 @@ public class HttpDownloader extends Downloader {
if (username != null && password != null) {
// add authorization header from username / password if set
String authString = username + ":" + password;
connection.setRequestProperty("Authorization", "Basic " + Base64.toBase64String(authString.getBytes()));
connection.setRequestProperty("Authorization", "Basic "
+ Base64.encodeToString(authString.getBytes(), Base64.NO_WRAP));
}
return connection;
}