PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-11-14 16:32:06 +01:00
Code Issues Releases Wiki Activity

Remove superfluous states

Browse source
This commit is contained in:
Paul Schaub 2022-10-26 18:22:50 +02:00
parent 4533e419f1
commit 585f693545
2 changed files with 3 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pgpainless-core/src/main/java/org/pgpainless/decryption_verification/syntax_check/PDA.java
View file

@ -67,7 +67,7 @@ public class PDA {
case Signature: case Signature:
if (stackItem == ops) { if (stackItem == ops) {
return CorrespondingSignature; return LiteralMessage;
} else { } else {
throw new MalformedOpenPgpMessageException(this, input, stackItem); throw new MalformedOpenPgpMessageException(this, input, stackItem);
} }
@ -96,7 +96,7 @@ public class PDA {
switch (input) { switch (input) {
case Signature: case Signature:
if (stackItem == ops) { if (stackItem == ops) {
return CorrespondingSignature; return CompressedMessage;
} else { } else {
throw new MalformedOpenPgpMessageException(this, input, stackItem); throw new MalformedOpenPgpMessageException(this, input, stackItem);
} }
@ -125,7 +125,7 @@ public class PDA {
switch (input) { switch (input) {
case Signature: case Signature:
if (stackItem == ops) { if (stackItem == ops) {
return CorrespondingSignature; return EncryptedMessage;
} else { } else {
throw new MalformedOpenPgpMessageException(this, input, stackItem); throw new MalformedOpenPgpMessageException(this, input, stackItem);
} }
@ -147,26 +147,6 @@ public class PDA {
} }
}, },
CorrespondingSignature {
@Override
State transition(InputAlphabet input, PDA automaton) throws MalformedOpenPgpMessageException {
StackAlphabet stackItem = automaton.popStack();
if (input == InputAlphabet.EndOfSequence) {
if (stackItem == terminus && automaton.stack.isEmpty()) {
return Valid;
} else {
// premature end of stream
throw new MalformedOpenPgpMessageException(this, input, stackItem);
}
} else if (input == InputAlphabet.Signature) {
if (stackItem == ops) {
return CorrespondingSignature;
}
}
throw new MalformedOpenPgpMessageException(this, input, stackItem);
}
},
Valid { Valid {
@Override @Override
State transition(InputAlphabet input, PDA automaton) throws MalformedOpenPgpMessageException { State transition(InputAlphabet input, PDA automaton) throws MalformedOpenPgpMessageException {

4
pgpainless-core/src/main/java/org/pgpainless/decryption_verification/syntax_check/StackAlphabet.java
View file

@ -13,10 +13,6 @@ public enum StackAlphabet {
* OnePassSignature (in case of BC this represents a OnePassSignatureList). * OnePassSignature (in case of BC this represents a OnePassSignatureList).
*/ */
ops, ops,
/**
* ESK. Not used, as BC combines encrypted data with their encrypted session keys.
*/
esk,
/** /**
* Special symbol representing the end of the message. * Special symbol representing the end of the message.
*/ */