kopia lustrzana https://github.com/ge0rg/aprsdroid
Switch from BKS to PKCS12 (like LotW export)
rodzic
a6f9803b51
commit
f63485fe22
|
@ -75,7 +75,7 @@
|
|||
<category android:name="android.intent.category.BROWSABLE" />
|
||||
<data android:scheme="file" />
|
||||
<data android:mimeType="*/*" />
|
||||
<data android:pathPattern=".*\\.bks" />
|
||||
<data android:pathPattern=".*\\.p12" />
|
||||
<data android:host="*" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
|
|
|
@ -16,7 +16,7 @@ import scala.collection.JavaConversions._ // for enumeration of keystore aliases
|
|||
|
||||
class KeyfileImportActivity extends Activity {
|
||||
val TAG = "APRSdroid.KeyImport"
|
||||
val KEYSTORE_PASS = "APRS-IS".toCharArray()
|
||||
val KEYSTORE_PASS = "APRS".toCharArray()
|
||||
val KEYSTORE_DIR = "keystore"
|
||||
|
||||
val CALL_RE = ".*CALLSIGN=([0-9A-Za-z]+).*".r
|
||||
|
@ -25,7 +25,7 @@ class KeyfileImportActivity extends Activity {
|
|||
super.onCreate(savedInstanceState)
|
||||
Log.d(TAG, "created: " + getIntent())
|
||||
try {
|
||||
val ks = KeyStore.getInstance("BKS")
|
||||
val ks = KeyStore.getInstance("PKCS12")
|
||||
ks.load(getContentResolver().openInputStream(getIntent.getData()), KEYSTORE_PASS)
|
||||
var callsign : String = null
|
||||
for (alias <- ks.aliases()) {
|
||||
|
@ -43,7 +43,7 @@ class KeyfileImportActivity extends Activity {
|
|||
}
|
||||
if (callsign != null) {
|
||||
val dir = getApplicationContext().getDir(KEYSTORE_DIR, Context.MODE_PRIVATE)
|
||||
val keyStoreFile = new File(dir + File.separator + callsign + ".bks")
|
||||
val keyStoreFile = new File(dir + File.separator + callsign + ".p12")
|
||||
ks.store(new FileOutputStream(keyStoreFile), KEYSTORE_PASS)
|
||||
|
||||
PreferenceManager.getDefaultSharedPreferences(this)
|
||||
|
|
|
@ -70,14 +70,13 @@ class TcpUploader(service : AprsService, prefs : PrefsWrapper) extends AprsBacke
|
|||
var tnc : TncProto = null
|
||||
|
||||
val KEYSTORE_DIR = "keystore"
|
||||
val KEYSTORE_FILE = "keys.bks"
|
||||
val KEYSTORE_PASS = "APRS-IS".toCharArray()
|
||||
val KEYSTORE_PASS = "APRS".toCharArray()
|
||||
|
||||
def init_ssl_socket(host : String, port : Int) : Socket = {
|
||||
val dir = service.getApplicationContext().getDir(KEYSTORE_DIR, Context.MODE_PRIVATE)
|
||||
val keyStoreFile = new File(dir + File.separator + prefs.getCallsign() + ".bks")
|
||||
val keyStoreFile = new File(dir + File.separator + prefs.getCallsign() + ".p12")
|
||||
|
||||
val ks = KeyStore.getInstance("BKS")
|
||||
val ks = KeyStore.getInstance("PKCS12")
|
||||
val kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm())
|
||||
|
||||
try {
|
||||
|
|
Ładowanie…
Reference in New Issue