diff options
author | CGantert345 <57003061+CGantert345@users.noreply.github.com> | 2021-05-12 14:00:22 +0200 |
---|---|---|
committer | CGantert345 <57003061+CGantert345@users.noreply.github.com> | 2021-05-12 14:00:22 +0200 |
commit | 9c27db0284c86583c135282e637f5e4dcb220c89 (patch) | |
tree | 597775f5246e830877d59ff275d7b757d6646dc8 /src/main/java/org/uic/barcode/dynamicContent/dfcb1 | |
parent | update (diff) | |
download | UIC-barcode-9c27db0284c86583c135282e637f5e4dcb220c89.tar UIC-barcode-9c27db0284c86583c135282e637f5e4dcb220c89.tar.gz UIC-barcode-9c27db0284c86583c135282e637f5e4dcb220c89.tar.bz2 UIC-barcode-9c27db0284c86583c135282e637f5e4dcb220c89.tar.lz UIC-barcode-9c27db0284c86583c135282e637f5e4dcb220c89.tar.xz UIC-barcode-9c27db0284c86583c135282e637f5e4dcb220c89.tar.zst UIC-barcode-9c27db0284c86583c135282e637f5e4dcb220c89.zip |
Diffstat (limited to '')
-rw-r--r-- | src/main/java/org/uic/barcode/dynamicContent/dfcb1/UicDynamicContentData1.java | 268 | ||||
-rw-r--r-- | src/main/java/org/uic/barcode/dynamicContent/fdc1/ExtensionData.java (renamed from src/main/java/org/uic/barcode/dynamicContent/dfcb1/ExtensionData.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/uic/barcode/dynamicContent/fdc1/GeoCoordinateSystemType.java (renamed from src/main/java/org/uic/barcode/dynamicContent/dfcb1/GeoCoordinateSystemType.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/uic/barcode/dynamicContent/fdc1/GeoCoordinateType.java (renamed from src/main/java/org/uic/barcode/dynamicContent/dfcb1/GeoCoordinateType.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/uic/barcode/dynamicContent/fdc1/GeoUnitType.java (renamed from src/main/java/org/uic/barcode/dynamicContent/dfcb1/GeoUnitType.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/uic/barcode/dynamicContent/fdc1/HemisphereLatitudeType.java (renamed from src/main/java/org/uic/barcode/dynamicContent/dfcb1/HemisphereLatitudeType.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/uic/barcode/dynamicContent/fdc1/HemisphereLongitudeType.java (renamed from src/main/java/org/uic/barcode/dynamicContent/dfcb1/HemisphereLongitudeType.java) | 2 |
7 files changed, 6 insertions, 274 deletions
diff --git a/src/main/java/org/uic/barcode/dynamicContent/dfcb1/UicDynamicContentData1.java b/src/main/java/org/uic/barcode/dynamicContent/dfcb1/UicDynamicContentData1.java deleted file mode 100644 index 034057a..0000000 --- a/src/main/java/org/uic/barcode/dynamicContent/dfcb1/UicDynamicContentData1.java +++ /dev/null @@ -1,268 +0,0 @@ -/*
- *
- */
-package org.uic.barcode.dynamicContent.dfcb1;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.TimeZone;
-
-import org.uic.barcode.asn1.datatypes.Asn1Default;
-import org.uic.barcode.asn1.datatypes.Asn1Optional;
-import org.uic.barcode.asn1.datatypes.CharacterRestriction;
-import org.uic.barcode.asn1.datatypes.FieldOrder;
-import org.uic.barcode.asn1.datatypes.HasExtensionMarker;
-import org.uic.barcode.asn1.datatypes.IntRange;
-import org.uic.barcode.asn1.datatypes.RestrictedString;
-import org.uic.barcode.asn1.datatypes.Sequence;
-import org.uic.barcode.asn1.datatypesimpl.OctetString;
-import org.uic.barcode.asn1.uper.UperEncoder;
-import org.uic.barcode.dynamicFrame.DataType;
-
-
-/**
- * The Class UicDynamicContentData.
- *
- * The dynamic content for FDC1
- *
- */
-
-
-@Sequence
-@HasExtensionMarker
-public class UicDynamicContentData1 {
-
- //-- Moment of generation of the dynamic content, expressed in UTC :
- //-- * dynamicContentDay is the number of days from issuing date
- //-- (UicRailTicketData.issuingDetail.issuingYear and issuingDay)
- // -- The range 0..1070 allows a validity equal to that of the validFrom (700) plus
- // -- validUntil (370) elements of the different transport documents of UicRailTicketData.
- //-- * dynamicContentTime is the number of seconds of the day
- //-- (from 0 = 0:00:00 to 86399 = 23:59:59)
- //-- These two elements shall be either both present, either both absent
- /** The day. */
- //dynamicContentDay INTEGER (0..1070) DEFAULT 0,
- @FieldOrder(order = 0)
- @Asn1Default(value="0")
- @IntRange(minValue=0, maxValue=1070)
- public Long day;
-
- /** The second of day. */
- // dynamicContentTime INTEGER (0..86399) OPTIONAL,
- @FieldOrder(order = 1)
- @IntRange(minValue=0, maxValue=86399)
- public Long secondOfDay;
-
- //-- Coordinates of the place where the dynamic content has been generated
- // -- (same GeoCoordinateType type as in UicRailTicketData)
- /** The geo coordinate. */
- //dynamicContentGeoCoordinate GeoCoordinateType OPTIONAL,
- @FieldOrder(order = 2)
- @Asn1Optional public GeoCoordinateType geoCoordinate;
- //-- Response from the mobile to any data received from the terminal.
- //-- The data received from the terminal may be a random number, or any other information.
- //-- The response may be the data itself, a hashing of this data, or any other response.
- // -- This response may be completed with other information: IMEI, mobile phone number...
- //-- The type used is ExtensionData, as it is fully adapted.
- // -- extensionId shall be set to:
- // -- * "=" if the data included in extensionData is exactly the one that was transmitted by the terminal,
- // -- * any other value (chosen by the issuer) in other cases.
- /** The challenge response. */
- //dynamicContentResponseToChallenge ExtensionData OPTIONAL,
- @FieldOrder(order = 3)
- @Asn1Optional public ExtensionData challengeResponse;
-
- /** The extension. */
- //-- proprietary data defined bilaterally
- @FieldOrder(order = 4)
- @Asn1Optional public ExtensionData extension;
- //dynamicContentExtension ExtensionData OPTIONAL,
-
- // challenge string asked by the TCO
- @FieldOrder(order = 5)
- @RestrictedString(CharacterRestriction.IA5String)
- @Asn1Optional public String challengeString;
-
- // hashed phone id
- @FieldOrder(order = 6)
- public OctetString phoneIdHash;
-
- // hashed e-passport-id
- @FieldOrder(order = 7)
- public OctetString passHash;
-
- //...
-
- /**
- * Gets the day.
- *
- * @return the day
- */
- public Long getDay() {
- return day;
- }
-
- /**
- * Sets the day.
- *
- * @param day the new day
- */
- public void setDay(Long day) {
- this.day = day;
- }
-
- /**
- * Gets the time.
- *
- * @return the time
- */
- public Long getTime() {
- return secondOfDay;
- }
-
- /**
- * Sets the time.
- *
- * @param time the new time
- */
- public void setTime(Long time) {
- this.secondOfDay = time;
- }
-
- /**
- * Gets the geo coordinate.
- *
- * @return the geo coordinate
- */
- public GeoCoordinateType getGeoCoordinate() {
- return geoCoordinate;
- }
-
- /**
- * Sets the geo coordinate.
- *
- * @param geoCoordinate the new geo coordinate
- */
- public void setGeoCoordinate(GeoCoordinateType geoCoordinate) {
- this.geoCoordinate = geoCoordinate;
- }
-
- /**
- * Gets the challenge response.
- *
- * @return the challenge response
- */
- public ExtensionData getChallengeResponse() {
- return challengeResponse;
- }
-
- /**
- * Sets the challenge response.
- *
- * @param challengeResponse the new challenge response
- */
- public void setChallengeResponse(ExtensionData challengeResponse) {
- this.challengeResponse = challengeResponse;
- }
-
- /**
- * Gets the extension.
- *
- * @return the extension
- */
- public ExtensionData getExtension() {
- return extension;
- }
-
- /**
- * Sets the extension.
- *
- * @param extension the new extension
- */
- public void setExtension(ExtensionData extension) {
- this.extension = extension;
- }
-
- /**
- * Gets the time.
- *
- * @param issuingDate the issuing date in UTC
- * @return the date and time of content creation in UTC
- */
- public Date getTime(Date issuingDate) {
-
- Calendar cal = Calendar.getInstance();
- cal.setTime(issuingDate);
- cal.setTimeZone(TimeZone.getTimeZone("UTC"));
- cal.set(Calendar.SECOND,0);
- cal.set(Calendar.HOUR,0);
- cal.set(Calendar.MINUTE,0);
- cal.add(Calendar.DATE, day.intValue());
- cal.add(Calendar.SECOND, secondOfDay.intValue());
-
- return cal.getTime();
- }
-
- /**
- * Sets the date time.
- *
- * @param dateUTC the current date and time in UTC
- * @param issuingDateUTC the issuing date and time in UTC
- */
- public void setDateTime(Date dateUTC, Date issuingDateUTC) {
-
- Calendar cal1 = Calendar.getInstance();
- cal1.setTime(issuingDateUTC);
-
- Calendar cal2 = Calendar.getInstance();
- cal2.setTime(dateUTC);
-
- int days1 = cal1.get(Calendar.DATE);
- int days2 = cal2.get(Calendar.DATE);
-
- day = new Long (days2 - days1);
-
- secondOfDay = (long) cal2.get(Calendar.SECOND);
- secondOfDay = secondOfDay + 60 * (long) cal2.get(Calendar.MINUTE);
- secondOfDay = secondOfDay + 60 * 60 * (long) cal2.get(Calendar.HOUR_OF_DAY);
-
- }
-
- public static String getFormat() {
- return "FDC1";
- }
-
- public DataType getDataType() {
- DataType data = new DataType();
- data.setFormat(UicDynamicContentData1.getFormat());
- data.setByteData(UperEncoder.encode(this));
- return data;
- }
-
- public String getChallengeString() {
- return challengeString;
- }
-
- public void setChallengeString(String challengeString) {
- this.challengeString = challengeString;
- }
-
- public OctetString getPhoneIdHash() {
- return phoneIdHash;
- }
-
- public void setPhoneIdHash(OctetString phoneIdHash) {
- this.phoneIdHash = phoneIdHash;
- }
-
- public OctetString getPassHash() {
- return passHash;
- }
-
- public void setPassHash(OctetString passHash) {
- this.passHash = passHash;
- }
-
-
-
-}
diff --git a/src/main/java/org/uic/barcode/dynamicContent/dfcb1/ExtensionData.java b/src/main/java/org/uic/barcode/dynamicContent/fdc1/ExtensionData.java index c00da89..52b76d1 100644 --- a/src/main/java/org/uic/barcode/dynamicContent/dfcb1/ExtensionData.java +++ b/src/main/java/org/uic/barcode/dynamicContent/fdc1/ExtensionData.java @@ -17,7 +17,7 @@ * along with openASN.1. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.uic.barcode.dynamicContent.dfcb1;
+package org.uic.barcode.dynamicContent.fdc1;
import org.uic.barcode.asn1.datatypes.CharacterRestriction;
import org.uic.barcode.asn1.datatypes.FieldOrder;
diff --git a/src/main/java/org/uic/barcode/dynamicContent/dfcb1/GeoCoordinateSystemType.java b/src/main/java/org/uic/barcode/dynamicContent/fdc1/GeoCoordinateSystemType.java index e535c7f..b25ad1a 100644 --- a/src/main/java/org/uic/barcode/dynamicContent/dfcb1/GeoCoordinateSystemType.java +++ b/src/main/java/org/uic/barcode/dynamicContent/fdc1/GeoCoordinateSystemType.java @@ -17,7 +17,7 @@ * along with openASN.1. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.uic.barcode.dynamicContent.dfcb1;
+package org.uic.barcode.dynamicContent.fdc1;
// TODO: Auto-generated Javadoc
diff --git a/src/main/java/org/uic/barcode/dynamicContent/dfcb1/GeoCoordinateType.java b/src/main/java/org/uic/barcode/dynamicContent/fdc1/GeoCoordinateType.java index e1a5e9b..1f1cfc5 100644 --- a/src/main/java/org/uic/barcode/dynamicContent/dfcb1/GeoCoordinateType.java +++ b/src/main/java/org/uic/barcode/dynamicContent/fdc1/GeoCoordinateType.java @@ -17,7 +17,7 @@ * along with openASN.1. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.uic.barcode.dynamicContent.dfcb1;
+package org.uic.barcode.dynamicContent.fdc1;
import org.uic.barcode.asn1.datatypes.Asn1BigInteger;
import org.uic.barcode.asn1.datatypes.Asn1Default;
diff --git a/src/main/java/org/uic/barcode/dynamicContent/dfcb1/GeoUnitType.java b/src/main/java/org/uic/barcode/dynamicContent/fdc1/GeoUnitType.java index 222f68d..4eaa8c9 100644 --- a/src/main/java/org/uic/barcode/dynamicContent/dfcb1/GeoUnitType.java +++ b/src/main/java/org/uic/barcode/dynamicContent/fdc1/GeoUnitType.java @@ -17,7 +17,7 @@ * along with openASN.1. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.uic.barcode.dynamicContent.dfcb1;
+package org.uic.barcode.dynamicContent.fdc1;
// TODO: Auto-generated Javadoc
/**
diff --git a/src/main/java/org/uic/barcode/dynamicContent/dfcb1/HemisphereLatitudeType.java b/src/main/java/org/uic/barcode/dynamicContent/fdc1/HemisphereLatitudeType.java index e76d120..5157b0e 100644 --- a/src/main/java/org/uic/barcode/dynamicContent/dfcb1/HemisphereLatitudeType.java +++ b/src/main/java/org/uic/barcode/dynamicContent/fdc1/HemisphereLatitudeType.java @@ -17,7 +17,7 @@ * along with openASN.1. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.uic.barcode.dynamicContent.dfcb1;
+package org.uic.barcode.dynamicContent.fdc1;
// TODO: Auto-generated Javadoc
/**
diff --git a/src/main/java/org/uic/barcode/dynamicContent/dfcb1/HemisphereLongitudeType.java b/src/main/java/org/uic/barcode/dynamicContent/fdc1/HemisphereLongitudeType.java index 3eeed52..c0e33e6 100644 --- a/src/main/java/org/uic/barcode/dynamicContent/dfcb1/HemisphereLongitudeType.java +++ b/src/main/java/org/uic/barcode/dynamicContent/fdc1/HemisphereLongitudeType.java @@ -17,7 +17,7 @@ * along with openASN.1. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.uic.barcode.dynamicContent.dfcb1;
+package org.uic.barcode.dynamicContent.fdc1;
// TODO: Auto-generated Javadoc
/**
|