PGPainless/sop-java
1
0
Fork 0
mirror of https://codeberg.org/PGPainless/sop-java.git synced 2025-09-09 10:19:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

Code cleanup

Browse source
This commit is contained in:
Paul Schaub 2023-01-22 15:07:17 +01:00
parent e73c7e5f91
commit 8cacf7dd57
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
13 changed files with 34 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
external-sop/src/main/java/sop/external/operation/ArmorExternal.java vendored
View file

@ -38,6 +38,6 @@ public class ArmorExternal implements Armor {
@Override
public Ready data(InputStream data) throws SOPGPException.BadData, IOException {
return ExternalSOP.ready(Runtime.getRuntime(), commandList, envList, data);
return ExternalSOP.executeTransformingOperation(Runtime.getRuntime(), commandList, envList, data);
}
}

2
external-sop/src/main/java/sop/external/operation/DearmorExternal.java vendored
View file

@ -31,6 +31,6 @@ public class DearmorExternal implements Dearmor {
@Override
public Ready data(InputStream data) throws SOPGPException.BadData, IOException {
return ExternalSOP.ready(Runtime.getRuntime(), commandList, envList, data);
return ExternalSOP.executeTransformingOperation(Runtime.getRuntime(), commandList, envList, data);
}
}

6
external-sop/src/main/java/sop/external/operation/DecryptExternal.java vendored
View file

@ -66,7 +66,7 @@ public class DecryptExternal implements Decrypt {
throws SOPGPException.BadData, SOPGPException.UnsupportedAsymmetricAlgo, IOException {
String envVar = "VERIFY_WITH_" + verifyWithCounter++;
commandList.add("--verify-with=@ENV:" + envVar);
envList.add(envVar + "=" + ExternalSOP.readFully(cert));
envList.add(envVar + "=" + ExternalSOP.readString(cert));
return this;
}
@ -93,7 +93,7 @@ public class DecryptExternal implements Decrypt {
throws SOPGPException.BadData, SOPGPException.UnsupportedAsymmetricAlgo, IOException {
String envVar = "KEY_" + keyCounter++;
commandList.add("@ENV:" + envVar);
envList.add(envVar + "=" + ExternalSOP.readFully(key));
envList.add(envVar + "=" + ExternalSOP.readString(key));
return this;
}
@ -151,7 +151,7 @@ public class DecryptExternal implements Decrypt {
ExternalSOP.finish(process);
FileInputStream sessionKeyOutIn = new FileInputStream(sessionKeyOut);
String line = ExternalSOP.readFully(sessionKeyOutIn);
String line = ExternalSOP.readString(sessionKeyOutIn);
SessionKey sessionKey = SessionKey.fromString(line.trim());
sessionKeyOutIn.close();
sessionKeyOut.delete();

2
external-sop/src/main/java/sop/external/operation/DetachedSignExternal.java vendored
View file

@ -52,7 +52,7 @@ public class DetachedSignExternal implements DetachedSign {
public DetachedSign key(InputStream key) throws SOPGPException.KeyCannotSign, SOPGPException.BadData, SOPGPException.UnsupportedAsymmetricAlgo, IOException {
String envVar = "KEY_" + keyCounter++;
commandList.add("@ENV:" + envVar);
envList.add(envVar + "=" + ExternalSOP.readFully(key));
envList.add(envVar + "=" + ExternalSOP.readString(key));
return this;
}

4
external-sop/src/main/java/sop/external/operation/DetachedVerifyExternal.java vendored
View file

@ -68,12 +68,12 @@ public class DetachedVerifyExternal implements DetachedVerify {
@Override
public List<Verification> data(InputStream data) throws IOException, SOPGPException.NoSignature, SOPGPException.BadData {
commandList.add("@ENV:SIGNATURE");
envList.add("SIGNATURE=" + ExternalSOP.readFully(signatures));
envList.add("SIGNATURE=" + ExternalSOP.readString(signatures));
for (InputStream cert : certs) {
String envVar = "CERT_" + certCounter++;
commandList.add("@ENV:" + envVar);
envList.add(envVar + "=" + ExternalSOP.readFully(cert));
envList.add(envVar + "=" + ExternalSOP.readString(cert));
}
String[] command = commandList.toArray(new String[0]);

6
external-sop/src/main/java/sop/external/operation/EncryptExternal.java vendored
View file

@ -53,7 +53,7 @@ public class EncryptExternal implements Encrypt {
IOException {
String envVar = "SIGN_WITH_" + SIGN_WITH_COUNTER++;
commandList.add("--sign-with=@ENV:" + envVar);
envList.add(envVar + "=" + ExternalSOP.readFully(key));
envList.add(envVar + "=" + ExternalSOP.readString(key));
return this;
}
@ -81,13 +81,13 @@ public class EncryptExternal implements Encrypt {
IOException {
String envVar = "CERT_" + CERT_COUNTER++;
commandList.add("@ENV:" + envVar);
envList.add(envVar + "=" + ExternalSOP.readFully(cert));
envList.add(envVar + "=" + ExternalSOP.readString(cert));
return this;
}
@Override
public Ready plaintext(InputStream plaintext)
throws IOException, SOPGPException.KeyIsProtected {
return ExternalSOP.ready(Runtime.getRuntime(), commandList, envList, plaintext);
return ExternalSOP.executeTransformingOperation(Runtime.getRuntime(), commandList, envList, plaintext);
}
}

2
external-sop/src/main/java/sop/external/operation/ExtractCertExternal.java vendored
View file

@ -36,6 +36,6 @@ public class ExtractCertExternal implements ExtractCert {
@Override
public Ready key(InputStream keyInputStream) throws SOPGPException.BadData {
return ExternalSOP.ready(Runtime.getRuntime(), commandList, envList, keyInputStream);
return ExternalSOP.executeTransformingOperation(Runtime.getRuntime(), commandList, envList, keyInputStream);
}
}

2
external-sop/src/main/java/sop/external/operation/GenerateKeyExternal.java vendored
View file

@ -54,6 +54,6 @@ public class GenerateKeyExternal implements GenerateKey {
@Override
public Ready generate()
throws SOPGPException.MissingArg, SOPGPException.UnsupportedAsymmetricAlgo {
return ExternalSOP.ready(Runtime.getRuntime(), commandList, envList);
return ExternalSOP.executeProducingOperation(Runtime.getRuntime(), commandList, envList);
}
}

4
external-sop/src/main/java/sop/external/operation/InlineSignExternal.java vendored
View file

@ -43,7 +43,7 @@ public class InlineSignExternal implements InlineSign {
public InlineSign key(InputStream key) throws SOPGPException.KeyCannotSign, SOPGPException.BadData, SOPGPException.UnsupportedAsymmetricAlgo, IOException {
String envVar = "KEY_" + keyCounter++;
commandList.add("@ENV:" + envVar);
envList.add(envVar + "=" + ExternalSOP.readFully(key));
envList.add(envVar + "=" + ExternalSOP.readString(key));
return this;
}
@ -63,6 +63,6 @@ public class InlineSignExternal implements InlineSign {
@Override
public Ready data(InputStream data) throws IOException, SOPGPException.KeyIsProtected, SOPGPException.ExpectedText {
return ExternalSOP.ready(Runtime.getRuntime(), commandList, envList, data);
return ExternalSOP.executeTransformingOperation(Runtime.getRuntime(), commandList, envList, data);
}
}

2
external-sop/src/main/java/sop/external/operation/InlineVerifyExternal.java vendored
View file

@ -57,7 +57,7 @@ public class InlineVerifyExternal implements InlineVerify {
public InlineVerify cert(InputStream cert) throws SOPGPException.BadData, IOException {
String envVar = "CERT_" + certCounter++;
commandList.add("@ENV:" + envVar);
envList.add(envVar + "=" + ExternalSOP.readFully(cert));
envList.add(envVar + "=" + ExternalSOP.readString(cert));
return this;
}