comparison src/com/five_ten_sg/connectbot/util/PubkeyUtils.java @ 342:175c7d68f3c4

merge ganymed into mainline
author Carl Byington <carl@five-ten-sg.com>
date Thu, 31 Jul 2014 16:33:38 -0700
parents 91a31873c42a
children b40bc65fa09a
comparison
equal deleted inserted replaced
272:ce2f4e397703 342:175c7d68f3c4
62 import org.keyczar.jce.EcCore; 62 import org.keyczar.jce.EcCore;
63 63
64 import com.five_ten_sg.connectbot.bean.PubkeyBean; 64 import com.five_ten_sg.connectbot.bean.PubkeyBean;
65 import android.util.Log; 65 import android.util.Log;
66 66
67 import com.trilead.ssh2.crypto.Base64; 67 import ch.ethz.ssh2.crypto.Base64;
68 import com.trilead.ssh2.crypto.SimpleDERReader; 68 import ch.ethz.ssh2.crypto.SimpleDERReader;
69 import com.trilead.ssh2.signature.DSASHA1Verify; 69 import ch.ethz.ssh2.signature.DSASHA1Verify;
70 import com.trilead.ssh2.signature.ECDSASHA2Verify; 70 import ch.ethz.ssh2.signature.ECDSASHA2Verify;
71 import com.trilead.ssh2.signature.RSASHA1Verify; 71 import ch.ethz.ssh2.signature.RSASHA1Verify;
72 72
73 public class PubkeyUtils { 73 public class PubkeyUtils {
74 private static final String TAG = "PubkeyUtils"; 74 private static final String TAG = "PubkeyUtils";
75 75
76 public static final String PKCS8_START = "-----BEGIN PRIVATE KEY-----"; 76 public static final String PKCS8_START = "-----BEGIN PRIVATE KEY-----";