Rename DetachInbandSignatureAndMessage to InlineDetach

This commit is contained in:
Paul Schaub 2022-05-24 21:19:37 +02:00
parent 0bfc12c1e1
commit fd9192995f
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
4 changed files with 8 additions and 8 deletions

View file

@ -12,7 +12,7 @@ import picocli.CommandLine;
import sop.Signatures; import sop.Signatures;
import sop.cli.picocli.SopCLI; import sop.cli.picocli.SopCLI;
import sop.exception.SOPGPException; import sop.exception.SOPGPException;
import sop.operation.DetachInbandSignatureAndMessage; import sop.operation.InlineDetach;
@CommandLine.Command(name = "detach-inband-signature-and-message", @CommandLine.Command(name = "detach-inband-signature-and-message",
description = "Split a clearsigned message", description = "Split a clearsigned message",
@ -32,7 +32,7 @@ public class DetachInbandSignatureAndMessageCmd implements Runnable {
@Override @Override
public void run() { public void run() {
DetachInbandSignatureAndMessage detach = SopCLI.getSop().detachInbandSignatureAndMessage(); InlineDetach detach = SopCLI.getSop().detachInbandSignatureAndMessage();
if (detach == null) { if (detach == null) {
throw new SOPGPException.UnsupportedSubcommand("Command 'detach-inband-signature-and-message' not implemented."); throw new SOPGPException.UnsupportedSubcommand("Command 'detach-inband-signature-and-message' not implemented.");
} }

View file

@ -17,7 +17,7 @@ import sop.SOP;
import sop.operation.Armor; import sop.operation.Armor;
import sop.operation.Dearmor; import sop.operation.Dearmor;
import sop.operation.Decrypt; import sop.operation.Decrypt;
import sop.operation.DetachInbandSignatureAndMessage; import sop.operation.InlineDetach;
import sop.operation.Encrypt; import sop.operation.Encrypt;
import sop.operation.ExtractCert; import sop.operation.ExtractCert;
import sop.operation.GenerateKey; import sop.operation.GenerateKey;
@ -93,7 +93,7 @@ public class SOPTest {
} }
@Override @Override
public DetachInbandSignatureAndMessage detachInbandSignatureAndMessage() { public InlineDetach detachInbandSignatureAndMessage() {
return null; return null;
} }
}; };

View file

@ -7,7 +7,7 @@ package sop;
import sop.operation.Armor; import sop.operation.Armor;
import sop.operation.Dearmor; import sop.operation.Dearmor;
import sop.operation.Decrypt; import sop.operation.Decrypt;
import sop.operation.DetachInbandSignatureAndMessage; import sop.operation.InlineDetach;
import sop.operation.Encrypt; import sop.operation.Encrypt;
import sop.operation.ExtractCert; import sop.operation.ExtractCert;
import sop.operation.GenerateKey; import sop.operation.GenerateKey;
@ -91,5 +91,5 @@ public interface SOP {
*/ */
Dearmor dearmor(); Dearmor dearmor();
DetachInbandSignatureAndMessage detachInbandSignatureAndMessage(); InlineDetach detachInbandSignatureAndMessage();
} }

View file

@ -14,13 +14,13 @@ import sop.Signatures;
/** /**
* Split cleartext signed messages up into data and signatures. * Split cleartext signed messages up into data and signatures.
*/ */
public interface DetachInbandSignatureAndMessage { public interface InlineDetach {
/** /**
* Do not wrap the signatures in ASCII armor. * Do not wrap the signatures in ASCII armor.
* @return builder * @return builder
*/ */
DetachInbandSignatureAndMessage noArmor(); InlineDetach noArmor();
/** /**
* Detach the provided cleartext signed message from its signatures. * Detach the provided cleartext signed message from its signatures.