aboutsummaryrefslogtreecommitdiffstats
path: root/src/com/trilead/ssh2/crypto
diff options
context:
space:
mode:
authorJeffrey Sharkey <jsharkey@jsharkey.org>2008-11-02 23:12:26 +0000
committerJeffrey Sharkey <jsharkey@jsharkey.org>2008-11-02 23:12:26 +0000
commit7a4f3578afc79f409ed8da118d9809557cf5ec46 (patch)
tree4f5b5b9e936842e24c07ce3c77c5f71ca9926248 /src/com/trilead/ssh2/crypto
parentccc3a32792175a561fc2c75ccc4fd9f441295830 (diff)
downloadconnectbot-7a4f3578afc79f409ed8da118d9809557cf5ec46.tar.gz
connectbot-7a4f3578afc79f409ed8da118d9809557cf5ec46.tar.bz2
connectbot-7a4f3578afc79f409ed8da118d9809557cf5ec46.zip
* added "in-memory" function to backend service so that unlocked keys can be stored there. this is also disable-able from settings
* "use any key" for a host will only look through unlocked in-memory keys * implemented "load on start" functionality in backend service * implemented "import key" which lets you select any openssh-formatted key (including passworded-ones) from simple /sdcard browser * cleaned up context menu in pubkeylist, now includes toggle checkbox for "load at start" but only available when password-less and non-imported * clicking a key in pubkeylist will toggle its backend status (decrypt and put in memory, or remove from memory) * created preference for screen orientation forcing versus auto, but still need to test * created preference for camera button behavior, but still need to test
Diffstat (limited to 'src/com/trilead/ssh2/crypto')
-rw-r--r--src/com/trilead/ssh2/crypto/PEMDecoder.java6
-rw-r--r--src/com/trilead/ssh2/crypto/PEMStructure.java4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/com/trilead/ssh2/crypto/PEMDecoder.java b/src/com/trilead/ssh2/crypto/PEMDecoder.java
index ac1b842..7d0a015 100644
--- a/src/com/trilead/ssh2/crypto/PEMDecoder.java
+++ b/src/com/trilead/ssh2/crypto/PEMDecoder.java
@@ -23,8 +23,8 @@ import com.trilead.ssh2.signature.RSAPrivateKey;
*/
public class PEMDecoder
{
- private static final int PEM_RSA_PRIVATE_KEY = 1;
- private static final int PEM_DSA_PRIVATE_KEY = 2;
+ public static final int PEM_RSA_PRIVATE_KEY = 1;
+ public static final int PEM_DSA_PRIVATE_KEY = 2;
private static final int hexToInt(char c)
{
@@ -120,7 +120,7 @@ public class PEMDecoder
return tmp;
}
- private static final PEMStructure parsePEM(char[] pem) throws IOException
+ public static final PEMStructure parsePEM(char[] pem) throws IOException
{
PEMStructure ps = new PEMStructure();
diff --git a/src/com/trilead/ssh2/crypto/PEMStructure.java b/src/com/trilead/ssh2/crypto/PEMStructure.java
index 3bb4b5a..6b657e8 100644
--- a/src/com/trilead/ssh2/crypto/PEMStructure.java
+++ b/src/com/trilead/ssh2/crypto/PEMStructure.java
@@ -10,8 +10,8 @@ package com.trilead.ssh2.crypto;
public class PEMStructure
{
- int pemType;
+ public int pemType;
String dekInfo[];
String procType[];
- byte[] data;
+ public byte[] data;
} \ No newline at end of file