From fc6a4042f7fca1828f0b8e267cfd660e6fe1d40a Mon Sep 17 00:00:00 2001 From: CGantert345 <57003061+CGantert345@users.noreply.github.com> Date: Tue, 22 Nov 2022 14:04:27 +0100 Subject: support for SSB barcodes SSB frame implenmentation including decoding, encoding, signing and verification --- .../java/org/uic/barcode/ssbFrame/SsbHeader.java | 108 +++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 src/main/java/org/uic/barcode/ssbFrame/SsbHeader.java (limited to 'src/main/java/org/uic/barcode/ssbFrame/SsbHeader.java') diff --git a/src/main/java/org/uic/barcode/ssbFrame/SsbHeader.java b/src/main/java/org/uic/barcode/ssbFrame/SsbHeader.java new file mode 100644 index 0000000..0d5424b --- /dev/null +++ b/src/main/java/org/uic/barcode/ssbFrame/SsbHeader.java @@ -0,0 +1,108 @@ +package org.uic.barcode.ssbFrame; + +import org.uic.barcode.asn1.uper.BitBuffer; +import org.uic.barcode.asn1.uper.ByteBitBuffer; + +public class SsbHeader extends SsbTicketPart { + + private int version = 3; + private SsbTicketType ticketType = null; + private int keyId = 0; + private int issuer = 0; + + /* + Version Num 0-4 Bits + Issuer code Num 14 Bits + ID Num 4 Bits + Ticket type code Num 5 Bits + */ + + public SsbHeader(int version, SsbTicketType type, int keyId, int issuer) { + this.issuer = issuer; + this.keyId = keyId; + this.ticketType = type; + this.version = version; + } + + public SsbHeader() { + } + + public void decodeContent(byte[] headerData) { + + BitBuffer bits = new ByteBitBuffer(headerData); + + version = bits.getInteger(0, 4); + issuer = bits.getInteger(4, 14); + keyId = bits.getInteger(18, 4); + ticketType = SsbTicketType.values()[bits.getInteger(22, 5)]; + + return; + + } + + public void encodeContent(byte[] bytes) { + + BitBuffer bits = new ByteBitBuffer(bytes); + + bits.putInteger(0, 4, version); + bits.putInteger(4, 14, issuer); + bits.putInteger(18, 4, keyId); + bits.putInteger(22, 5, ticketType.ordinal()); + + } + + + + public int getVersion() { + return version; + } + + + + public void setVersion(int version) { + this.version = version; + } + + + + public SsbTicketType getTicketType() { + return ticketType; + } + + + + public void setTicketType(SsbTicketType ticketType) { + this.ticketType = ticketType; + } + + + + public int getKeyId() { + return keyId; + } + + + + public void setKeyId(int keyId) { + this.keyId = keyId; + } + + + + public int getIssuer() { + return issuer; + } + + + + public void setIssuer(int issuer) { + this.issuer = issuer; + } + + + + + + + +} -- cgit v1.2.3 From 7ec06722923d96d2e51300bafb44b920ca341d58 Mon Sep 17 00:00:00 2001 From: CGantert345 <57003061+CGantert345@users.noreply.github.com> Date: Fri, 10 Mar 2023 16:49:58 +0100 Subject: ssb unit tests --- src/main/java/org/uic/barcode/ssbFrame/SsbHeader.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/main/java/org/uic/barcode/ssbFrame/SsbHeader.java') diff --git a/src/main/java/org/uic/barcode/ssbFrame/SsbHeader.java b/src/main/java/org/uic/barcode/ssbFrame/SsbHeader.java index 0d5424b..2ea4a51 100644 --- a/src/main/java/org/uic/barcode/ssbFrame/SsbHeader.java +++ b/src/main/java/org/uic/barcode/ssbFrame/SsbHeader.java @@ -27,7 +27,7 @@ public class SsbHeader extends SsbTicketPart { public SsbHeader() { } - public void decodeContent(byte[] headerData) { + public int decodeContent(byte[] headerData, int offset) { BitBuffer bits = new ByteBitBuffer(headerData); @@ -36,11 +36,11 @@ public class SsbHeader extends SsbTicketPart { keyId = bits.getInteger(18, 4); ticketType = SsbTicketType.values()[bits.getInteger(22, 5)]; - return; + return 4 + 14 + 4 + 5; } - public void encodeContent(byte[] bytes) { + public int encodeContent(byte[] bytes, int offset) { BitBuffer bits = new ByteBitBuffer(bytes); @@ -49,6 +49,8 @@ public class SsbHeader extends SsbTicketPart { bits.putInteger(18, 4, keyId); bits.putInteger(22, 5, ticketType.ordinal()); + return 4 + 14 + 4 + 5; + } -- cgit v1.2.3 From f1a08e7fb82e813ce6985460cc2606fc7b19ae13 Mon Sep 17 00:00:00 2001 From: CGantert345 <57003061+CGantert345@users.noreply.github.com> Date: Tue, 14 Mar 2023 10:15:31 +0100 Subject: SSB encoding format validation --- src/main/java/org/uic/barcode/ssbFrame/SsbHeader.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'src/main/java/org/uic/barcode/ssbFrame/SsbHeader.java') diff --git a/src/main/java/org/uic/barcode/ssbFrame/SsbHeader.java b/src/main/java/org/uic/barcode/ssbFrame/SsbHeader.java index 2ea4a51..48c8eaf 100644 --- a/src/main/java/org/uic/barcode/ssbFrame/SsbHeader.java +++ b/src/main/java/org/uic/barcode/ssbFrame/SsbHeader.java @@ -2,6 +2,7 @@ package org.uic.barcode.ssbFrame; import org.uic.barcode.asn1.uper.BitBuffer; import org.uic.barcode.asn1.uper.ByteBitBuffer; +import org.uic.barcode.ticket.EncodingFormatException; public class SsbHeader extends SsbTicketPart { @@ -40,13 +41,28 @@ public class SsbHeader extends SsbTicketPart { } - public int encodeContent(byte[] bytes, int offset) { + public int encodeContent(byte[] bytes, int offset) throws EncodingFormatException { BitBuffer bits = new ByteBitBuffer(bytes); + if (version < 0 || version > 15) { + throw new EncodingFormatException("SSB Version too big"); + } + bits.putInteger(0, 4, version); + + if (issuer < 0 || issuer > 9999) { + throw new EncodingFormatException("SSB Issuer code too big"); + } + bits.putInteger(4, 14, issuer); + + if (keyId < 0 || keyId > 15) { + throw new EncodingFormatException("SSB Key Id too big"); + } + bits.putInteger(18, 4, keyId); + bits.putInteger(22, 5, ticketType.ordinal()); return 4 + 14 + 4 + 5; -- cgit v1.2.3