mirror
/
aprsdroid
kopia lustrzana https://github.com/ge0rg/aprsdroid
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Switch from BKS to PKCS12 (like LotW export)

ssl
Georg Lukas 2013-05-08 18:22:18 +02:00
rodzic a6f9803b51
commit f63485fe22
3 zmienionych plików z 7 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
AndroidManifest.xml
Wyświetl plik

@ -75,7 +75,7 @@
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="file" /> <data android:scheme="file" />
<data android:mimeType="*/*" /> <data android:mimeType="*/*" />
<data android:pathPattern=".*\\.bks" /> <data android:pathPattern=".*\\.p12" />
<data android:host="*" /> <data android:host="*" />
</intent-filter> </intent-filter>
</activity> </activity>

6
src/KeyfileImportActivity.scala
Wyświetl plik

@ -16,7 +16,7 @@ import scala.collection.JavaConversions._ // for enumeration of keystore aliases
class KeyfileImportActivity extends Activity { class KeyfileImportActivity extends Activity {
val TAG = "APRSdroid.KeyImport" val TAG = "APRSdroid.KeyImport"
val KEYSTORE_PASS = "APRS-IS".toCharArray() val KEYSTORE_PASS = "APRS".toCharArray()
val KEYSTORE_DIR = "keystore" val KEYSTORE_DIR = "keystore"
val CALL_RE = ".*CALLSIGN=([0-9A-Za-z]+).*".r val CALL_RE = ".*CALLSIGN=([0-9A-Za-z]+).*".r
@ -25,7 +25,7 @@ class KeyfileImportActivity extends Activity {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
Log.d(TAG, "created: " + getIntent()) Log.d(TAG, "created: " + getIntent())
try { try {
val ks = KeyStore.getInstance("BKS") val ks = KeyStore.getInstance("PKCS12")
ks.load(getContentResolver().openInputStream(getIntent.getData()), KEYSTORE_PASS) ks.load(getContentResolver().openInputStream(getIntent.getData()), KEYSTORE_PASS)
var callsign : String = null var callsign : String = null
for (alias <- ks.aliases()) { for (alias <- ks.aliases()) {
@ -43,7 +43,7 @@ class KeyfileImportActivity extends Activity {
} }
if (callsign != null) { if (callsign != null) {
val dir = getApplicationContext().getDir(KEYSTORE_DIR, Context.MODE_PRIVATE) 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) ks.store(new FileOutputStream(keyStoreFile), KEYSTORE_PASS)
PreferenceManager.getDefaultSharedPreferences(this) PreferenceManager.getDefaultSharedPreferences(this)

7
src/backend/TcpUploader.scala
Wyświetl plik

@ -70,14 +70,13 @@ class TcpUploader(service : AprsService, prefs : PrefsWrapper) extends AprsBacke
var tnc : TncProto = null var tnc : TncProto = null
val KEYSTORE_DIR = "keystore" val KEYSTORE_DIR = "keystore"
val KEYSTORE_FILE = "keys.bks" val KEYSTORE_PASS = "APRS".toCharArray()
val KEYSTORE_PASS = "APRS-IS".toCharArray()
def init_ssl_socket(host : String, port : Int) : Socket = { def init_ssl_socket(host : String, port : Int) : Socket = {
val dir = service.getApplicationContext().getDir(KEYSTORE_DIR, Context.MODE_PRIVATE) 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()) val kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm())
try { try {