Mercurial > 510Connectbot

comparison src/ch/ethz/ssh2/channel/AuthAgentForwardThread.java @ 295:deb5fb087b6f ganymed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
start conversion from trilead to ganymed
author Carl Byington <carl@five-ten-sg.com>
date Fri, 18 Jul 2014 20:48:40 -0700
parents c41a399da303
children ab3a99f11a36
comparison
equal deleted inserted replaced
294:c41a399da303 295:deb5fb087b6f
97 97
98 public AuthAgentForwardThread(Channel c, AuthAgentCallback authAgent) { 98 public AuthAgentForwardThread(Channel c, AuthAgentCallback authAgent) {
99 this.c = c; 99 this.c = c;
100 this.authAgent = authAgent; 100 this.authAgent = authAgent;
101 101
102 if (log.isEnabled()) 102 log.debug("AuthAgentForwardThread started");
103 log.log(20, "AuthAgentForwardThread started");
104 } 103 }
105 104
106 @Override 105 @Override
107 public void run() { 106 public void run() {
108 try { 107 try {
188 } 187 }
189 188
190 c.cm.closeChannel(c, "EOF on both streams reached.", true); 189 c.cm.closeChannel(c, "EOF on both streams reached.", true);
191 } 190 }
192 catch (IOException e) { 191 catch (IOException e) {
193 log.log(50, "IOException in agent forwarder: " + e.getMessage()); 192 log.debug("IOException in agent forwarder: " + e.getMessage());
194 193
195 try { 194 try {
196 is.close(); 195 is.close();
197 } 196 }
198 catch (IOException e1) { 197 catch (IOException e1) {
304 byte[] groupBytes = tr.readByteString(); 303 byte[] groupBytes = tr.readByteString();
305 BigInteger exponent = tr.readMPINT(); 304 BigInteger exponent = tr.readMPINT();
306 comment = tr.readString(); 305 comment = tr.readString();
307 306
308 if (!"nistp256".equals(curveName)) { 307 if (!"nistp256".equals(curveName)) {
309 log.log(2, "Invalid curve name for ecdsa-sha2-nistp256: " + curveName); 308 log.debug("Invalid curve name for ecdsa-sha2-nistp256: " + curveName);
310 os.write(SSH_AGENT_FAILURE); 309 os.write(SSH_AGENT_FAILURE);
311 return; 310 return;
312 } 311 }
313 312
314 ECParameterSpec nistp256 = ECDSASHA2Verify.EllipticCurves.nistp256; 313 ECParameterSpec nistp256 = ECDSASHA2Verify.EllipticCurves.nistp256;
322 321
323 pubSpec = new ECPublicKeySpec(group, nistp256); 322 pubSpec = new ECPublicKeySpec(group, nistp256);
324 privSpec = new ECPrivateKeySpec(exponent, nistp256); 323 privSpec = new ECPrivateKeySpec(exponent, nistp256);
325 } 324 }
326 else { 325 else {
327 log.log(2, "Unknown key type: " + type); 326 log.debug("Unknown key type: " + type);
328 os.write(SSH_AGENT_FAILURE); 327 os.write(SSH_AGENT_FAILURE);
329 return; 328 return;
330 } 329 }
331 330
332 PublicKey pubKey; 331 PublicKey pubKey;