Skip to content

Enable actual OCMF 1.4 parsing #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZakMcKrack3n wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Enable actual OCMF 1.4 parsing #51

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions .../java/de/safe_ev/transparenzsoftware/verification/format/ocmf/OCMFVerificationParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class OCMFVerificationParser implements VerificationParser {
public static final String HEADER_VALUE = "OCMF";

public static final double MIN_VERSION = 0.1;
public static final double MAX_VERSION = 1.4 + 0.1; // must be one more
public static final double MAX_VERSION = 1.4;

@Override
public VerificationType getVerificationType() {
Expand Down Expand Up @@ -125,7 +125,7 @@ public OCMF parseString(String data) throws OCMFValidationException {
"error.ocmf.invalid.version");
}

if (MIN_VERSION > version || MAX_VERSION < version) {
if (MIN_VERSION > version || version > MAX_VERSION) {
throw new OCMFValidationException(
String.format("Not compatible with OCMF version %s", simpleData.get("FV").toString()),
"error.ocmf.invalid.version");
Expand All @@ -134,12 +134,10 @@ public OCMF parseString(String data) throws OCMFValidationException {
if (version < 0.5) {
ocmfPayloadData = gson.fromJson(rawData,
de.safe_ev.transparenzsoftware.verification.format.ocmf.v02.OCMFPayloadData.class);
} else if (version <= 1.3) {
}
else {
ocmfPayloadData = gson.fromJson(rawData,
de.safe_ev.transparenzsoftware.verification.format.ocmf.v05.OCMFPayloadData.class);
} else {
throw new OCMFValidationException(String.format("Not compatible with OCMF version %s", version),
"error.ocmf.invalid.version");
}
final OCMFSignature signature = gson.fromJson(splittedData[2], OCMFSignature.class);

Expand All @@ -159,4 +157,4 @@ public Class getVerfiedDataClass() {
return OCMFVerifiedData.class;
}

}
}