Mercurial > 510Connectbot
comparison src/com/five_ten_sg/connectbot/PubkeyListActivity.java @ 298:ab3a99f11a36 ganymed
add ecdsa key support everywhere
author | Carl Byington <carl@five-ten-sg.com> |
---|---|
date | Tue, 29 Jul 2014 18:01:08 -0700 |
parents | 91a31873c42a |
children | 349847b2e318 |
comparison
equal
deleted
inserted
replaced
297:c1f929cb3dd0 | 298:ab3a99f11a36 |
---|---|
636 boolean imported = PubkeyDatabase.KEY_TYPE_IMPORTED.equals(pubkey.getType()); | 636 boolean imported = PubkeyDatabase.KEY_TYPE_IMPORTED.equals(pubkey.getType()); |
637 | 637 |
638 if (imported) { | 638 if (imported) { |
639 try { | 639 try { |
640 PEMStructure struct = PEMDecoder.parsePEM(new String(pubkey.getPrivateKey()).toCharArray()); | 640 PEMStructure struct = PEMDecoder.parsePEM(new String(pubkey.getPrivateKey()).toCharArray()); |
641 String type = (struct.pemType == PEMDecoder.PEM_RSA_PRIVATE_KEY) ? "RSA" : "DSA"; | 641 String type = (struct.pemType == PEMDecoder.PEM_RSA_PRIVATE_KEY) ? "RSA" : |
642 (struct.pemType == PEMDecoder.PEM_DSA_PRIVATE_KEY) ? "DSA" : "EC" | |
642 holder.caption.setText(String.format("%s unknown-bit", type)); | 643 holder.caption.setText(String.format("%s unknown-bit", type)); |
643 } | 644 } |
644 catch (IOException e) { | 645 catch (IOException e) { |
645 Log.e(TAG, "Error decoding IMPORTED public key at " + pubkey.getId(), e); | 646 Log.e(TAG, "Error decoding IMPORTED public key at " + pubkey.getId(), e); |
646 } | 647 } |