echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more constructors

Browse Source
This commit is contained in:
zzz
2011-09-06 13:23:24 +00:00
parent d9b37ac6f0
commit 70d9415ba2
1 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
core/java/src/net/i2p/data/PrivateKeyFile.java
View File

@ -127,6 +127,32 @@ public class PrivateKeyFile {
this.signingPrivKey = null; this.signingPrivKey = null;
} }
/** @since 0.8.9 */
public PrivateKeyFile(File file, I2PSession session) {
this(file, session.getMyDestination(), session.getDecryptionKey(), session.getPrivateKey());
}
/** @since 0.8.9 */
public PrivateKeyFile(File file, Destination dest, PrivateKey pk, SigningPrivateKey spk) {
this.file = file;
this.client = null;
this.dest = dest;
this.privKey = pk;
this.signingPrivKey = spk;
}
/** @since 0.8.9 */
public PrivateKeyFile(File file, PublicKey pubkey, SigningPublicKey spubkey, Certificate cert,
PrivateKey pk, SigningPrivateKey spk) {
this.file = file;
this.client = null;
this.dest = new Destination();
this.dest.setPublicKey(pubkey);
this.dest.setSigningPublicKey(spubkey);
this.dest.setCertificate(cert);
this.privKey = pk;
this.signingPrivKey = spk;
}
/** Also reads in the file to get the privKey and signingPrivKey, /** Also reads in the file to get the privKey and signingPrivKey,
* which aren't available from I2PClient. * which aren't available from I2PClient.
@ -136,7 +162,10 @@ public class PrivateKeyFile {
FileOutputStream out = null; FileOutputStream out = null;
try { try {
out = new FileOutputStream(this.file); out = new FileOutputStream(this.file);
this.client.createDestination(out); if (this.client != null)
this.client.createDestination(out);
else
write();
} finally { } finally {
if (out != null) { if (out != null) {
try { out.close(); } catch (IOException ioe) {} try { out.close(); } catch (IOException ioe) {}
@ -411,8 +440,8 @@ public class PrivateKeyFile {
private File file; private final File file;
private I2PClient client; private final I2PClient client;
private Destination dest; private Destination dest;
private PrivateKey privKey; private PrivateKey privKey;
private SigningPrivateKey signingPrivKey; private SigningPrivateKey signingPrivKey;