I2P_Developers/i2p.scripts
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Request passphrase where needed, and on stderr to not interfere with stdout

Browse Source
This commit is contained in:
str4d
2013-04-20 10:55:42 +00:00
parent aef297ca73
commit da2ec7b791
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
openpgp/OpenPGPDest.java
View File

@ -120,14 +120,14 @@ public class OpenPGPDest extends OpenPGPFile {
System.err.println("Usage: OpenPGPDest "+args[numOpts]+" <eepPriv.dat>");
return;
}
BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
System.out.print("GPG passphrase to encrypt with: ");
char[] passPhrase = br.readLine().toCharArray();
opf = new OpenPGPDest();
opf.readPrivateKeyFile(new File(args[numOpts+1]));
opf.exportKeys();
if (identity.length() > 0)
opf.addIdentity(identity);
BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
System.err.print("GPG passphrase to encrypt with: ");
char[] passPhrase = br.readLine().toCharArray();
boolean writeSecret = (args[numOpts].equals("-s") || args[numOpts].equals("--export-secret"));
if (outFile.length() > 0)
opf.writeOpenPGPKeyRing(new File(outFile), passPhrase, armorOutput, writeSecret, forceWrite);
@ -138,10 +138,10 @@ public class OpenPGPDest extends OpenPGPFile {
System.err.println("Usage: OpenPGPDest "+args[numOpts]+" <pgpFile> <eepPriv.dat>");
return;
}
BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
System.out.print("GPG passphrase to decrypt with: ");
char[] passPhrase = br.readLine().toCharArray();
opf = new OpenPGPDest();
BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
System.err.print("GPG passphrase to decrypt with: ");
char[] passPhrase = br.readLine().toCharArray();
opf.readOpenPGPSecretKeyRing(new File(args[numOpts+1]), passPhrase);
opf.importKeys();
opf.writePrivateKeyFile(new File(args[numOpts+2]), forceWrite);